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

Remove unused variables from tls1_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 d072eea2e39c4444ecce3598556053a4c552d9a2)
parent 42c17f3a

ssl/t1_enc.c

+0 −12
Original line number Diff line number Diff line
@@ -81,10 +81,6 @@ static int tls1_generate_key_block(SSL *s, unsigned char *km, size_t num) 
int tls1_change_cipher_state(SSL *s, int which)

{

    unsigned char *p, *mac_secret;

    unsigned char tmp1[EVP_MAX_KEY_LENGTH];

    unsigned char tmp2[EVP_MAX_KEY_LENGTH];

    unsigned char iv1[EVP_MAX_IV_LENGTH * 2];

    unsigned char iv2[EVP_MAX_IV_LENGTH * 2];

    unsigned char *ms, *key, *iv;

    EVP_CIPHER_CTX *dd;

    const EVP_CIPHER *c;
@@ -334,16 +330,8 @@ int tls1_change_cipher_state(SSL *s, int which) 
    printf("\n");

#endif



    OPENSSL_cleanse(tmp1, sizeof(tmp1));

    OPENSSL_cleanse(tmp2, sizeof(tmp1));

    OPENSSL_cleanse(iv1, sizeof(iv1));

    OPENSSL_cleanse(iv2, sizeof(iv2));

    return 1;

 err:

    OPENSSL_cleanse(tmp1, sizeof(tmp1));

    OPENSSL_cleanse(tmp2, sizeof(tmp1));

    OPENSSL_cleanse(iv1, sizeof(iv1));

    OPENSSL_cleanse(iv2, sizeof(iv2));

    return 0;

}