diff options
author | Ingela Anderton Andin <[email protected]> | 2015-12-11 12:02:15 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2015-12-11 12:02:15 +0100 |
commit | 4d3d596eb825b2e5ee4f7ddf971d61816e455f79 (patch) | |
tree | 7ce51fa9c4e1340a6268c1bf32baf3b8b054ad81 | |
parent | b2ecc0119491e7146cabdaf4d92d1f11ad8ffbd3 (diff) | |
parent | 76b9c79d439adffe1a55f5833e14f74ed1630390 (diff) | |
download | otp-4d3d596eb825b2e5ee4f7ddf971d61816e455f79.tar.gz otp-4d3d596eb825b2e5ee4f7ddf971d61816e455f79.tar.bz2 otp-4d3d596eb825b2e5ee4f7ddf971d61816e455f79.zip |
Merge branch 'maint'
-rw-r--r-- | lib/ssl/test/ssl_ECC_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_ECC_SUITE.erl b/lib/ssl/test/ssl_ECC_SUITE.erl index fd2afc808c..75b639b23b 100644 --- a/lib/ssl/test/ssl_ECC_SUITE.erl +++ b/lib/ssl/test/ssl_ECC_SUITE.erl @@ -275,8 +275,8 @@ start_server(openssl, CA, OwnCa, Cert, Key, Config) -> Version = tls_record:protocol_version(tls_record:highest_protocol_version([])), Exe = "openssl", Args = ["s_server", "-accept", integer_to_list(Port), ssl_test_lib:version_flag(Version), - "-verify", "2", "-cert ", Cert, "-CAfile", NewCA, - "-key", Key, "-msg" "-debug"], + "-verify", "2", "-cert", Cert, "-CAfile", NewCA, + "-key", Key, "-msg", "-debug"], OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args), true = port_command(OpenSslPort, "Hello world"), {OpenSslPort, Port}; |