diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-08-14 10:07:15 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-08-23 08:53:57 +0200 |
| commit | 6beee41654d80fcc2779ab6b51b5b141f592354d (patch) | |
| tree | 43874212d778d128441cfdd4614abd85a009ed4a /lib/ssl/test/ssl_test_lib.erl | |
| parent | 7e3d979418747e30e55274c6b5ea805625e19dc4 (diff) | |
| download | otp-6beee41654d80fcc2779ab6b51b5b141f592354d.tar.gz otp-6beee41654d80fcc2779ab6b51b5b141f592354d.tar.bz2 otp-6beee41654d80fcc2779ab6b51b5b141f592354d.zip | |
ssl: Enable more DTLS tests
Problems with failure of ssl_certificate_verify_SUITE when enabling DTLS-1
tests in ssl_basic_SUITE was a combination of the bug fixed by the
previous commit and missing clean up code for dtls_protocol_versions
application environment variable
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index f627ebce2e..c919f901a1 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1115,6 +1115,10 @@ init_tls_version(Version, Config) -> NewConfig = proplists:delete(protocol_opts, proplists:delete(protocol, Config)), [{protocol, tls} | NewConfig]. +init_tls_version_default(Config) -> + %% Remove non default options that may be left from other test groups + proplists:delete(protocol_opts, proplists:delete(protocol, Config)). + sufficient_crypto_support(Version) when Version == 'tlsv1.2'; Version == 'dtlsv1.2' -> CryptoSupport = crypto:supports(), @@ -1224,7 +1228,7 @@ is_fips(_) -> false. cipher_restriction(Config0) -> - Version = tls_record:protocol_version(protocol_version(Config0)), + Version = protocol_version(Config0, tuple), case is_sane_ecc(openssl) of false -> Opts = proplists:get_value(server_opts, Config0), @@ -1455,6 +1459,7 @@ ct_log_supported_protocol_versions(Config) -> clean_env() -> application:unset_env(ssl, protocol_version), + application:unset_env(ssl, dtls_protocol_version), application:unset_env(ssl, session_lifetime), application:unset_env(ssl, session_cb), application:unset_env(ssl, session_cb_init_args), |