diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-10-31 15:04:41 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-11-15 12:09:37 +0100 |
| commit | ccc6bbb5004f0d23b988b51c79995a618b80b494 (patch) | |
| tree | 3a590bdb2b589c8574a084fef18bf4fd314d002c /lib/ssl | |
| parent | 1b30349552b72604ac71120aff24e054aceeded7 (diff) | |
| download | otp-ccc6bbb5004f0d23b988b51c79995a618b80b494.tar.gz otp-ccc6bbb5004f0d23b988b51c79995a618b80b494.tar.bz2 otp-ccc6bbb5004f0d23b988b51c79995a618b80b494.zip | |
Work around bug in openss-1.0.0e
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index 0fd2ea1ffb..f37baeb9de 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -1134,7 +1134,7 @@ cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) -> CertFile = proplists:get_value(certfile, ServerOpts), KeyFile = proplists:get_value(keyfile, ServerOpts), - Cmd = "openssl s_server -accept " ++ integer_to_list(Port) ++ + Cmd = "openssl s_server -accept " ++ integer_to_list(Port) ++ version_flag(Version) ++ " -cert " ++ CertFile ++ " -key " ++ KeyFile ++ "", test_server:format("openssl cmd: ~p~n", [Cmd]), @@ -1182,6 +1182,12 @@ cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) -> process_flag(trap_exit, false), Return. + +version_flag(tlsv1) -> + " -tls1 "; +version_flag(sslv3) -> + " -ssl3 ". + %%-------------------------------------------------------------------- erlang_client_bad_openssl_server(doc) -> [""]; |