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

Free and cleanse pms on error

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-07-28 16:04:53 +01:00
parent a3f7ff2b2d
commit a784665e52
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ssl/s3_lib.c
View File

@ -4966,8 +4966,10 @@ int ssl_generate_master_secret(SSL *s, unsigned char *pms, size_t pmslen,
pskpmslen = 4 + pmslen + psklen; pskpmslen = 4 + pmslen + psklen;
pskpms = OPENSSL_malloc(pskpmslen); pskpms = OPENSSL_malloc(pskpmslen);
if (pskpms == NULL) if (pskpms == NULL) {
return 0; s->session->master_key_length = 0;
goto err;
}
t = pskpms; t = pskpms;
s2n(pmslen, t); s2n(pmslen, t);
if (alg_k & SSL_kPSK) if (alg_k & SSL_kPSK)
@ -4991,6 +4993,8 @@ int ssl_generate_master_secret(SSL *s, unsigned char *pms, size_t pmslen,
s->method->ssl3_enc->generate_master_secret(s, s->method->ssl3_enc->generate_master_secret(s,
s->session->master_key, s->session->master_key,
pms, pmslen); pms, pmslen);
err:
if (pms) { if (pms) {
if (free_pms) if (free_pms)
OPENSSL_clear_free(pms, pmslen); OPENSSL_clear_free(pms, pmslen);