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_connection.hrl | |
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_connection.hrl')
-rw-r--r-- | lib/ssl/src/ssl_connection.hrl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_connection.hrl b/lib/ssl/src/ssl_connection.hrl index 0ac138b444..201164949a 100644 --- a/lib/ssl/src/ssl_connection.hrl +++ b/lib/ssl/src/ssl_connection.hrl @@ -69,7 +69,7 @@ hashsign_algorithm = {undefined, undefined}, cert_hashsign_algorithm = {undefined, undefined}, %% key exchange - kex_algorithm :: ssl:key_algo(), + kex_algorithm :: ssl:kex_algo(), kex_keys :: {PublicKey :: binary(), PrivateKey :: binary()} | #'ECPrivateKey'{} | undefined | secret_printout(), diffie_hellman_params:: #'DHParameter'{} | undefined | secret_printout(), srp_params :: #srp_user{} | secret_printout() | 'undefined', |