diff options
author | Ingela Anderton Andin <[email protected]> | 2019-06-04 15:05:47 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2019-06-04 15:05:47 +0200 |
commit | 70bd54b9d6f74114c52605c1b9c3e0cb11906b49 (patch) | |
tree | df7d7ea6173d39f970673a74c6f51239d684e198 | |
parent | 46da9279f63ee8c8a492686004bbbd9b5100f2e8 (diff) | |
parent | 28935cd56a3c6a43304417adc271a214121260a7 (diff) | |
download | otp-70bd54b9d6f74114c52605c1b9c3e0cb11906b49.tar.gz otp-70bd54b9d6f74114c52605c1b9c3e0cb11906b49.tar.bz2 otp-70bd54b9d6f74114c52605c1b9c3e0cb11906b49.zip |
Merge branch 'maint'
-rw-r--r-- | lib/ssl/src/ssl.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index f99c0e2b7a..1e36a0591b 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -127,7 +127,8 @@ error_alert/0, tls_alert/0, srp_param_type/0, - named_curve/0]). + named_curve/0, + sign_scheme/0]). %% ------------------------------------------------------------------------------------------------------- @@ -193,7 +194,7 @@ | rsa_pss_pss_sha384 | rsa_pss_pss_sha512 | rsa_pkcs1_sha1 - | ecdsa_sha1. + | ecdsa_sha1. % exported -type kex_algo() :: rsa | dhe_rsa | dhe_dss | |