aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_handshake.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-04-20 08:44:29 +0200
committerIngela Anderton Andin <[email protected]>2015-04-20 08:44:29 +0200
commitddfbbcbbd489913120a55b2a054b046c68b40a8a (patch)
tree8e22768a89ca891d6f471805bc797467823382f8 /lib/ssl/src/ssl_handshake.erl
parentaa8efa1cc3f776d5b3b5af24afd4369ca1f7da00 (diff)
parent5674d81d4112206e9fb03527137525ca544285de (diff)
downloadotp-ddfbbcbbd489913120a55b2a054b046c68b40a8a.tar.gz
otp-ddfbbcbbd489913120a55b2a054b046c68b40a8a.tar.bz2
otp-ddfbbcbbd489913120a55b2a054b046c68b40a8a.zip
Merge branch 'ia/public_key/bitstring/OTP-12110'
* ia/public_key/bitstring/OTP-12110: ssl: Adjust to public_key application removing legacy compact_bit_string switch public_key: Update vsn for OTP 18 public_key: Reject bad signatures as early as possible public_key: Remove legacy switch compact_bit_string
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
-rw-r--r--lib/ssl/src/ssl_handshake.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 493e5a87d9..f29aa00a60 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -243,7 +243,7 @@ key_exchange(client, _Version, {dh, PublicKey}) ->
dh_public = PublicKey}
};
-key_exchange(client, _Version, {ecdh, #'ECPrivateKey'{publicKey = {0, ECPublicKey}}}) ->
+key_exchange(client, _Version, {ecdh, #'ECPrivateKey'{publicKey = ECPublicKey}}) ->
#client_key_exchange{
exchange_keys = #client_ec_diffie_hellman_public{
dh_public = ECPublicKey}
@@ -284,7 +284,7 @@ key_exchange(server, Version, {dh, {PublicKey, _},
enc_server_key_exchange(Version, ServerDHParams, HashSign,
ClientRandom, ServerRandom, PrivateKey);
-key_exchange(server, Version, {ecdh, #'ECPrivateKey'{publicKey = {0, ECPublicKey},
+key_exchange(server, Version, {ecdh, #'ECPrivateKey'{publicKey = ECPublicKey,
parameters = ECCurve}, HashSign,
ClientRandom, ServerRandom, PrivateKey}) ->
ServerECParams = #server_ecdh_params{curve = ECCurve, public = ECPublicKey},