diff options
author | miod <> | 2014-06-13 04:29:13 +0000 |
---|---|---|
committer | miod <> | 2014-06-13 04:29:13 +0000 |
commit | 9ef9f06708ef4fe615f3485f5d82f3fb919fdf03 (patch) | |
tree | 4a096128d8787d1beedaa53fd558a98773de0840 /src/lib/libssl/d1_lib.c | |
parent | cc594d5ff9b7bb08404d34d62287ee1dfd6b8332 (diff) | |
download | openbsd-9ef9f06708ef4fe615f3485f5d82f3fb919fdf03.tar.gz openbsd-9ef9f06708ef4fe615f3485f5d82f3fb919fdf03.tar.bz2 openbsd-9ef9f06708ef4fe615f3485f5d82f3fb919fdf03.zip |
Remove support for the `opaque PRF input' extension, which draft has expired
7 years ago and never made it into an RFC. That code wasn't compiled in
anyway unless one would define the actual on-the-wire extension id bytes;
crank libssl major.
With help and enlightenment from Brendan MacDonell.
Diffstat (limited to '')
-rw-r--r-- | src/lib/libssl/d1_lib.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libssl/d1_lib.c b/src/lib/libssl/d1_lib.c index 0b7c6404c5..13c93a77cf 100644 --- a/src/lib/libssl/d1_lib.c +++ b/src/lib/libssl/d1_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: d1_lib.c,v 1.19 2014/06/12 15:49:31 deraadt Exp $ */ | 1 | /* $OpenBSD: d1_lib.c,v 1.20 2014/06/13 04:29:13 miod Exp $ */ |
2 | /* | 2 | /* |
3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
@@ -135,6 +135,7 @@ dtls1_new(SSL *s) | |||
135 | if (d1->buffered_app_data.q) | 135 | if (d1->buffered_app_data.q) |
136 | pqueue_free(d1->buffered_app_data.q); | 136 | pqueue_free(d1->buffered_app_data.q); |
137 | free(d1); | 137 | free(d1); |
138 | ssl3_free(s); | ||
138 | return (0); | 139 | return (0); |
139 | } | 140 | } |
140 | 141 | ||
@@ -199,6 +200,7 @@ dtls1_free(SSL *s) | |||
199 | pqueue_free(s->d1->sent_messages); | 200 | pqueue_free(s->d1->sent_messages); |
200 | pqueue_free(s->d1->buffered_app_data.q); | 201 | pqueue_free(s->d1->buffered_app_data.q); |
201 | 202 | ||
203 | OPENSSL_cleanse(s->d1, sizeof *s->d1); | ||
202 | free(s->d1); | 204 | free(s->d1); |
203 | s->d1 = NULL; | 205 | s->d1 = NULL; |
204 | } | 206 | } |