diff options
| author | Björn Gustavsson <[email protected]> | 2010-10-21 14:49:47 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-10-21 14:49:47 +0200 |
| commit | b0578643b4e432ca467ffab3c01f2c0284cf962c (patch) | |
| tree | bfdb988d8759e807a586a493b434d575e21cd021 /lib/ssl/src/ssl_ssl3.erl | |
| parent | 4bf6acc06b5a6b155caebbf575ce524a0fedd75a (diff) | |
| parent | 4d24ae9a4d4b96a3791eb3def2c672d7ec644c8c (diff) | |
| download | otp-b0578643b4e432ca467ffab3c01f2c0284cf962c.tar.gz otp-b0578643b4e432ca467ffab3c01f2c0284cf962c.tar.bz2 otp-b0578643b4e432ca467ffab3c01f2c0284cf962c.zip | |
Merge branch 'ia/ssl/certificate-verify/wrong-key-method/OTP-8897' into dev
* ia/ssl/certificate-verify/wrong-key-method/OTP-8897:
Correct handling of client certificate verify message
Conflicts:
lib/ssl/src/ssl_handshake.erl
Diffstat (limited to 'lib/ssl/src/ssl_ssl3.erl')
| -rw-r--r-- | lib/ssl/src/ssl_ssl3.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_ssl3.erl b/lib/ssl/src/ssl_ssl3.erl index 1add203fb0..f3cb6ad66e 100644 --- a/lib/ssl/src/ssl_ssl3.erl +++ b/lib/ssl/src/ssl_ssl3.erl @@ -79,10 +79,9 @@ finished(Role, MasterSecret, {MD5Hash, SHAHash}) -> SHA = handshake_hash(?SHA, MasterSecret, Sender, SHAHash), <<MD5/binary, SHA/binary>>. --spec certificate_verify(key_algo(), binary(), {binary(), binary()}) -> binary(). +-spec certificate_verify(OID::tuple(), binary(), {binary(), binary()}) -> binary(). -certificate_verify(Algorithm, MasterSecret, {MD5Hash, SHAHash}) - when Algorithm == rsa; Algorithm == dhe_rsa -> +certificate_verify(?'rsaEncryption', MasterSecret, {MD5Hash, SHAHash}) -> %% md5_hash %% MD5(master_secret + pad_2 + %% MD5(handshake_messages + master_secret + pad_1)); @@ -94,7 +93,7 @@ certificate_verify(Algorithm, MasterSecret, {MD5Hash, SHAHash}) SHA = handshake_hash(?SHA, MasterSecret, undefined, SHAHash), <<MD5/binary, SHA/binary>>; -certificate_verify(dhe_dss, MasterSecret, {_, SHAHash}) -> +certificate_verify(?'id-dsa', MasterSecret, {_, SHAHash}) -> %% sha_hash %% SHA(master_secret + pad_2 + %% SHA(handshake_messages + master_secret + pad_1)); |