diff options
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 4b5f119a88..c9c63e9d3f 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.306 2022/10/02 16:36:41 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.307 2022/11/07 11:58:45 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 | * |
@@ -163,6 +163,7 @@ | |||
163 | #include "ssl_locl.h" | 163 | #include "ssl_locl.h" |
164 | #include "ssl_sigalgs.h" | 164 | #include "ssl_sigalgs.h" |
165 | #include "ssl_tlsext.h" | 165 | #include "ssl_tlsext.h" |
166 | #include "tls12_internal.h" | ||
166 | 167 | ||
167 | const char *SSL_version_str = OPENSSL_VERSION_TEXT; | 168 | const char *SSL_version_str = OPENSSL_VERSION_TEXT; |
168 | 169 | ||
@@ -1867,21 +1868,21 @@ SSL_set_psk_use_session_callback(SSL *s, SSL_psk_use_session_cb_func cb) | |||
1867 | } | 1868 | } |
1868 | 1869 | ||
1869 | int | 1870 | int |
1870 | SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen, | 1871 | SSL_export_keying_material(SSL *s, unsigned char *out, size_t out_len, |
1871 | const char *label, size_t llen, const unsigned char *p, size_t plen, | 1872 | const char *label, size_t label_len, const unsigned char *context, |
1872 | int use_context) | 1873 | size_t context_len, int use_context) |
1873 | { | 1874 | { |
1874 | if (s->tls13 != NULL && s->version == TLS1_3_VERSION) { | 1875 | if (s->tls13 != NULL && s->version == TLS1_3_VERSION) { |
1875 | if (!use_context) { | 1876 | if (!use_context) { |
1876 | p = NULL; | 1877 | context = NULL; |
1877 | plen = 0; | 1878 | context_len = 0; |
1878 | } | 1879 | } |
1879 | return tls13_exporter(s->tls13, label, llen, p, plen, | 1880 | return tls13_exporter(s->tls13, label, label_len, context, |
1880 | out, olen); | 1881 | context_len, out, out_len); |
1881 | } | 1882 | } |
1882 | 1883 | ||
1883 | return (tls1_export_keying_material(s, out, olen, label, llen, p, plen, | 1884 | return tls12_exporter(s, label, label_len, context, context_len, |
1884 | use_context)); | 1885 | use_context, out, out_len); |
1885 | } | 1886 | } |
1886 | 1887 | ||
1887 | static unsigned long | 1888 | static unsigned long |