diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-05-16 19:31:14 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-05-19 12:12:52 +0200 |
| commit | 93c4fa4f8884212cd05f776c09ca909a0ff60b49 (patch) | |
| tree | cc04ad8f4478021b1d1b792b03f90f8a7f9a845b /lib/ssl | |
| parent | a29bb639a5a0acf7da4d4fa65e4dd7c9cdcadb3c (diff) | |
| download | otp-93c4fa4f8884212cd05f776c09ca909a0ff60b49.tar.gz otp-93c4fa4f8884212cd05f776c09ca909a0ff60b49.tar.bz2 otp-93c4fa4f8884212cd05f776c09ca909a0ff60b49.zip | |
ssl: Add missing algorithm ecdh_ecdsa
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_ECC_SUITE.erl | 20 |
2 files changed, 17 insertions, 5 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 58db8449d6..3cf466e78f 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -2295,6 +2295,8 @@ is_acceptable_hash_sign({_, dsa} = Algos, dsa, _, srp_dss, SupportedHashSigns) - is_acceptable_hash_sign(Algos, SupportedHashSigns); is_acceptable_hash_sign({_, ecdsa} = Algos, ecdsa, _, dhe_ecdsa, SupportedHashSigns) -> is_acceptable_hash_sign(Algos, SupportedHashSigns); +is_acceptable_hash_sign({_, ecdsa} = Algos, ecdsa, ecdsa, ecdh_ecdsa, SupportedHashSigns) -> + is_acceptable_hash_sign(Algos, SupportedHashSigns); is_acceptable_hash_sign({_, ecdsa} = Algos, ecdsa, ecdsa, ecdhe_ecdsa, SupportedHashSigns) -> is_acceptable_hash_sign(Algos, SupportedHashSigns); is_acceptable_hash_sign(_, _, _, KeyExAlgo, _) when diff --git a/lib/ssl/test/ssl_ECC_SUITE.erl b/lib/ssl/test/ssl_ECC_SUITE.erl index 1149513417..991a140e63 100644 --- a/lib/ssl/test/ssl_ECC_SUITE.erl +++ b/lib/ssl/test/ssl_ECC_SUITE.erl @@ -59,11 +59,13 @@ all_versions_groups ()-> key_cert_combinations() -> [client_ecdh_rsa_server_ecdh_rsa, client_ecdhe_rsa_server_ecdh_rsa, + client_ecdh_ecdsa_server_ecdh_ecdsa, + client_ecdhe_ecdsa_server_ecdh_ecdsa, client_ecdh_rsa_server_ecdhe_rsa, client_ecdhe_rsa_server_ecdhe_rsa, client_ecdhe_ecdsa_server_ecdhe_rsa, - client_ecdhe_ecdsa_server_ecdhe_ecdsa, - client_ecdh_rsa_server_ecdhe_ecdsa + client_ecdh_rsa_server_ecdhe_ecdsa, + client_ecdhe_ecdsa_server_ecdhe_ecdsa ]. misc()-> @@ -180,7 +182,7 @@ client_ecdh_rsa_server_ecdh_rsa(Config) when is_list(Config) -> client_ecdhe_rsa_server_ecdh_rsa(Config) when is_list(Config) -> {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains(ecdhe_rsa, ecdh_rsa, Config), - basic_test(COpts, SOpts, Config). + basic_test(COpts, [{ciphers, [{ecdh_rsa, aes_128_cbc, sha}]} | SOpts], Config). %% ECDHE_RSA client_ecdh_rsa_server_ecdhe_rsa(Config) when is_list(Config) -> @@ -196,12 +198,20 @@ client_ecdhe_ecdsa_server_ecdhe_rsa(Config) when is_list(Config) -> basic_test(COpts, SOpts, Config). %% ECDHE_ECDSA +client_ecdh_rsa_server_ecdhe_ecdsa(Config) when is_list(Config) -> + {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains(ecdh_rsa, ecdhe_ecdsa, Config), + basic_test(COpts, SOpts, Config). client_ecdhe_ecdsa_server_ecdhe_ecdsa(Config) when is_list(Config) -> {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains(ecdhe_ecdsa, ecdhe_ecdsa, Config), basic_test(COpts, SOpts, Config). -client_ecdh_rsa_server_ecdhe_ecdsa(Config) when is_list(Config) -> - {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains(ecdh_rsa, ecdhe_ecdsa, Config), +%% ECDH_ECDSA +client_ecdh_ecdsa_server_ecdh_ecdsa(Config) when is_list(Config) -> + {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains(ecdh_ecdsa, ecdh_ecdsa, Config), + basic_test(COpts, SOpts, Config). + +client_ecdhe_ecdsa_server_ecdh_ecdsa(Config) when is_list(Config) -> + {COpts, SOpts} = ssl_test_lib:make_ec_cert_chains(ecdhe_ecdsa, ecdh_ecdsa, Config), basic_test(COpts, SOpts, Config). client_ecdsa_server_ecdsa_with_raw_key(Config) when is_list(Config) -> |