Commit 683f03e4 authored by Matt Caswell's avatar Matt Caswell
Browse files

Cleanse buffers 



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

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(cherry picked from commit 35fafc4d)

Conflicts:
	ssl/s3_enc.c

Conflicts:
	ssl/t1_enc.c
parent 765e2465

ssl/s3_enc.c

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

}

ssl/t1_enc.c

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