diff options
| author |   beck <beck@openbsd.org> | 2019-01-23 18:24:40 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2019-01-23 18:24:40 +0000 |
| commit | 174eabd668f4b74e79dba920baae32fa1a58847c (patch) | |
| tree | 20ed8a8882c1feb5f9b1b110a83c8b9d8061628e /lib/libssl/s3_lib.c | |
| parent | Modify sigalgs extension processing for TLS 1.3. (diff) | |
| download | wireguard-openbsd-174eabd668f4b74e79dba920baae32fa1a58847c.tar.xz wireguard-openbsd-174eabd668f4b74e79dba920baae32fa1a58847c.zip | |
revert previous, accidentally contained another diff in addition
to the one I intended to commit
Diffstat (limited to 'lib/libssl/s3_lib.c')
| -rw-r--r-- | lib/libssl/s3_lib.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/libssl/s3_lib.c b/lib/libssl/s3_lib.c index 53aab7c1e5c..496bf7394c4 100644 --- a/lib/libssl/s3_lib.c +++ b/lib/libssl/s3_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_lib.c,v 1.179 2019/01/23 16:46:04 beck Exp $ */ +/* $OpenBSD: s3_lib.c,v 1.180 2019/01/23 18:24:40 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1569,7 +1569,6 @@ ssl3_free(SSL *s) freezero(S3I(s)->hs_tls13.x25519_private, X25519_KEY_LENGTH); freezero(S3I(s)->hs_tls13.x25519_public, X25519_KEY_LENGTH); freezero(S3I(s)->hs_tls13.x25519_peer_public, X25519_KEY_LENGTH); - freezero(S3I(s)->hs_tls13.cookie, S3I(s)->hs_tls13.cookie_len); sk_X509_NAME_pop_free(S3I(s)->tmp.ca_names, X509_NAME_free); @@ -1606,11 +1605,6 @@ ssl3_clear(SSL *s) freezero(S3I(s)->hs_tls13.x25519_private, X25519_KEY_LENGTH); freezero(S3I(s)->hs_tls13.x25519_public, X25519_KEY_LENGTH); freezero(S3I(s)->hs_tls13.x25519_peer_public, X25519_KEY_LENGTH); - freezero(S3I(s)->hs_tls13.cookie, S3I(s)->hs_tls13.cookie_len); - S3I(s)->hs_tls13.cookie = NULL; - S3I(s)->hs_tls13.cookie_len = 0; - - S3I(s)->hs.extensions_seen = 0; rp = S3I(s)->rbuf.buf; wp = S3I(s)->wbuf.buf; |