Commit 58d8a271 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
parent 8b7e469d

ssl/s3_enc.c

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

+5 −0
Original line number Diff line number Diff line
@@ -958,6 +958,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
@@ -1121,6 +1123,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 SSL_DEBUG

    fprintf(stderr, "Premaster Secret:\n");

    BIO_dump_fp(stderr, (char *)p, len);
@@ -1215,6 +1218,8 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen, 
                  NULL, 0,

                  s->session->master_key, s->session->master_key_length,

                  out, buff, olen);

    OPENSSL_cleanse(val, vallen);

    OPENSSL_cleanse(buff, olen);



#ifdef KSSL_DEBUG

    fprintf(stderr, "tls1_export_keying_material() complete\n");