34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 925a9d0a8168bfd0b532bc6600ba3e7ab47a7592 Mon Sep 17 00:00:00 2001
|
|
From: Tomas Mraz <tmraz@fedoraproject.org>
|
|
Date: Thu, 6 Aug 2020 11:20:43 +0200
|
|
Subject: [PATCH 060/147] Avoid segfault in SSL_export_keying_material if there
|
|
is no session
|
|
|
|
Fixes #12588
|
|
|
|
Reviewed-by: Matt Caswell <matt@openssl.org>
|
|
(Merged from https://github.com/openssl/openssl/pull/12594)
|
|
|
|
(cherry picked from commit dffeec1c10a874d7c7b83c221dbbce82f755edb1)
|
|
---
|
|
ssl/ssl_lib.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
|
|
index 433a537..b1df374 100644
|
|
--- a/ssl/ssl_lib.c
|
|
+++ b/ssl/ssl_lib.c
|
|
@@ -2897,7 +2897,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,
|
|
--
|
|
1.8.3.1
|
|
|