generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set s->hit when resuming from external pre-shared secret.

Browse Source 
The same change was independently made in BoringSSL, see commit
9eaeef81fa2d4fd6246dc02b6203fa936a5eaf67

Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 7b3ba508af5c86afe43e28174aa3c53a0a24f4d9)
This commit is contained in:
Emilia Kasper 2014-11-19 15:56:27 +01:00
parent ce5f32cfa7
commit f7c7aa69f7
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ssl/s3_clnt.c
View File

@ -978,6 +978,8 @@ int ssl3_get_server_hello(SSL *s)
memcpy(s->s3->server_random,p,SSL3_RANDOM_SIZE); memcpy(s->s3->server_random,p,SSL3_RANDOM_SIZE);
p+=SSL3_RANDOM_SIZE; p+=SSL3_RANDOM_SIZE;
s->hit = 0;
/* get the session-id */ /* get the session-id */
j= *(p++); j= *(p++);
@ -1001,12 +1003,13 @@ int ssl3_get_server_hello(SSL *s)
{ {
s->session->cipher = pref_cipher ? s->session->cipher = pref_cipher ?
pref_cipher : ssl_get_cipher_by_char(s, p+j); pref_cipher : ssl_get_cipher_by_char(s, p+j);
s->s3->flags |= SSL3_FLAGS_CCS_OK; s->hit = 1;
s->s3->flags |= SSL3_FLAGS_CCS_OK;
} }
} }
#endif /* OPENSSL_NO_TLSEXT */ #endif /* OPENSSL_NO_TLSEXT */
if (j != 0 && j == s->session->session_id_length if (!s->hit && j != 0 && j == s->session->session_id_length
&& memcmp(p,s->session->session_id,j) == 0) && memcmp(p,s->session->session_id,j) == 0)
{ {
if(s->sid_ctx_length != s->session->sid_ctx_length if(s->sid_ctx_length != s->session->sid_ctx_length
@ -1020,11 +1023,11 @@ int ssl3_get_server_hello(SSL *s)
s->s3->flags |= SSL3_FLAGS_CCS_OK; s->s3->flags |= SSL3_FLAGS_CCS_OK;
s->hit=1; s->hit=1;
} }
else /* a miss or crap from the other end */ /* a miss or crap from the other end */
if (!s->hit)
{ {
/* If we were trying for session-id reuse, make a new /* If we were trying for session-id reuse, make a new
* SSL_SESSION so we don't stuff up other people */ * SSL_SESSION so we don't stuff up other people */
s->hit=0;
if (s->session->session_id_length > 0) if (s->session->session_id_length > 0)
{ {
if (!ssl_get_new_session(s,0)) if (!ssl_get_new_session(s,0))