QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-08 15:39:41 +00:00
Code Issues Projects Releases Wiki Activity

statem/statem_clnt.c: omit redundant check in tls_construct_client_hello.

Browse Source 
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5729)
This commit is contained in:
Philippe Antoine 2018-03-26 10:29:56 +02:00 committed by Andy Polyakov
parent 242fcd695d
commit dee0cc108f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssl/statem/statem_clnt.c
View File

@ -11,6 +11,7 @@
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>
#include <assert.h>
#include "../ssl_locl.h" #include "../ssl_locl.h"
#include "statem_locl.h" #include "statem_locl.h"
#include <openssl/buffer.h> #include <openssl/buffer.h>
@ -1198,14 +1199,14 @@ int tls_construct_client_hello(SSL *s, WPACKET *pkt)
sess_id_len = 0; sess_id_len = 0;
} }
} else { } else {
assert(s->session->session_id_length <= sizeof(s->session->session_id));
sess_id_len = s->session->session_id_length; sess_id_len = s->session->session_id_length;
if (s->version == TLS1_3_VERSION) { if (s->version == TLS1_3_VERSION) {
s->tmp_session_id_len = sess_id_len; s->tmp_session_id_len = sess_id_len;
memcpy(s->tmp_session_id, s->session->session_id, sess_id_len); memcpy(s->tmp_session_id, s->session->session_id, sess_id_len);
} }
} }
if (sess_id_len > sizeof(s->session->session_id) if (!WPACKET_start_sub_packet_u8(pkt)
|| !WPACKET_start_sub_packet_u8(pkt)
|| (sess_id_len != 0 && !WPACKET_memcpy(pkt, session_id, || (sess_id_len != 0 && !WPACKET_memcpy(pkt, session_id,
sess_id_len)) sess_id_len))
|| !WPACKET_close(pkt)) { || !WPACKET_close(pkt)) {