summaryrefslogtreecommitdiffstats
path: root/lib/libssl/ssl_lib.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2017-01-26 06:32:58 +0000
committerjsing <jsing@openbsd.org>2017-01-26 06:32:58 +0000
commit53f78dfd664e371a1c7d0aa18adf6139de8bb900 (patch)
tree74c1665415e04cbdc3beb729468cb418c05eab80 /lib/libssl/ssl_lib.c
parentMove relatively new version range code from ssl_lib.c into a separate (diff)
downloadwireguard-openbsd-53f78dfd664e371a1c7d0aa18adf6139de8bb900.tar.xz
wireguard-openbsd-53f78dfd664e371a1c7d0aa18adf6139de8bb900.zip
Remove most of SSL3_ENC_METHOD - we can just inline the function calls
and defines since they are the same everywhere. ok beck@
Diffstat (limited to 'lib/libssl/ssl_lib.c')
-rw-r--r--lib/libssl/ssl_lib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c
index 6f31d6dcdf7..6d5d5c468b8 100644
--- a/lib/libssl/ssl_lib.c
+++ b/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_lib.c,v 1.152 2017/01/26 06:01:44 jsing Exp $ */
+/* $OpenBSD: ssl_lib.c,v 1.153 2017/01/26 06:32:58 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -1732,7 +1732,7 @@ 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)
{
- return (s->method->internal->ssl3_enc->export_keying_material(s, out, olen,
+ return (tls1_export_keying_material(s, out, olen,
label, llen, p, plen, use_context));
}