diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-03-07 11:55:13 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-03-07 11:55:13 +0100 |
| commit | b0759a45ffa561b82d97c4704112fcabc8a846d2 (patch) | |
| tree | ddefcb5394b7d6fc2373c956485ab30e62e16b29 /lib/ssl/test/ssl_test_lib.erl | |
| parent | 51d486c31096287d994cf9a02f1335336eda5e93 (diff) | |
| download | otp-b0759a45ffa561b82d97c4704112fcabc8a846d2.tar.gz otp-b0759a45ffa561b82d97c4704112fcabc8a846d2.tar.bz2 otp-b0759a45ffa561b82d97c4704112fcabc8a846d2.zip | |
dtls: Avoid mixup of protocol to test
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index ef5de382a4..7a644968f2 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1055,14 +1055,16 @@ init_tls_version(Version, Config) application:load(ssl), application:set_env(ssl, dtls_protocol_version, Version), ssl:start(), - [{protocol, dtls}, {protocol_opts, [{protocol, dtls}]}|Config]; + NewConfig = proplists:delete(protocol_opts, proplists:delete(protocol, Config)), + [{protocol, dtls}, {protocol_opts, [{protocol, dtls}]} | NewConfig]; init_tls_version(Version, Config) -> ssl:stop(), application:load(ssl), application:set_env(ssl, protocol_version, Version), ssl:start(), - [{protocol, tls}|Config]. + NewConfig = proplists:delete(protocol_opts, proplists:delete(protocol, Config)), + [{protocol, tls} | NewConfig]. sufficient_crypto_support(Version) when Version == 'tlsv1.2'; Version == 'dtlsv1.2' -> |