[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  94dc4282c3b85864596e9f333017fdb46de352ff (commit)
      from  da671c4184a4c8e7c3856b9ccdc6a6b4cece4012 (commit)


- Log -----------------------------------------------------------------
commit 94dc4282c3b85864596e9f333017fdb46de352ff
Author: Pauli <pauli at openssl.org>
Date:   Thu Apr 22 16:13:10 2021 +1000

    Runchecker: fix TLS curves test failure with no-tls1_3 option
    
    The TLS curves test strong assumes that TLS 1.2 and TLS 1.3 are present.
    It is only conditioned out if TLS 1.2 isn't.  This changes also conditions
    it out if TLS 1.3 isn't present.
    
    Fixes ##14965
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14978)

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

Summary of changes:
 test/recipes/80-test_ssl_new.t | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 4dc2529593..a1828094db 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -98,7 +98,8 @@ my %skip = (
   # special-casing for.
   # TODO(TLS 1.3): We should review this once we have TLS 1.3.
   "13-fragmentation.cnf" => disabled("tls1_2"),
-  "14-curves.cnf" => disabled("tls1_2") || $no_ec || $no_ec2m,
+  "14-curves.cnf" => disabled("tls1_2") || disabled("tls1_3")
+                     || $no_ec || $no_ec2m,
   "15-certstatus.cnf" => $no_tls || $no_ocsp,
   "16-dtls-certstatus.cnf" => $no_dtls || $no_ocsp,
   "17-renegotiate.cnf" => $no_tls_below1_3,