svn commit: r360147 - stable/12/crypto/openssl/ssl

[Gordon Tetlow]

Author: gordon
Date: Tue Apr 21 15:47:58 2020
New Revision: 360147
URL: https://svnweb.freebsd.org/changeset/base/360147

Log:
  MFC: r360146
  Fix OpenSSL remote denial of service.
  
  See https://www.openssl.org/news/secadv/20200421.txt for details.
  
  Approved by:	so
  Security:	FreeBSD-SA-20:11.openssl
  Security:	CVE-2020-1967

Modified:
  stable/12/crypto/openssl/ssl/t1_lib.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/crypto/openssl/ssl/t1_lib.c
==============================================================================
--- stable/12/crypto/openssl/ssl/t1_lib.c	Tue Apr 21 15:44:20 2020	(r360146)
+++ stable/12/crypto/openssl/ssl/t1_lib.c	Tue Apr 21 15:47:58 2020	(r360147)
@@ -2130,7 +2130,7 @@ static int tls1_check_sig_alg(SSL *s, X509 *x, int def
         sigalg = use_pc_sigalgs
                  ? tls1_lookup_sigalg(s->s3->tmp.peer_cert_sigalgs[i])
                  : s->shared_sigalgs[i];
-        if (sig_nid == sigalg->sigandhash)
+        if (sigalg != NULL && sig_nid == sigalg->sigandhash)
             return 1;
     }
     return 0;