diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-12-01 11:38:33 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-12-01 11:38:33 +0100 |
| commit | b272a4d292356eef69253517ea8f9fec55259613 (patch) | |
| tree | d2a4617895efe529b7f58d8fc86056a929280087 | |
| parent | ca5d2063fd7239a4c5ee6f2db9f91bbbfc542556 (diff) | |
| parent | eaaed051cbaec2eac9721773b7b4a4d440e8ec2d (diff) | |
| download | otp-b272a4d292356eef69253517ea8f9fec55259613.tar.gz otp-b272a4d292356eef69253517ea8f9fec55259613.tar.bz2 otp-b272a4d292356eef69253517ea8f9fec55259613.zip | |
Merge branch 'ingela/ssl/timing' into maint
* ingela/ssl/timing:
ssl: Align timing just in case
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 1d54a2793c..3531cdda11 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1402,24 +1402,24 @@ server_certify_and_key_exchange(State0, Connection) -> certify_client_key_exchange(#encrypted_premaster_secret{premaster_secret= EncPMS}, #state{private_key = Key, client_hello_version = {Major, Minor} = Version} = State, Connection) -> - + FakeSecret = make_premaster_secret(Version, rsa), %% Countermeasure for Bleichenbacher attack always provide some kind of premaster secret %% and fail handshake later.RFC 5246 section 7.4.7.1. PremasterSecret = try ssl_handshake:premaster_secret(EncPMS, Key) of Secret when erlang:byte_size(Secret) == ?NUM_OF_PREMASTERSECRET_BYTES -> case Secret of - <<?BYTE(Major), ?BYTE(Minor), _/binary>> -> %% Correct - Secret; + <<?BYTE(Major), ?BYTE(Minor), Rest/binary>> -> %% Correct + <<?BYTE(Major), ?BYTE(Minor), Rest/binary>>; <<?BYTE(_), ?BYTE(_), Rest/binary>> -> %% Version mismatch <<?BYTE(Major), ?BYTE(Minor), Rest/binary>> end; _ -> %% erlang:byte_size(Secret) =/= ?NUM_OF_PREMASTERSECRET_BYTES - make_premaster_secret(Version, rsa) + FakeSecret catch #alert{description = ?DECRYPT_ERROR} -> - make_premaster_secret(Version, rsa) - end, + FakeSecret + end, calculate_master_secret(PremasterSecret, State, Connection, certify, cipher); certify_client_key_exchange(#client_diffie_hellman_public{dh_public = ClientPublicDhKey}, #state{diffie_hellman_params = #'DHParameter'{} = Params, |