diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-02-22 10:29:37 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-02-22 10:29:37 +0100 |
| commit | c3c20d78c2b47d0dd117f7a90b817ed13a609e64 (patch) | |
| tree | d1e86dd4499cee4dc4fa4cd4df533f358aabf652 /lib/ssl/src/ssl_handshake.erl | |
| parent | 4327304462128ce983de8e962f683e702a80f64e (diff) | |
| parent | 53dea65ae6665d5d14c0d313c1f639637a3f0405 (diff) | |
| download | otp-c3c20d78c2b47d0dd117f7a90b817ed13a609e64.tar.gz otp-c3c20d78c2b47d0dd117f7a90b817ed13a609e64.tar.bz2 otp-c3c20d78c2b47d0dd117f7a90b817ed13a609e64.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/doc/src/ssl.xml
lib/ssl/src/ssl.erl
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
| -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 16b5b34a3e..6b1e3b6e07 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -833,7 +833,7 @@ decode_extensions(Extensions, Version, MessageType) -> decode_extensions(Extensions, Version, MessageType, empty_extensions()). %%-------------------------------------------------------------------- --spec decode_server_key(binary(), ssl:key_algo(), ssl_record:ssl_version()) -> +-spec decode_server_key(binary(), ssl:kex_algo(), ssl_record:ssl_version()) -> #server_key_params{}. %% %% Description: Decode server_key data and return appropriate type @@ -842,7 +842,7 @@ decode_server_key(ServerKey, Type, Version) -> dec_server_key(ServerKey, key_exchange_alg(Type), Version). %%-------------------------------------------------------------------- --spec decode_client_key(binary(), ssl:key_algo(), ssl_record:ssl_version()) -> +-spec decode_client_key(binary(), ssl:kex_algo(), ssl_record:ssl_version()) -> #encrypted_premaster_secret{} | #client_diffie_hellman_public{} | #client_ec_diffie_hellman_public{} |