wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eliminate unused buffers from ssl3_change_cipher_state

Browse source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7971)

(cherry picked from commit 9c5ef4ea48)
This commit is contained in:
Dmitry Belyavskiy 2019-01-02 15:47:07 +03:00 committed by Matt Caswell
parent bb61be393f
commit d7389c8261
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ssl/s3_enc.c
View file

@ -90,8 +90,6 @@ static int ssl3_generate_key_block(SSL *s, unsigned char *km, int num)
int ssl3_change_cipher_state(SSL *s, int which) int ssl3_change_cipher_state(SSL *s, int which)
{ {
unsigned char *p, *mac_secret; unsigned char *p, *mac_secret;
unsigned char exp_key[EVP_MAX_KEY_LENGTH];
unsigned char exp_iv[EVP_MAX_IV_LENGTH];
unsigned char *ms, *key, *iv; unsigned char *ms, *key, *iv;
EVP_CIPHER_CTX *dd; EVP_CIPHER_CTX *dd;
const EVP_CIPHER *c; const EVP_CIPHER *c;
@ -239,12 +237,8 @@ int ssl3_change_cipher_state(SSL *s, int which)
} }
s->statem.enc_write_state = ENC_WRITE_STATE_VALID; s->statem.enc_write_state = ENC_WRITE_STATE_VALID;
OPENSSL_cleanse(exp_key, sizeof(exp_key));
OPENSSL_cleanse(exp_iv, sizeof(exp_iv));
return 1; return 1;
err: err:
OPENSSL_cleanse(exp_key, sizeof(exp_key));
OPENSSL_cleanse(exp_iv, sizeof(exp_iv));
return 0; return 0;
} }