From: Dr. Stephen Henson Date: Thu, 12 Jan 2017 13:58:48 +0000 (+0000) Subject: add ECDSA test server certificate X-Git-Tag: OpenSSL_1_1_1-pre1~2667 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7289ab49d1c04cd9065429f75be028d7439d8248;p=oweals%2Fopenssl.git add ECDSA test server certificate Reviewed-by: Emilia Käsper (Merged from https://github.com/openssl/openssl/pull/2224) --- diff --git a/test/README.ssltest.md b/test/README.ssltest.md index 48d5474a08..1c4c482069 100644 --- a/test/README.ssltest.md +++ b/test/README.ssltest.md @@ -89,7 +89,7 @@ handshake. * ExpectedTmpKeyType - the expected algorithm or curve of server temp key -* ExpectedServerKeyType, ExpectedClientKeyType - the expected algorithm or +* ExpectedServerCertType, ExpectedClientCertType - the expected algorithm or curve of server or client certificate ## Configuring the client and server diff --git a/test/certs/server-ecdsa-cert.pem b/test/certs/server-ecdsa-cert.pem new file mode 100644 index 0000000000..e61026b507 --- /dev/null +++ b/test/certs/server-ecdsa-cert.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICYTCCAUmgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdSb290 +IENBMCAXDTE3MDExMjE0NDUwMVoYDzIxMTcwMTEzMTQ0NTAxWjAcMRowGAYDVQQD +DBFTZXJ2ZXIgRUNEU0EgY2VydDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABOI7 +NNxE483tJyIKT6KOQM5Zlfrigh12BEcHxnzpudgVHYA4aL5D5JulYGFzL0LQ5Q55 +GpCub1V2j+AhyBMKPQqjgYAwfjAdBgNVHQ4EFgQUSDzlr0Ayx22BljPtY6YRLTes +qgwwHwYDVR0jBBgwFoAUcH8uroNoWZgEIyrN6z4XzSTdAUkwCQYDVR0TBAIwADAT +BgNVHSUEDDAKBggrBgEFBQcDATAcBgNVHREEFTATghFTZXJ2ZXIgRUNEU0EgY2Vy +dDANBgkqhkiG9w0BAQsFAAOCAQEAOJDgr1hRNuxW1D93yDWFwP1o2KuaI0BMZVFS +6rzzLThCo3FeS6X7DCrBP699PCYcKeyMDmQwg9mVMABSZzox2GBO3hoqtnUXjsK3 +Qxh+4O5EmIXX4v8szdSBP14O2c5krAk4lbVWxLHE78NAc8dL94VORndyTcmaXUTn +FQeBaRJjXto3okPvwYlczPS9sq0AhuBh5hwsLOYwpLf6/loPLjl40iwPQ+iqQ1EV +m0Sac3o+0qI0cKiz4nXgd4NkFvV3G8lwd0Um8KSS/EFuZbgJNKKD6+1+90sibM4a +Y/JiO6weK/VTlqCLn7zV9LcDT4gU18UCn85UV1XlVYKXZlaXYQ== +-----END CERTIFICATE----- diff --git a/test/certs/server-ecdsa-key.pem b/test/certs/server-ecdsa-key.pem new file mode 100644 index 0000000000..b4d075db13 --- /dev/null +++ b/test/certs/server-ecdsa-key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgTI5Nzy/YCNpEuATr +6jFtuZA5Vs15zbXOJU5EXl+JAe6hRANCAATiOzTcROPN7SciCk+ijkDOWZX64oId +dgRHB8Z86bnYFR2AOGi+Q+SbpWBhcy9C0OUOeRqQrm9Vdo/gIcgTCj0K +-----END PRIVATE KEY----- diff --git a/test/ssl_test.c b/test/ssl_test.c index af92aa13cf..0d0c35ecca 100644 --- a/test/ssl_test.c +++ b/test/ssl_test.c @@ -187,7 +187,7 @@ static int check_resumption(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) return 1; } -static int check_key_type(const char *name,int expected_key_type, int key_type) +static int check_key_type(const char *name, int expected_key_type, int key_type) { if (expected_key_type == 0 || expected_key_type == key_type) return 1;