diff options
author | doug <> | 2015-09-12 16:10:08 +0000 |
---|---|---|
committer | doug <> | 2015-09-12 16:10:08 +0000 |
commit | 56a3e20d1e41c02e4afd069925ec512ebb40b905 (patch) | |
tree | ecc6c8f80b7c9e9b5057a82b1842ccf8724eb149 /src/lib/libssl/ssl_lib.c | |
parent | efc74c6a34e219450e0cc4dd809c41889209b98d (diff) | |
download | openbsd-56a3e20d1e41c02e4afd069925ec512ebb40b905.tar.gz openbsd-56a3e20d1e41c02e4afd069925ec512ebb40b905.tar.bz2 openbsd-56a3e20d1e41c02e4afd069925ec512ebb40b905.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 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index fe73046366..660ff99e27 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_lib.c,v 1.110 2015/09/11 17:35:36 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.111 2015/09/12 16:10:07 doug 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 | * |
@@ -1731,9 +1731,6 @@ SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen, | |||
1731 | const char *label, size_t llen, const unsigned char *p, size_t plen, | 1731 | const char *label, size_t llen, const unsigned char *p, size_t plen, |
1732 | int use_context) | 1732 | int use_context) |
1733 | { | 1733 | { |
1734 | if (s->version < TLS1_VERSION) | ||
1735 | return (-1); | ||
1736 | |||
1737 | return (s->method->ssl3_enc->export_keying_material(s, out, olen, | 1734 | return (s->method->ssl3_enc->export_keying_material(s, out, olen, |
1738 | label, llen, p, plen, use_context)); | 1735 | label, llen, p, plen, use_context)); |
1739 | } | 1736 | } |