diff options
| author | Péter Dimitrov <[email protected]> | 2019-02-13 16:12:06 +0100 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-02-13 16:12:06 +0100 |
| commit | dea908d0fae4ef2a7be2ad5a0f5888502cc1e4e3 (patch) | |
| tree | f8a4553dd7cacb266c2aa4e3eee6bc3d54940a84 /lib/ssl | |
| parent | 5b3b28a4ecf653a62e0667b52511ef3fe646cd1f (diff) | |
| download | otp-dea908d0fae4ef2a7be2ad5a0f5888502cc1e4e3.tar.gz otp-dea908d0fae4ef2a7be2ad5a0f5888502cc1e4e3.tar.bz2 otp-dea908d0fae4ef2a7be2ad5a0f5888502cc1e4e3.zip | |
ssl: Fix renegotiation testcases
Fix failing renegotiation testcases with openssl-1.1.1a.
openssl s_client sends the renegotiation "R\n" connected command
to the server side causing testcase failure.
This commit updates ssl_to_openssl_SUITE:erlang_ssl_receive to
swallow the unexpected packet.
Change-Id: I1f5d040ac65c25652f7101ddf109fc84acc4c915
Diffstat (limited to 'lib/ssl')
| -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 3c8b25b912..e9e838674e 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -1932,6 +1932,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 |