summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDmitry Belyavskiy <beldmit@gmail.com>2019-01-02 13:47:07 +0100
committerMatt Caswell <matt@openssl.org>2019-01-03 15:17:31 +0100
commit9c5ef4ea486f675f33592b34775c3e453f60ee69 (patch)
treeda50ff1cf9c1269c73758500a7e21e95649a683f /ssl
parentRemove unused variables from tls1_change_cipher_state (diff)
downloadopenssl-9c5ef4ea486f675f33592b34775c3e453f60ee69.tar.xz
openssl-9c5ef4ea486f675f33592b34775c3e453f60ee69.zip
Eliminate unused buffers from ssl3_change_cipher_state
Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7971)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/s3_enc.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 9af4ccb087..4d884f47a2 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -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)
{
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;
EVP_CIPHER_CTX *dd;
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;
- OPENSSL_cleanse(exp_key, sizeof(exp_key));
- OPENSSL_cleanse(exp_iv, sizeof(exp_iv));
return 1;
err:
- OPENSSL_cleanse(exp_key, sizeof(exp_key));
- OPENSSL_cleanse(exp_iv, sizeof(exp_iv));
return 0;
}