diff options
| author | Hugo Landau <hlandau@openssl.org> | 2024-02-13 12:29:53 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2024-02-14 18:14:52 +0100 |
| commit | 12c0d72c4a82804f3c2d234ea9ea4e3a2fbb257b (patch) | |
| tree | 90b05d9d131f6b5b71e200de88e81de09a8a3be3 /ssl | |
| parent | Skip shlibload tests if no-atexit is configured (diff) | |
| download | openssl-12c0d72c4a82804f3c2d234ea9ea4e3a2fbb257b.tar.xz openssl-12c0d72c4a82804f3c2d234ea9ea4e3a2fbb257b.zip | |
Fix SSL_export_keying_material for QUIC
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23567)
(cherry picked from commit 498d4e4c4f4a1e220cfa64cfcc76174e2f656fd0)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_lib.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 7d618bd700..f44a1bfe33 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -3766,9 +3766,10 @@ int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen, || (sc->version < TLS1_VERSION && sc->version != DTLS1_BAD_VER)) return -1; - return s->method->ssl3_enc->export_keying_material(sc, out, olen, label, - llen, context, - contextlen, use_context); + return sc->ssl.method->ssl3_enc->export_keying_material(sc, out, olen, label, + llen, context, + contextlen, + use_context); } int SSL_export_keying_material_early(SSL *s, unsigned char *out, size_t olen, |