diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-03-14 09:41:47 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-03-14 09:41:47 +0100 |
| commit | c5005dc4f7381bb569c8f27aa7d3d264c4e41ce0 (patch) | |
| tree | b341037c365875680be3c5752e0fca748851b84b /lib/ssl/src/ssl_handshake.erl | |
| parent | b9872a64b863c424c4d548d4454e6e1b3153ddc4 (diff) | |
| parent | 748d502138a941ddf79accd8dffc398ce84a21a7 (diff) | |
| download | otp-c5005dc4f7381bb569c8f27aa7d3d264c4e41ce0.tar.gz otp-c5005dc4f7381bb569c8f27aa7d3d264c4e41ce0.tar.bz2 otp-c5005dc4f7381bb569c8f27aa7d3d264c4e41ce0.zip | |
Merge branch 'ingela/ssl/no-sslv2-hello-support/OTP-14824'
* ingela/ssl/no-sslv2-hello-support/OTP-14824:
ssl: Remove interoperability option v2_hello_compatible
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 9e2b12b186..e1f813ea95 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -52,7 +52,7 @@ %% Handle handshake messages -export([certify/7, certificate_verify/6, verify_signature/5, master_secret/4, server_key_exchange_hash/2, verify_connection/6, - init_handshake_history/0, update_handshake_history/3, verify_server_key/5, + init_handshake_history/0, update_handshake_history/2, verify_server_key/5, select_version/3 ]). @@ -479,24 +479,12 @@ init_handshake_history() -> {[], []}. %%-------------------------------------------------------------------- --spec update_handshake_history(ssl_handshake:ssl_handshake_history(), Data ::term(), boolean()) -> +-spec update_handshake_history(ssl_handshake:ssl_handshake_history(), Data ::term()) -> ssl_handshake:ssl_handshake_history(). %% %% Description: Update the handshake history buffer with Data. %%-------------------------------------------------------------------- -update_handshake_history(Handshake, % special-case SSL2 client hello - <<?CLIENT_HELLO, ?UINT24(_), ?BYTE(Major), ?BYTE(Minor), - ?UINT16(CSLength), ?UINT16(0), - ?UINT16(CDLength), - CipherSuites:CSLength/binary, - ChallengeData:CDLength/binary>>, true) -> - update_handshake_history(Handshake, - <<?CLIENT_HELLO, ?BYTE(Major), ?BYTE(Minor), - ?UINT16(CSLength), ?UINT16(0), - ?UINT16(CDLength), - CipherSuites:CSLength/binary, - ChallengeData:CDLength/binary>>, true); -update_handshake_history({Handshake0, _Prev}, Data, _) -> +update_handshake_history({Handshake0, _Prev}, Data) -> {[Data|Handshake0], Handshake0}. verify_server_key(#server_key_params{params_bin = EncParams, |