diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-05-28 16:23:56 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-05-28 16:23:56 +0200 |
| commit | 6310fbd9871f521826d4672395e48e2ef94d59a9 (patch) | |
| tree | 270d5b3ade0a2ab815a361960a1df275b31c7fcb /lib/ssl/src/ssl.erl | |
| parent | 0e72e780498e47614de5730c8d4453948c9ad1da (diff) | |
| parent | a04228cc4ebe53af4e676cc6a7642e3a1025cc3f (diff) | |
| download | otp-6310fbd9871f521826d4672395e48e2ef94d59a9.tar.gz otp-6310fbd9871f521826d4672395e48e2ef94d59a9.tar.bz2 otp-6310fbd9871f521826d4672395e48e2ef94d59a9.zip | |
Merge branch 'ingela/ssl/alert-strings/OTP-15844' into maint
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 6af65e09f2..f99c0e2b7a 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -125,7 +125,9 @@ protocol_extensions/0, session_id/0, error_alert/0, - srp_param_type/0]). + tls_alert/0, + srp_param_type/0, + named_curve/0]). %% ------------------------------------------------------------------------------------------------------- @@ -192,6 +194,7 @@ | rsa_pss_pss_sha512 | rsa_pkcs1_sha1 | ecdsa_sha1. + -type kex_algo() :: rsa | dhe_rsa | dhe_dss | ecdhe_ecdsa | ecdh_ecdsa | ecdh_rsa | @@ -236,7 +239,7 @@ sect163r2 | secp160k1 | secp160r1 | - secp160r2. + secp160r2. % exported -type group() :: secp256r1 | secp384r1 | secp521r1 | ffdhe2048 | ffdhe3072 | ffdhe4096 | ffdhe6144 | ffdhe8192. @@ -279,7 +282,7 @@ bad_certificate_status_response | bad_certificate_hash_value | unknown_psk_identity | - no_application_protocol. + no_application_protocol. % exported %% ------------------------------------------------------------------------------------------------------- -type common_option() :: {protocol, protocol()} | |