From aa0037c390e8abacf9713cd2521b1b3f265af0e9 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Thu, 26 Jan 2017 06:32:58 +0000 Subject: Remove most of SSL3_ENC_METHOD - we can just inline the function calls and defines since they are the same everywhere. ok beck@ --- src/lib/libssl/ssl_lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/libssl/ssl_lib.c') diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 6f31d6dcdf..6d5d5c468b 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/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)); } -- cgit v1.2.3-55-g6feb