diff options
author | Matt Caswell <matt@openssl.org> | 2017-01-10 14:38:09 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2017-01-10 23:02:51 +0000 |
commit | 5eeb6c6e562937dcfdd4b79619a699a118deadba (patch) | |
tree | 27a7342242870aaf58000012011b018d4a23bd96 /test | |
parent | 7a531ee460ef517717105438a8b418dcc85c19b4 (diff) |
Fix no-ec following sigalgs refactor
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2157)
Diffstat (limited to 'test')
-rwxr-xr-x | test/recipes/70-test_sslsigalgs.t | 6 | ||||
-rw-r--r-- | test/sslapitest.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/test/recipes/70-test_sslsigalgs.t b/test/recipes/70-test_sslsigalgs.t index 51fee42aaf..e5434187a3 100755 --- a/test/recipes/70-test_sslsigalgs.t +++ b/test/recipes/70-test_sslsigalgs.t @@ -92,8 +92,8 @@ SKIP: { } SKIP: { - skip "TLSv1.3 or TLSv1.2 disabled", 2 - if disabled("tls1_2") || disabled("tls1_3"); + skip "EC, TLSv1.3 or TLSv1.2 disabled", 2 + if disabled("tls1_2") || disabled("tls1_3") || disabled("ec"); #Test 7: Sending a valid sig algs list but not including a sig type that # matches the certificate should fail in TLSv1.3. We need TLSv1.2 @@ -118,7 +118,7 @@ SKIP: { } SKIP: { - skip "TLSv1.2 disabled", 7 if disabled("tls1_2"); + skip "EC or TLSv1.2 disabled", 7 if disabled("tls1_2") || disabled("ec"); $proxy->filter(\&sigalgs_filter); diff --git a/test/sslapitest.c b/test/sslapitest.c index 9e3326d2e8..4a84f4db44 100644 --- a/test/sslapitest.c +++ b/test/sslapitest.c @@ -897,19 +897,25 @@ typedef struct { } sigalgs_list; static const int validlist1[] = {NID_sha256, EVP_PKEY_RSA}; +#ifndef OPENSSL_NO_EC static const int validlist2[] = {NID_sha256, EVP_PKEY_RSA, NID_sha512, EVP_PKEY_EC}; static const int validlist3[] = {NID_sha512, EVP_PKEY_EC}; +#endif static const int invalidlist1[] = {NID_undef, EVP_PKEY_RSA}; static const int invalidlist2[] = {NID_sha256, NID_undef}; static const int invalidlist3[] = {NID_sha256, EVP_PKEY_RSA, NID_sha256}; static const int invalidlist4[] = {NID_sha256}; static const sigalgs_list testsigalgs[] = { {validlist1, OSSL_NELEM(validlist1), NULL, 1, 1}, +#ifndef OPENSSL_NO_EC {validlist2, OSSL_NELEM(validlist2), NULL, 1, 1}, {validlist3, OSSL_NELEM(validlist3), NULL, 1, 0}, +#endif {NULL, 0, "RSA+SHA256", 1, 1}, +#ifndef OPENSSL_NO_EC {NULL, 0, "RSA+SHA256:ECDSA+SHA512", 1, 1}, {NULL, 0, "ECDSA+SHA512", 1, 0}, +#endif {invalidlist1, OSSL_NELEM(invalidlist1), NULL, 0, 0}, {invalidlist2, OSSL_NELEM(invalidlist2), NULL, 0, 0}, {invalidlist3, OSSL_NELEM(invalidlist3), NULL, 0, 0}, |