diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-02-22 10:18:49 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-02-22 10:18:49 +0100 |
| commit | 53dea65ae6665d5d14c0d313c1f639637a3f0405 (patch) | |
| tree | 60f74599bbfa18f883b37390033232fd5cc3a640 /lib/ssl/src/ssl_handshake.erl | |
| parent | cb9b1267f2465a129a1f5de5cf812bcfd5a7a9f4 (diff) | |
| parent | 3058ef6bb7a2a3f96cfde819976ee7a52be65364 (diff) | |
| download | otp-53dea65ae6665d5d14c0d313c1f639637a3f0405.tar.gz otp-53dea65ae6665d5d14c0d313c1f639637a3f0405.tar.bz2 otp-53dea65ae6665d5d14c0d313c1f639637a3f0405.zip | |
Merge branch 'ingela/ssl/doc-enhancements' into maint
* ingela/ssl/doc-enhancements:
ssl: Enhance documentation after "use-spec-rewrite"
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 27c071d6dd..9ba62b3a12 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -729,7 +729,7 @@ decode_hello_extensions(Extensions) -> dec_hello_extensions(Extensions, #hello_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 @@ -738,7 +738,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{} |