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

Fix PSK client handling.

Browse Source 
The PSK identity hint should be stored in the SSL_SESSION structure
and not in the parent context (which will overwrite values used
by other SSL structures with the same SSL_CTX).

Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-06-22 14:03:08 +01:00
parent 547dba74f3
commit a16ca4e8ae
1 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ssl/s3_clnt.c
View File

@ -1431,17 +1431,7 @@ int ssl3_get_key_exchange(SSL *s)
al = SSL_AD_UNEXPECTED_MESSAGE; al = SSL_AD_UNEXPECTED_MESSAGE;
goto f_err; goto f_err;
} }
#ifndef OPENSSL_NO_PSK
/*
* In plain PSK ciphersuite, ServerKeyExchange can be omitted if no
* identity hint is sent. Set session->sess_cert anyway to avoid
* problems later.
*/
if (alg_k & SSL_kPSK) {
OPENSSL_free(s->ctx->psk_identity_hint);
s->ctx->psk_identity_hint = NULL;
}
#endif
s->s3->tmp.reuse_message = 1; s->s3->tmp.reuse_message = 1;
return (1); return (1);
} }
@ -1504,9 +1494,9 @@ int ssl3_get_key_exchange(SSL *s)
*/ */
memcpy(tmp_id_hint, p, i); memcpy(tmp_id_hint, p, i);
memset(tmp_id_hint + i, 0, PSK_MAX_IDENTITY_LEN + 1 - i); memset(tmp_id_hint + i, 0, PSK_MAX_IDENTITY_LEN + 1 - i);
OPENSSL_free(s->ctx->psk_identity_hint); OPENSSL_free(s->session->psk_identity_hint);
s->ctx->psk_identity_hint = BUF_strdup(tmp_id_hint); s->session->psk_identity_hint = BUF_strdup(tmp_id_hint);
if (s->ctx->psk_identity_hint == NULL) { if (s->session->psk_identity_hint == NULL) {
al = SSL_AD_HANDSHAKE_FAILURE; al = SSL_AD_HANDSHAKE_FAILURE;
SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE); SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
goto f_err; goto f_err;
@ -2830,7 +2820,7 @@ int ssl3_send_client_key_exchange(SSL *s)
if (!pms) if (!pms)
goto memerr; goto memerr;
psk_len = s->psk_client_callback(s, s->ctx->psk_identity_hint, psk_len = s->psk_client_callback(s, s->session->psk_identity_hint,
identity, sizeof(identity) - 1, identity, sizeof(identity) - 1,
pms, pmslen); pms, pmslen);
if (psk_len > PSK_MAX_PSK_LEN) { if (psk_len > PSK_MAX_PSK_LEN) {
@ -2859,16 +2849,6 @@ int ssl3_send_client_key_exchange(SSL *s)
t += psk_len; t += psk_len;
s2n(psk_len, t); s2n(psk_len, t);
OPENSSL_free(s->session->psk_identity_hint);
s->session->psk_identity_hint =
BUF_strdup(s->ctx->psk_identity_hint);
if (s->ctx->psk_identity_hint != NULL
&& s->session->psk_identity_hint == NULL) {
SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
ERR_R_MALLOC_FAILURE);
goto psk_err;
}
OPENSSL_free(s->session->psk_identity); OPENSSL_free(s->session->psk_identity);
s->session->psk_identity = BUF_strdup(identity); s->session->psk_identity = BUF_strdup(identity);
if (s->session->psk_identity == NULL) { if (s->session->psk_identity == NULL) {