diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-06-20 15:44:03 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-06-21 15:29:22 +0100 |
| commit | d480e182fe20fcaeca7817a4693eeaf594bb1a32 (patch) | |
| tree | ae741c887fb6f7ed83acc23285b992429eaec70f /ssl/s3_enc.c | |
| parent | 85fb6fdaed74d6091817ce5da17fcc737f36a51f (diff) | |
| download | openssl-d480e182fe20fcaeca7817a4693eeaf594bb1a32.tar.gz | |
Avoid duplication.
We always free the handshake buffer when digests are freed so move
it into ssl_free_digest_list()
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl/s3_enc.c')
| -rw-r--r-- | ssl/s3_enc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index bde19e1fb8..eedf74d392 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -476,15 +476,21 @@ void ssl3_cleanup_key_block(SSL *s) void ssl3_init_finished_mac(SSL *s) { - BIO_free(s->s3->handshake_buffer); ssl3_free_digest_list(s); s->s3->handshake_buffer = BIO_new(BIO_s_mem()); (void)BIO_set_close(s->s3->handshake_buffer, BIO_CLOSE); } +/* + * Free digest list. Also frees handshake buffer since they are always freed + * together. + */ + void ssl3_free_digest_list(SSL *s) { int i; + BIO_free(s->s3->handshake_buffer); + s->s3->handshake_buffer = NULL; if (!s->s3->handshake_dgst) return; for (i = 0; i < SSL_MAX_DIGEST; i++) { |