diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-01-25 10:36:00 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-01-25 10:36:00 +0100 |
| commit | e1430adbefd18b7e7b6c5e3509caad8d6450b21e (patch) | |
| tree | e7f67a29eaf7a85076ef1ac97ae1277c602e5cd1 /lib/ssl/test | |
| parent | 453934c7f240c1105088a63b8c4bb24e191c8b81 (diff) | |
| parent | 62238bdab1c035388d83bdfb670ee178c6f3f448 (diff) | |
| download | otp-e1430adbefd18b7e7b6c5e3509caad8d6450b21e.tar.gz otp-e1430adbefd18b7e7b6c5e3509caad8d6450b21e.tar.bz2 otp-e1430adbefd18b7e7b6c5e3509caad8d6450b21e.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/test')
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index bcdefb5fca..ecf6c4d6b8 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -1445,7 +1445,7 @@ start_erlang_client_and_openssl_server_for_alpn_negotiation(Config, Data, Callba Exe = "openssl", Args = ["s_server", "-msg", "-alpn", "http/1.1,spdy/2", "-accept", integer_to_list(Port), ssl_test_lib:version_flag(Version), - "-cert", CertFile, "-key" ++ KeyFile], + "-cert", CertFile, "-key", KeyFile], OpensslPort = ssl_test_lib:portable_open_port(Exe, Args), ssl_test_lib:wait_for_openssl_server(Port), @@ -1480,7 +1480,7 @@ start_erlang_server_and_openssl_client_for_alpn_negotiation(Config, Data, Callba Version = tls_record:protocol_version(tls_record:highest_protocol_version([])), Exe = "openssl", - Args = ["s_client", "-alpn", "http/1.0,spdy/2" "-msg" "-port", + Args = ["s_client", "-alpn", "http/1.0,spdy/2", "-msg", "-port", integer_to_list(Port), ssl_test_lib:version_flag(Version), "-host", "localhost"], @@ -1512,7 +1512,7 @@ start_erlang_client_and_openssl_server_for_alpn_npn_negotiation(Config, Data, Ca Exe = "openssl", Args = ["s_server", "-msg", "-alpn", "http/1.1,spdy/2", "-nextprotoneg", "spdy/3", "-accept", integer_to_list(Port), ssl_test_lib:version_flag(Version), - "-cert" ++ CertFile ++ "-key" ++ KeyFile], + "-cert", CertFile, "-key", KeyFile], OpensslPort = ssl_test_lib:portable_open_port(Exe, Args), |