diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-06-07 10:17:40 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-06-07 10:17:40 +0200 |
| commit | 58beb31dc61edb16fb669317097242f9865149ca (patch) | |
| tree | 762c43af5cf79a400a014d6178ff6d6f0eef69c6 /lib/ssl/test/ssl_basic_SUITE.erl | |
| parent | ac18b8705c78be8bec5bdc14c412af2ced740916 (diff) | |
| parent | 33afe108de9cf24be47b9ebd740a8f5e19daca79 (diff) | |
| download | otp-58beb31dc61edb16fb669317097242f9865149ca.tar.gz otp-58beb31dc61edb16fb669317097242f9865149ca.tar.bz2 otp-58beb31dc61edb16fb669317097242f9865149ca.zip | |
Merge branch 'ingela/ssl/phase-out-sslv2-hello/OTP-13465'
* ingela/ssl/phase-out-sslv2-hello/OTP-13465:
ssl: Add option to phase out support for sslv2 client hello
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 99f7c9b780..efe996e57c 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -3059,7 +3059,7 @@ tls_ciphersuite_vs_version(Config) when is_list(Config) -> >>), {ok, <<22, RecMajor:8, RecMinor:8, _RecLen:16, 2, HelloLen:24>>} = gen_tcp:recv(Socket, 9, 10000), {ok, <<HelloBin:HelloLen/binary>>} = gen_tcp:recv(Socket, HelloLen, 5000), - ServerHello = tls_handshake:decode_handshake({RecMajor, RecMinor}, 2, HelloBin), + ServerHello = tls_handshake:decode_handshake({RecMajor, RecMinor}, 2, HelloBin, false), case ServerHello of #server_hello{server_version = {3,0}, cipher_suite = <<0,57>>} -> ok; |