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

Cleanse buffers

Browse Source 
Cleanse various intermediate buffers used by the PRF (backported version
from master).

Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit 35fafc4dbc0b3a717ad1b208fe2867e8c64867de)

Conflicts:
	ssl/s3_enc.c

Conflicts:
	ssl/t1_enc.c
This commit is contained in:
Matt Caswell 2015-03-09 13:59:58 +00:00
parent 765e2465ca
commit 683f03e488
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ssl/s3_enc.c
View File

@ -830,6 +830,7 @@ int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
ret += n;
}
EVP_MD_CTX_cleanup(&ctx);
OPENSSL_cleanse(buf, sizeof buf);
return (ret);
}

3
ssl/t1_enc.c
View File

@ -860,6 +860,8 @@ int tls1_final_finish_mac(SSL *s,
err = 1;
EVP_MD_CTX_cleanup(&ctx);
OPENSSL_cleanse(buf, (int)(q - buf));
OPENSSL_cleanse(buf2, sizeof(buf2));
if (err)
return 0;
else
@ -1017,6 +1019,7 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
co, col,
s->s3->server_random, SSL3_RANDOM_SIZE,
so, sol, p, len, s->session->master_key, buff, sizeof buff);
OPENSSL_cleanse(buff, sizeof buff);
#ifdef KSSL_DEBUG
printf("tls1_generate_master_secret() complete\n");