diff options
| author | Péter Dimitrov <[email protected]> | 2019-07-26 14:45:04 +0200 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-07-26 16:12:41 +0200 |
| commit | 96bea6b1572c3445df53cba985072f9613c73ac1 (patch) | |
| tree | 71f31f749f22457a73e1aaa7655b6c2dd7c3f25c /lib/ssl/test/ssl_test_lib.erl | |
| parent | 5fc96782a03e2fa170a8a7a3781d32b176af0548 (diff) | |
| download | otp-96bea6b1572c3445df53cba985072f9613c73ac1.tar.gz otp-96bea6b1572c3445df53cba985072f9613c73ac1.tar.bz2 otp-96bea6b1572c3445df53cba985072f9613c73ac1.zip | |
ssl: Enable TLS 1.3 test groups in FT
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 5d0d09b33a..7009a628f1 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1363,7 +1363,7 @@ start_server(openssl, ClientOpts, ServerOpts, Config) -> Exe = "openssl", CertArgs = openssl_cert_options(ServerOpts), [Cipher|_] = proplists:get_value(ciphers, ClientOpts, ssl:cipher_suites(default,Version)), - Args = ["s_server", "-accept", integer_to_list(Port), "-cipher", + Args = ["s_server", "-accept", integer_to_list(Port), cipher_flag(Version), ssl_cipher_format:suite_map_to_openssl_str(Cipher), ssl_test_lib:version_flag(Version)] ++ CertArgs ++ ["-msg", "-debug"], OpenSslPort = portable_open_port(Exe, Args), @@ -1381,6 +1381,11 @@ start_server(erlang, _, ServerOpts, Config) -> {options, [{verify, verify_peer}, {versions, Versions} | ServerOpts]}]), {Server, inet_port(Server)}. +cipher_flag('tlsv1.3') -> + "-ciphersuites"; +cipher_flag(_) -> + "-cipher". + start_server_with_raw_key(erlang, ServerOpts, Config) -> {_, ServerNode, _} = ssl_test_lib:run_where(Config), Server = start_server([{node, ServerNode}, {port, 0}, |