From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sat, 24 Nov 2018 23:53:19 +0000 (+0100)
Subject: tls: actually fill in CIPHER_ID3 value in hello message
X-Git-Tag: 1_30_0~374
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ab3c5e4c44c73dafeb01439882b48e2259611e34;p=oweals%2Fbusybox.git

tls: actually fill in CIPHER_ID3 value in hello message

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/networking/tls.c b/networking/tls.c
index f337bc0c9..7bdd58018 100644
--- a/networking/tls.c
+++ b/networking/tls.c
@@ -61,9 +61,7 @@
 // bug #11456:
 // ftp.openbsd.org only supports ECDHE-RSA-AESnnn-GCM-SHAnnn or ECDHE-RSA-CHACHA20-POLY1305
 #define CIPHER_ID3  TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
-// host is.gd accepts only ECDHE-ECDSA-foo (the simplest which works: ECDHE-ECDSA-AES128-SHA 0xC009),
-// and immediately throws alert 40 "handshake failure" in response to our hello record
-// if ECDHE-ECDSA-AES-CBC-SHA is *before* ECDHE-RSA-AES-GCM cipher in the list! Server bug?
+// host is.gd accepts only ECDHE-ECDSA-foo (the simplest which works: ECDHE-ECDSA-AES128-SHA 0xC009)
 #define CIPHER_ID4  TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
 
 #define NUM_CIPHERS 4
@@ -1544,8 +1542,8 @@ static void send_client_hello_and_alloc_hsd(tls_state_t *tls, const char *sni)
 	/*************************/ record->cipherid[7] = CIPHER_ID3 & 0xff;
 #endif
 #if CIPHER_ID4
-	if ((CIPHER_ID4 >> 8) != 0) record->cipherid[6] = CIPHER_ID4 >> 8;
-	/*************************/ record->cipherid[7] = CIPHER_ID4 & 0xff;
+	if ((CIPHER_ID4 >> 8) != 0) record->cipherid[8] = CIPHER_ID4 >> 8;
+	/*************************/ record->cipherid[9] = CIPHER_ID4 & 0xff;
 #endif
 
 	record->comprtypes_len = 1;