diff options
author | jsing <> | 2017-01-26 06:32:58 +0000 |
---|---|---|
committer | jsing <> | 2017-01-26 06:32:58 +0000 |
commit | aa0037c390e8abacf9713cd2521b1b3f265af0e9 (patch) | |
tree | 09a483692ecb3d9b3259d70bca4f0473c356e0f5 /src/lib/libssl/ssl_lib.c | |
parent | 49b29010b73e2191c70fb3c541ef163c31dc59f6 (diff) | |
download | openbsd-aa0037c390e8abacf9713cd2521b1b3f265af0e9.tar.gz openbsd-aa0037c390e8abacf9713cd2521b1b3f265af0e9.tar.bz2 openbsd-aa0037c390e8abacf9713cd2521b1b3f265af0e9.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 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ | |||
1 | /* $OpenBSD: ssl_lib.c,v 1.152 2017/01/26 06:01:44 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.153 2017/01/26 06:32:58 jsing 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 | * |
@@ -1732,7 +1732,7 @@ SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen, | |||
1732 | const char *label, size_t llen, const unsigned char *p, size_t plen, | 1732 | const char *label, size_t llen, const unsigned char *p, size_t plen, |
1733 | int use_context) | 1733 | int use_context) |
1734 | { | 1734 | { |
1735 | return (s->method->internal->ssl3_enc->export_keying_material(s, out, olen, | 1735 | return (tls1_export_keying_material(s, out, olen, |
1736 | label, llen, p, plen, use_context)); | 1736 | label, llen, p, plen, use_context)); |
1737 | } | 1737 | } |
1738 | 1738 | ||