[openssl] OpenSSL_1_1_1-stable update

[tmraz at fedoraproject.org]

The branch OpenSSL_1_1_1-stable has been updated
       via  925a9d0a8168bfd0b532bc6600ba3e7ab47a7592 (commit)
      from  ea7a58a60659d12d102ec78af4d6c3e589347150 (commit)


- Log -----------------------------------------------------------------
commit 925a9d0a8168bfd0b532bc6600ba3e7ab47a7592
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Thu Aug 6 11:20:43 2020 +0200

    Avoid segfault in SSL_export_keying_material if there is no session
    
    Fixes #12588
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12594)
    
    (cherry picked from commit dffeec1c10a874d7c7b83c221dbbce82f755edb1)

-----------------------------------------------------------------------

Summary of changes:
 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 433a537969..b1df374817 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,