diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-07-05 10:37:42 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-07-10 16:22:50 +0200 |
| commit | baee0f8436aaa5a3d6c15e917cac0515cbd8b451 (patch) | |
| tree | eda45486c2b1f8ec8ed854e3c6ca82ce00ef3b4a /lib/ssl/test/ssl_ECC_openssl_SUITE.erl | |
| parent | 531d8a7a4ae8d255f023ea9196cd2ac4be915b6d (diff) | |
| download | otp-baee0f8436aaa5a3d6c15e917cac0515cbd8b451.tar.gz otp-baee0f8436aaa5a3d6c15e917cac0515cbd8b451.tar.bz2 otp-baee0f8436aaa5a3d6c15e917cac0515cbd8b451.zip | |
ssl: No cipher suite sign restriction in TLS-1.2
Conflicts:
lib/ssl/test/ssl_ECC_SUITE.erl
Diffstat (limited to 'lib/ssl/test/ssl_ECC_openssl_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_ECC_openssl_SUITE.erl | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_ECC_openssl_SUITE.erl b/lib/ssl/test/ssl_ECC_openssl_SUITE.erl index 1a69c58a8f..81a7dfd2da 100644 --- a/lib/ssl/test/ssl_ECC_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_ECC_openssl_SUITE.erl @@ -57,13 +57,13 @@ all_groups() -> groups() -> case ssl_test_lib:openssl_sane_dtls() of true -> - [{'tlsv1.2', [], test_cases()}, + [{'tlsv1.2', [], [mix_sign | test_cases()]}, {'tlsv1.1', [], test_cases()}, {'tlsv1', [], test_cases()}, - {'dtlsv1.2', [], test_cases()}, + {'dtlsv1.2', [], [mix_sign | test_cases()]}, {'dtlsv1', [], test_cases()}]; false -> - [{'tlsv1.2', [], test_cases()}, + [{'tlsv1.2', [], [mix_sign | test_cases()]}, {'tlsv1.1', [], test_cases()}, {'tlsv1', [], test_cases()}] end. @@ -203,6 +203,16 @@ client_ecdh_ecdsa_server_ecdhe_ecdsa(Config) when is_list(Config) -> client_ecdhe_ecdsa_server_ecdhe_ecdsa(Config) when is_list(Config) -> ssl_ECC:client_ecdhe_ecdsa_server_ecdhe_ecdsa(Config). +mix_sign(Config) -> + {COpts0, SOpts0} = ssl_test_lib:make_mix_cert(Config), + COpts = ssl_test_lib:ssl_options(COpts0, Config), + SOpts = ssl_test_lib:ssl_options(SOpts0, Config), + ECDHE_ECDSA = + ssl:filter_cipher_suites(ssl:cipher_suites(default, 'tlsv1.2'), + [{key_exchange, fun(ecdhe_ecdsa) -> true; (_) -> false end}]), + ssl_test_lib:basic_test(COpts, [{ciphers, ECDHE_ECDSA} | SOpts], [{client_type, erlang}, + {server_type, openssl} | Config]). + %%-------------------------------------------------------------------- %% Internal functions ------------------------------------------------ %%-------------------------------------------------------------------- |