diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-02-03 18:19:59 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-02-03 18:23:52 +0100 |
commit | 5b05d9db29843144b2ed620ca437d6a3bacc3816 (patch) | |
tree | f468595c53a1e2b0dbfbb4fcca8d928149a68d39 | |
parent | 5f7c82b32f548b5a1d6a4186630e8ef496a9d5e6 (diff) | |
download | busybox-w32-5b05d9db29843144b2ed620ca437d6a3bacc3816.tar.gz busybox-w32-5b05d9db29843144b2ed620ca437d6a3bacc3816.tar.bz2 busybox-w32-5b05d9db29843144b2ed620ca437d6a3bacc3816.zip |
wget/tls: session_id of zero length is ok (arxiv.org responds with such)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | networking/tls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/networking/tls.c b/networking/tls.c index 335324568..4e9187d4f 100644 --- a/networking/tls.c +++ b/networking/tls.c | |||
@@ -1312,7 +1312,7 @@ static void get_server_hello(tls_state_t *tls) | |||
1312 | unsigned cipher; | 1312 | unsigned cipher; |
1313 | int len, len24; | 1313 | int len, len24; |
1314 | 1314 | ||
1315 | len = tls_xread_handshake_block(tls, 74); | 1315 | len = tls_xread_handshake_block(tls, 74 - 32); |
1316 | 1316 | ||
1317 | hp = (void*)tls->inbuf; | 1317 | hp = (void*)tls->inbuf; |
1318 | // 74 bytes: | 1318 | // 74 bytes: |
@@ -1332,7 +1332,7 @@ static void get_server_hello(tls_state_t *tls) | |||
1332 | len24 = hp->len24_lo; | 1332 | len24 = hp->len24_lo; |
1333 | if (hp->session_id_len != 32) { | 1333 | if (hp->session_id_len != 32) { |
1334 | if (hp->session_id_len != 0) | 1334 | if (hp->session_id_len != 0) |
1335 | tls_error_die(tls); | 1335 | bad_record_die(tls, "'server hello'", len); |
1336 | 1336 | ||
1337 | // session_id_len == 0: no session id | 1337 | // session_id_len == 0: no session id |
1338 | // "The server | 1338 | // "The server |
@@ -1347,7 +1347,7 @@ static void get_server_hello(tls_state_t *tls) | |||
1347 | // || cipherid[1] != (CIPHER_ID & 0xff) | 1347 | // || cipherid[1] != (CIPHER_ID & 0xff) |
1348 | // || cipherid[2] != 0 /* comprtype */ | 1348 | // || cipherid[2] != 0 /* comprtype */ |
1349 | ) { | 1349 | ) { |
1350 | tls_error_die(tls); | 1350 | bad_record_die(tls, "'server hello'", len); |
1351 | } | 1351 | } |
1352 | dbg("<< SERVER_HELLO\n"); | 1352 | dbg("<< SERVER_HELLO\n"); |
1353 | 1353 | ||