diff options
author | jsing <> | 2018-11-08 22:28:52 +0000 |
---|---|---|
committer | jsing <> | 2018-11-08 22:28:52 +0000 |
commit | 3ddaece0e07a9c99e3a1f04d188c5ece7176ee46 (patch) | |
tree | ea0388ba51cbbc63fa62e563b9694fedd9ef0f74 /src/lib/libssl/s3_lib.c | |
parent | 638a717c204f5dd9a5b399e3c095815fb6d15124 (diff) | |
download | openbsd-3ddaece0e07a9c99e3a1f04d188c5ece7176ee46.tar.gz openbsd-3ddaece0e07a9c99e3a1f04d188c5ece7176ee46.tar.bz2 openbsd-3ddaece0e07a9c99e3a1f04d188c5ece7176ee46.zip |
Clean up and simplify the handshake transcript code.
This provides a cleaner, simpler and more readable API, with code that uses
a BUF_MEM instead of a BIO.
ok beck@ ("hurry up") and tb@.
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r-- | src/lib/libssl/s3_lib.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index 356f43a356..091713d12a 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_lib.c,v 1.175 2018/11/08 20:55:18 jsing Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.176 2018/11/08 22:28:52 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1567,8 +1567,7 @@ ssl3_free(SSL *s) | |||
1567 | 1567 | ||
1568 | sk_X509_NAME_pop_free(S3I(s)->tmp.ca_names, X509_NAME_free); | 1568 | sk_X509_NAME_pop_free(S3I(s)->tmp.ca_names, X509_NAME_free); |
1569 | 1569 | ||
1570 | BIO_free(S3I(s)->handshake_buffer); | 1570 | tls1_transcript_free(s); |
1571 | |||
1572 | tls1_handshake_hash_free(s); | 1571 | tls1_handshake_hash_free(s); |
1573 | 1572 | ||
1574 | free(S3I(s)->alpn_selected); | 1573 | free(S3I(s)->alpn_selected); |
@@ -1602,9 +1601,7 @@ ssl3_clear(SSL *s) | |||
1602 | rlen = S3I(s)->rbuf.len; | 1601 | rlen = S3I(s)->rbuf.len; |
1603 | wlen = S3I(s)->wbuf.len; | 1602 | wlen = S3I(s)->wbuf.len; |
1604 | 1603 | ||
1605 | BIO_free(S3I(s)->handshake_buffer); | 1604 | tls1_transcript_free(s); |
1606 | S3I(s)->handshake_buffer = NULL; | ||
1607 | |||
1608 | tls1_handshake_hash_free(s); | 1605 | tls1_handshake_hash_free(s); |
1609 | 1606 | ||
1610 | free(S3I(s)->alpn_selected); | 1607 | free(S3I(s)->alpn_selected); |