Commit 1316c9ff authored by Benjamin Kaduk's avatar Benjamin Kaduk Committed by Rich Salz
Browse files

Fix no-ec 



Also remove nested OPENSSL_NO_EC conditional; it was properly indented,
but a no-op.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarBenjamin Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/3693)
parent 3ec32be7

ssl/t1_lib.c

+0 −2
Original line number Diff line number Diff line
@@ -621,7 +621,6 @@ static int tls1_check_cert_param(SSL *s, X509 *x, int check_ee_md) 
    return rv;

}



# ifndef OPENSSL_NO_EC

/*

 * tls1_check_ec_tmp_key - Check EC temporary key compatibility

 * @s: SSL connection
@@ -658,7 +657,6 @@ int tls1_check_ec_tmp_key(SSL *s, unsigned long cid) 
        return 1;

    return 0;

}

# endif                         /* OPENSSL_NO_EC */



#else

test/recipes/60-test_x509_check_cert_pkey.t

+7 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 




use OpenSSL::Test qw/:DEFAULT srctop_file/;

use OpenSSL::Test::Utils;



setup("test_x509_check_cert_pkey");
@@ -26,9 +27,12 @@ ok(run(test(["x509_check_cert_pkey_test", 
             srctop_file("test", "certs", "server-dsa-cert.pem"),

             srctop_file("test", "certs", "server-dsa-key.pem"), "cert", "ok"])));

# ecc

SKIP: {

    skip "EC disabled", 1 if disabled("ec");

    ok(run(test(["x509_check_cert_pkey_test",

                 srctop_file("test", "certs", "server-ecdsa-cert.pem"),

                 srctop_file("test", "certs", "server-ecdsa-key.pem"), "cert", "ok"])));

}

# certificate request (rsa)

ok(run(test(["x509_check_cert_pkey_test",

             srctop_file("test", "certs", "x509-check.csr"),