diff options
| author | Benjamin Kaduk <bkaduk@akamai.com> | 2017-04-27 10:32:30 -0500 |
|---|---|---|
| committer | Benjamin Kaduk <kaduk@mit.edu> | 2017-06-24 19:25:43 -0500 |
| commit | 818137766e0c34d3447f1f97c4557100d2e6df94 (patch) | |
| tree | 183ce2f88dab612b8b2da980b44b7b498910c754 /test | |
| parent | d499a3e185d909c779801c6d1310218a25898341 (diff) | |
Fix no-dsa build
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3326)
Diffstat (limited to 'test')
| -rw-r--r-- | test/dsatest.c | 2 | ||||
| -rw-r--r-- | test/ssl-tests/20-cert-select.conf.in | 24 |
2 files changed, 14 insertions, 12 deletions
diff --git a/test/dsatest.c b/test/dsatest.c index e4ed8ebd63..579e57c382 100644 --- a/test/dsatest.c +++ b/test/dsatest.c @@ -21,6 +21,7 @@ #include "testutil.h" #include "e_os.h" +#ifndef OPENSSL_NO_DSA static int dsa_cb(int p, int n, BN_GENCB *arg); /* @@ -134,6 +135,7 @@ static int dsa_cb(int p, int n, BN_GENCB *arg) } return 1; } +#endif /* OPENSSL_NO_DSA */ void register_tests(void) { diff --git a/test/ssl-tests/20-cert-select.conf.in b/test/ssl-tests/20-cert-select.conf.in index 90bc5a23c8..96801e2cd1 100644 --- a/test/ssl-tests/20-cert-select.conf.in +++ b/test/ssl-tests/20-cert-select.conf.in @@ -430,18 +430,6 @@ my @tests_tls_1_3 = ( "ExpectedResult" => "Success" }, }, - { - name => "TLS 1.3 Client Auth No TLS 1.3 Signature Algorithms", - server => { - "ClientSignatureAlgorithms" => "ECDSA+SHA1:DSA+SHA256:RSA+SHA256", - "VerifyCAFile" => test_pem("root-cert.pem"), - "VerifyMode" => "Request" - }, - client => {}, - test => { - "ExpectedResult" => "ServerFail" - }, - }, ); push @tests, @tests_tls_1_3 unless disabled("tls1_3"); @@ -469,6 +457,18 @@ my @tests_dsa_tls_1_2 = ( my @tests_dsa_tls_1_3 = ( { + name => "TLS 1.3 Client Auth No TLS 1.3 Signature Algorithms", + server => { + "ClientSignatureAlgorithms" => "ECDSA+SHA1:DSA+SHA256:RSA+SHA256", + "VerifyCAFile" => test_pem("root-cert.pem"), + "VerifyMode" => "Request" + }, + client => {}, + test => { + "ExpectedResult" => "ServerFail" + }, + }, + { name => "TLS 1.3 DSA Certificate Test", server => { "DSA.Certificate" => test_pem("server-dsa-cert.pem"), |