aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/tls_connection.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-06-07 14:22:18 +0200
committerIngela Anderton Andin <[email protected]>2013-06-07 14:37:30 +0200
commit82a435ca0f91782ebd39b237d56426277ffeda80 (patch)
tree7ee6c2564f19c5aec09879f4c688a7b48094f8eb /lib/ssl/src/tls_connection.erl
parentb1da47eff2e41013d60dacebbdfa31ce60357d23 (diff)
downloadotp-82a435ca0f91782ebd39b237d56426277ffeda80.tar.gz
otp-82a435ca0f91782ebd39b237d56426277ffeda80.tar.bz2
otp-82a435ca0f91782ebd39b237d56426277ffeda80.zip
ssl: Correct rebase mistakes
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
-rw-r--r--lib/ssl/src/tls_connection.erl3
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 ->