diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-06-10 09:48:21 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-06-10 09:48:21 +0200 |
| commit | 202016c4a726c83052d1fac489ac044dd6f5be46 (patch) | |
| tree | 6254210251bee1b9b63b70e8627e1176e7a014f8 /lib/ssl/src/tls_connection.erl | |
| parent | 82c0b47317b4b71412d7ff7bd632b1f574d056c6 (diff) | |
| parent | 82a435ca0f91782ebd39b237d56426277ffeda80 (diff) | |
| download | otp-202016c4a726c83052d1fac489ac044dd6f5be46.tar.gz otp-202016c4a726c83052d1fac489ac044dd6f5be46.tar.bz2 otp-202016c4a726c83052d1fac489ac044dd6f5be46.zip | |
Merge branch 'ia/ssl/public_key/warnings' into maint
* ia/ssl/public_key/warnings:
ssl: Correct rebase mistakes
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 6a0461e805..246fecf34a 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -673,8 +673,7 @@ certify_client_key_exchange(#encrypted_premaster_secret{premaster_secret= EncPMS certify_client_key_exchange(#client_diffie_hellman_public{dh_public = ClientPublicDhKey}, #state{negotiated_version = Version, - diffie_hellman_params = #'DHParameter'{prime = P, - base = G} = Params, + diffie_hellman_params = #'DHParameter'{} = Params, diffie_hellman_keys = {_, ServerDhPrivateKey}} = State0) -> case dh_master_secret(Params, ClientPublicDhKey, ServerDhPrivateKey, State0) of #state{} = State1 -> |