diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-08-21 13:04:24 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-08-21 13:04:24 +0200 |
| commit | c369586bf3737da64d3f6036e13632dc55c8718b (patch) | |
| tree | 02dd0d409ffda487df7a34a2ebbf507a6a554e47 | |
| parent | bbb5d7cf533b1bf12b96aa7ea1a53dc286e64d43 (diff) | |
| parent | 41bb781d809effb185a857b25009615bb9acbea7 (diff) | |
| download | otp-c369586bf3737da64d3f6036e13632dc55c8718b.tar.gz otp-c369586bf3737da64d3f6036e13632dc55c8718b.tar.bz2 otp-c369586bf3737da64d3f6036e13632dc55c8718b.zip | |
Merge remote-tracking branch 'upstream/maint'
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 25bdc5ef93..94ffd180c5 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -201,7 +201,7 @@ client_certificate_verify(OwnCert, MasterSecret, Version, end. %%-------------------------------------------------------------------- --spec certificate_request(ssl_cipher:erl_cipher_suite(), db_handle(), certdb_ref(), ssl_record:ssl_version()) -> +-spec certificate_request(ssl_cipher:cipher_suite(), db_handle(), certdb_ref(), ssl_record:ssl_version()) -> #certificate_request{}. %% %% Description: Creates a certificate_request message, called by the server. @@ -1112,7 +1112,7 @@ certificate_types({KeyExchange, _, _, _}, _) when KeyExchange == rsa; KeyExchange == ecdhe_rsa -> <<?BYTE(?RSA_SIGN)>>; -certificate_types({KeyExchange, _, _, _}, _) when KeyExchange == dhe_dss, +certificate_types({KeyExchange, _, _, _}, _) when KeyExchange == dhe_dss; KeyExchange == srp_dss -> <<?BYTE(?DSS_SIGN)>>; |