From dffeec1c10a874d7c7b83c221dbbce82f755edb1 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Thu, 6 Aug 2020 11:20:43 +0200 Subject: Avoid segfault in SSL_export_keying_material if there is no session Fixes #12588 Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/12594) --- ssl/ssl_lib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ssl/ssl_lib.c') diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index f957664a48..c72341547a 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -3054,7 +3054,8 @@ int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen, const unsigned char *context, size_t contextlen, int use_context) { - if (s->version < TLS1_VERSION && s->version != DTLS1_BAD_VER) + if (s->session == NULL + || (s->version < TLS1_VERSION && s->version != DTLS1_BAD_VER)) return -1; return s->method->ssl3_enc->export_keying_material(s, out, olen, label, -- cgit v1.2.3