diff options
author | Péter Dimitrov <[email protected]> | 2019-02-14 10:56:18 +0100 |
---|---|---|
committer | Péter Dimitrov <[email protected]> | 2019-02-14 10:56:18 +0100 |
commit | 29534be6b43a9f0892996efd618dfe948fac8ded (patch) | |
tree | 74f84871a1fa382705731665ed645a7a4f5d585b /lib/ssl/test/ssl_to_openssl_SUITE.erl | |
parent | 664d6d92f7b4d5c6b328f6e3503d372af70d74d6 (diff) | |
parent | dea908d0fae4ef2a7be2ad5a0f5888502cc1e4e3 (diff) | |
download | otp-29534be6b43a9f0892996efd618dfe948fac8ded.tar.gz otp-29534be6b43a9f0892996efd618dfe948fac8ded.tar.bz2 otp-29534be6b43a9f0892996efd618dfe948fac8ded.zip |
Merge branch 'peterdmv/ssl/fix-failing-testcases' into maint
* peterdmv/ssl/fix-failing-testcases:
ssl: Fix renegotiation testcases
ssl: Fix failing rizzo testcases
ssl: Use IPv4 addresses with openssl s_client
ssl: Use sha256 in test certificates if supported
Change-Id: I11a326be027545e20fbef6f90996b0c8be8c3e50
Diffstat (limited to 'lib/ssl/test/ssl_to_openssl_SUITE.erl')
-rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index 87a1edfd96..df84411b6d 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -1946,6 +1946,11 @@ erlang_ssl_receive(Socket, Data) -> ct:log("Connection info: ~p~n", [ssl:connection_information(Socket)]), receive + {ssl, Socket, "R\n"} -> + %% Swallow s_client renegotiation command. + %% openssl s_client connected commands can appear on + %% server side with some openssl versions. + erlang_ssl_receive(Socket,Data); {ssl, Socket, Data} -> io:format("Received ~p~n",[Data]), %% open_ssl server sometimes hangs waiting in blocking read |