[openssl] master update

[kaduk]

The branch master has been updated
       via  47b422c90aec6e3d1de38110d67e17133d086051 (commit)
      from  22dddfb925da8775eaf4ee8c377da41e6535afe1 (commit)


- Log -----------------------------------------------------------------
commit 47b422c90aec6e3d1de38110d67e17133d086051
Author: Matt Caswell <m...@openssl.org>
Date:   Thu Oct 22 13:53:27 2020 +0100

    Ensure we raise SSLfatal on error
    
    We were missing a call to SSLfatal. A comment claimed that we had already
    called it - but that is incorrect.
    
    Reviewed-by: Ben Kaduk <ka...@mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/13229)

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

Summary of changes:
 ssl/statem/statem_srvr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 81cea6db37..033a640edd 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -2588,7 +2588,7 @@ int tls_construct_server_key_exchange(SSL *s, WPACKET 
*pkt)
 
         s->s3.tmp.pkey = ssl_generate_pkey(s, pkdhp);
         if (s->s3.tmp.pkey == NULL) {
-            /* SSLfatal() already called */
+            SSLfatal(s, SSL_AD_INTERNAL_ERROR, 0, ERR_R_INTERNAL_ERROR);
             goto err;
         }