diff options
| author |   doug <doug@openbsd.org> | 2015-09-12 16:10:07 +0000 |
|---|---|---|
| committer | doug <doug@openbsd.org> | 2015-09-12 16:10:07 +0000 |
| commit | 80564b9250597b1c3ab6f9bb4cd07c234ce2d9b1 (patch) | |
| tree | 6885e75143441db57d1216d1edd52fbaefc9f07b /lib/libssl/src/ssl/ssl_lib.c | |
| parent | Use kbind for lazy binding GOT/PLT updates on arm. (diff) | |
| download | wireguard-openbsd-80564b9250597b1c3ab6f9bb4cd07c234ce2d9b1.tar.xz wireguard-openbsd-80564b9250597b1c3ab6f9bb4cd07c234ce2d9b1.zip | |
Remove most of the SSLv3 version checks and a few TLS v1.0.
We can now assume >= TLS v1.0 since SSL2_VERSION, SSL3_VERSION and
DTLS1_BAD_VER support was removed.
"reads ok" miod@
Diffstat (limited to 'lib/libssl/src/ssl/ssl_lib.c')
| -rw-r--r-- | lib/libssl/src/ssl/ssl_lib.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/libssl/src/ssl/ssl_lib.c b/lib/libssl/src/ssl/ssl_lib.c index fe73046366c..660ff99e271 100644 --- a/lib/libssl/src/ssl/ssl_lib.c +++ b/lib/libssl/src/ssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.110 2015/09/11 17:35:36 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.111 2015/09/12 16:10:07 doug Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1731,9 +1731,6 @@ SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen, const char *label, size_t llen, const unsigned char *p, size_t plen, int use_context) { - if (s->version < TLS1_VERSION) - return (-1); - return (s->method->ssl3_enc->export_keying_material(s, out, olen, label, llen, p, plen, use_context)); } |