diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-11-28 08:04:36 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-11-28 08:04:36 +0000 |
| commit | 4579924b7e55fccc7013e6de196f2e2ab175ce39 (patch) | |
| tree | fa19611a704cc901d3ba338cefbbb98878de7ee5 /ssl/t1_enc.c | |
| parent | 2047bda6fb8bedab1103b7bd5df5ea55eb7ccc9b (diff) | |
Cleanse memory using the new OPENSSL_cleanse() function.
I've covered all the memset()s I felt safe modifying, but may have missed some.
Diffstat (limited to 'ssl/t1_enc.c')
| -rw-r--r-- | ssl/t1_enc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 872c629989..bfcd7d9191 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -161,7 +161,7 @@ static void tls1_P_hash(const EVP_MD *md, const unsigned char *sec, } HMAC_CTX_cleanup(&ctx); HMAC_CTX_cleanup(&ctx_tmp); - memset(A1,0,sizeof(A1)); + OPENSSL_cleanse(A1,sizeof(A1)); } static void tls1_PRF(const EVP_MD *md5, const EVP_MD *sha1, @@ -418,10 +418,10 @@ printf("\niv="); printf("\n"); #endif - memset(tmp1,0,sizeof(tmp1)); - memset(tmp2,0,sizeof(tmp1)); - memset(iv1,0,sizeof(iv1)); - memset(iv2,0,sizeof(iv2)); + OPENSSL_cleanse(tmp1,sizeof(tmp1)); + OPENSSL_cleanse(tmp2,sizeof(tmp1)); + OPENSSL_cleanse(iv1,sizeof(iv1)); + OPENSSL_cleanse(iv2,sizeof(iv2)); return(1); err: SSLerr(SSL_F_TLS1_CHANGE_CIPHER_STATE,ERR_R_MALLOC_FAILURE); @@ -476,7 +476,7 @@ printf("pre-master\n"); { int z; for (z=0; z<s->session->master_key_length; z++) printf("%02X%c",s->session->master_key[z],((z+1)%16)?' ':'\n'); } #endif tls1_generate_key_block(s,p1,p2,num); - memset(p2,0,num); + OPENSSL_cleanse(p2,num); OPENSSL_free(p2); #ifdef TLS_DEBUG printf("\nkey block\n"); |