diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-01-25 10:35:16 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-01-25 10:35:16 +0100 |
| commit | 62238bdab1c035388d83bdfb670ee178c6f3f448 (patch) | |
| tree | 058894c85d9be37ed361c3f28dab943d70101f12 /lib | |
| parent | e6842033aa2ddcab751fc9cbd89eeaca19cfdf71 (diff) | |
| parent | 7b06942e7e08583bdb2e5c35a2d8b94a165e1cf7 (diff) | |
| download | otp-62238bdab1c035388d83bdfb670ee178c6f3f448.tar.gz otp-62238bdab1c035388d83bdfb670ee178c6f3f448.tar.bz2 otp-62238bdab1c035388d83bdfb670ee178c6f3f448.zip | |
Merge branch 'ia/ssl/test-alpn-cuddle' into maint
* ia/ssl/test-alpn-cuddle:
ssl: Fix typos that broke alpn tests
Diffstat (limited to 'lib')
| -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), |