diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-06-01 10:27:58 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-06-01 10:27:58 +0200 |
| commit | 8738d74fdd3a0670b553806a75bd2ffaf9d6ba2c (patch) | |
| tree | 67d46ba5506a4d55395c0ba660a4b67caafb8488 | |
| parent | ac927e00f82b3df962abe082393f45197de49156 (diff) | |
| parent | 56f4874dad781a365b818ffb4811c40afc165df2 (diff) | |
| download | otp-8738d74fdd3a0670b553806a75bd2ffaf9d6ba2c.tar.gz otp-8738d74fdd3a0670b553806a75bd2ffaf9d6ba2c.tar.bz2 otp-8738d74fdd3a0670b553806a75bd2ffaf9d6ba2c.zip | |
Merge branch 'ingela/ssl/cuddle-tests'
* ingela/ssl/cuddle-tests:
ssl: Avoid two renegotiates
ssl: Handle freebsd OpenSSL flavour
| -rw-r--r-- | lib/ssl/test/ssl_ECC_SUITE.erl | 10 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_ECC_SUITE.erl b/lib/ssl/test/ssl_ECC_SUITE.erl index 3a1fd00c06..b8a03f578d 100644 --- a/lib/ssl/test/ssl_ECC_SUITE.erl +++ b/lib/ssl/test/ssl_ECC_SUITE.erl @@ -343,6 +343,12 @@ new_ca(FileName, CA, OwnCa) -> E1 = public_key:pem_decode(P1), {ok, P2} = file:read_file(OwnCa), E2 = public_key:pem_decode(P2), - Pem = public_key:pem_encode(E2 ++E1), - file:write_file(FileName, Pem), + case os:cmd("openssl version") of + "OpenSSL 1.0.1p-freebsd" ++ _ -> + Pem = public_key:pem_encode(E1 ++E2), + file:write_file(FileName, Pem); + _ -> + Pem = public_key:pem_encode(E2 ++E1), + file:write_file(FileName, Pem) + end, FileName. diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 85a8c1e2d0..99f7c9b780 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -2631,7 +2631,7 @@ client_no_wrap_sequence_number(Config) when is_list(Config) -> {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), ErlData = "From erlang to erlang", - N = 10, + N = 12, Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, @@ -2668,7 +2668,7 @@ server_no_wrap_sequence_number(Config) when is_list(Config) -> {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), Data = "From erlang to erlang", - N = 10, + N = 12, Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, {from, self()}, |