diff options
| author | Erlang/OTP <[email protected]> | 2019-06-03 11:34:51 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-06-03 11:34:51 +0200 |
| commit | b931c0c741aadb29cd29a42d82ee2676048caac7 (patch) | |
| tree | a454124ce8dc8e169a72655840a59f99e14e371f /lib/ssl/src/ssl.erl | |
| parent | a4a35c8cfd19781875a84dda9db56fe839004d64 (diff) | |
| parent | a04228cc4ebe53af4e676cc6a7642e3a1025cc3f (diff) | |
| download | otp-b931c0c741aadb29cd29a42d82ee2676048caac7.tar.gz otp-b931c0c741aadb29cd29a42d82ee2676048caac7.tar.bz2 otp-b931c0c741aadb29cd29a42d82ee2676048caac7.zip | |
Merge branch 'ingela/ssl/alert-strings/OTP-15844' into maint-21
* ingela/ssl/alert-strings/OTP-15844:
Export named_curve/0
ssl: Export type that user may want to use
ssl: Returned "alert error string" should be same as logged alert string
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 7c1d0a3829..00a7f0a53a 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -82,7 +82,9 @@ protocol_extensions/0, session_id/0, error_alert/0, - srp_param_type/0]). + tls_alert/0, + srp_param_type/0, + named_curve/0]). %% ------------------------------------------------------------------------------------------------------- @@ -128,7 +130,8 @@ -type legacy_hash() :: md5. --type sign_algo() :: rsa | dsa | ecdsa. +-type sign_algo() :: rsa | dsa | ecdsa. % exported + -type kex_algo() :: rsa | dhe_rsa | dhe_dss | ecdhe_ecdsa | ecdh_ecdsa | ecdh_rsa | @@ -173,7 +176,7 @@ sect163r2 | secp160k1 | secp160r1 | - secp160r2. + secp160r2. % exported -type srp_param_type() :: srp_1024 | srp_1536 | @@ -213,7 +216,7 @@ bad_certificate_status_response | bad_certificate_hash_value | unknown_psk_identity | - no_application_protocol. + no_application_protocol. % exported %% ------------------------------------------------------------------------------------------------------- -type common_option() :: {protocol, protocol()} | |