summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_lib.c
diff options
context:
space:
mode:
authorjsing <>2017-03-10 16:03:27 +0000
committerjsing <>2017-03-10 16:03:27 +0000
commitefcbc859d153bd2908ab9c32fb042c03eb84d265 (patch)
tree87f5d914b19030ee7a5a08676faeef2fa8269f08 /src/lib/libssl/s3_lib.c
parent1cc414278817073fb56449c3b1ad7386acb12601 (diff)
downloadopenbsd-efcbc859d153bd2908ab9c32fb042c03eb84d265.tar.gz
openbsd-efcbc859d153bd2908ab9c32fb042c03eb84d265.tar.bz2
openbsd-efcbc859d153bd2908ab9c32fb042c03eb84d265.zip
Remove the handshake digests and related code, replacing remaining uses
with the handshake hash. For now tls1_digest_cached_records() is retained to release the handshake buffer. ok beck@ inoguchi@
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r--src/lib/libssl/s3_lib.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index d6bf6a4574..8d45e1f8c1 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.137 2017/03/05 14:39:53 jsing Exp $ */ 1/* $OpenBSD: s3_lib.c,v 1.138 2017/03/10 16:03:27 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 *
@@ -1842,7 +1842,6 @@ ssl3_free(SSL *s)
1842 1842
1843 BIO_free(S3I(s)->handshake_buffer); 1843 BIO_free(S3I(s)->handshake_buffer);
1844 1844
1845 tls1_free_digest_list(s);
1846 tls1_handshake_hash_free(s); 1845 tls1_handshake_hash_free(s);
1847 1846
1848 free(S3I(s)->alpn_selected); 1847 free(S3I(s)->alpn_selected);
@@ -1884,7 +1883,6 @@ ssl3_clear(SSL *s)
1884 BIO_free(S3I(s)->handshake_buffer); 1883 BIO_free(S3I(s)->handshake_buffer);
1885 S3I(s)->handshake_buffer = NULL; 1884 S3I(s)->handshake_buffer = NULL;
1886 1885
1887 tls1_free_digest_list(s);
1888 tls1_handshake_hash_free(s); 1886 tls1_handshake_hash_free(s);
1889 1887
1890 free(S3I(s)->alpn_selected); 1888 free(S3I(s)->alpn_selected);