diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-04-30 17:57:32 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-04-30 17:57:32 -0400 |
| commit | 4b45c6e52b208deff7da333d1c7f84bcd3986609 (patch) | |
| tree | db26f7a51ad582f203dce2145a43c3e0d4376f69 /ssl/s3_enc.c | |
| parent | 68dc682499ea3fe27d909c946d7abd39062d6efd (diff) | |
| download | openssl-4b45c6e52b208deff7da333d1c7f84bcd3986609.tar.gz | |
free cleanup almost the finale
Add OPENSSL_clear_free which merges cleanse and free.
(Names was picked to be similar to BN_clear_free, etc.)
Removed OPENSSL_freeFunc macro.
Fixed the small simple ones that are left:
CRYPTO_free CRYPTO_free_locked OPENSSL_free_locked
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/s3_enc.c')
| -rw-r--r-- | ssl/s3_enc.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index 8fc5bc4a8a..df86f5b9f3 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -471,11 +471,8 @@ int ssl3_setup_key_block(SSL *s) void ssl3_cleanup_key_block(SSL *s) { - if (s->s3->tmp.key_block != NULL) { - OPENSSL_cleanse(s->s3->tmp.key_block, s->s3->tmp.key_block_length); - OPENSSL_free(s->s3->tmp.key_block); - s->s3->tmp.key_block = NULL; - } + OPENSSL_clear_free(s->s3->tmp.key_block, s->s3->tmp.key_block_length); + s->s3->tmp.key_block = NULL; s->s3->tmp.key_block_length = 0; } |