diff options
| author | Ingela Andin <[email protected]> | 2018-07-06 14:47:41 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-07-06 14:47:41 +0200 |
| commit | 0a6963fcc4a077a7b51669178271dc4ae4d7d3cb (patch) | |
| tree | c4bf5844fc9067440e47985ec0f0791fc5d7bb77 /lib/ssl/test/ssl_ECC_openssl_SUITE.erl | |
| parent | 023db8778e1ab091abe5743d880fbb9eba121b5e (diff) | |
| parent | a492841c3305ed680e364101a5fc8cd32602a737 (diff) | |
| download | otp-0a6963fcc4a077a7b51669178271dc4ae4d7d3cb.tar.gz otp-0a6963fcc4a077a7b51669178271dc4ae4d7d3cb.tar.bz2 otp-0a6963fcc4a077a7b51669178271dc4ae4d7d3cb.zip | |
Merge pull request #1867 from IngelaAndin/ingela/ssl/no-ca-sign-restriction-TLS-1.2/ERL-381/OTP-15173
Ingela/ssl/no ca sign restriction tls 1.2/erl 381/otp 15173
Diffstat (limited to 'lib/ssl/test/ssl_ECC_openssl_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_ECC_openssl_SUITE.erl | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_ECC_openssl_SUITE.erl b/lib/ssl/test/ssl_ECC_openssl_SUITE.erl index 5a08b152a6..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. @@ -202,6 +202,17 @@ client_ecdh_ecdsa_server_ecdhe_ecdsa(Config) when is_list(Config) -> ssl_ECC:client_ecdh_ecdsa_server_ecdhe_ecdsa(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 ------------------------------------------------ %%-------------------------------------------------------------------- |