Revert "Avoid duplication."

This reverts commit d480e182fe.

Commit broke TLS handshakes due to fragility of digest caching: that will be
fixed separately.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Dr. Stephen Henson
2015-06-21 16:06:21 +01:00
parent d480e182fe
commit f6a103133a
2 changed files with 4 additions and 7 deletions

View File

@@ -2905,6 +2905,7 @@ void ssl3_free(SSL *s)
OPENSSL_free(s->s3->tmp.ciphers_raw);
OPENSSL_clear_free(s->s3->tmp.pms, s->s3->tmp.pmslen);
OPENSSL_free(s->s3->tmp.peer_sigalgs);
BIO_free(s->s3->handshake_buffer);
ssl3_free_digest_list(s);
OPENSSL_free(s->s3->alpn_selected);
@@ -2939,6 +2940,8 @@ void ssl3_clear(SSL *s)
#endif /* !OPENSSL_NO_EC */
init_extra = s->s3->init_extra;
BIO_free(s->s3->handshake_buffer);
s->s3->handshake_buffer = NULL;
ssl3_free_digest_list(s);
if (s->s3->alpn_selected) {