Commit d7389c82 authored by Dmitry Belyavskiy's avatar Dmitry Belyavskiy Committed by Matt Caswell
Browse files

Eliminate unused buffers from ssl3_change_cipher_state 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7971)

(cherry picked from commit 9c5ef4ea486f675f33592b34775c3e453f60ee69)
parent bb61be39

ssl/s3_enc.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

}