From 95e3fbe00e700f1c4ed4735434eafc5ee899111f Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Mon, 11 Feb 2019 12:11:54 +0100
Subject: ssl: Reintroduce documentation of signature_algs_cert and log_level
 option

When changing the ssl application to use type specs in documentation
master additions where lost in the merge as we did not want to
rewrite the new documentation in a merge commit.
---
 lib/ssl/src/ssl.erl | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'lib/ssl/src')

diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 017e06b232..2542c82cc8 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -135,6 +135,22 @@
 -type legacy_hash()        :: md5.
 
 -type sign_algo()         :: rsa | dsa | ecdsa.
+
+-type sign_scheme()       :: rsa_pkcs1_sha256 
+                           | rsa_pkcs1_sha384
+                           | rsa_pkcs1_sha512
+                           | ecdsa_secp256r1_sha256
+                           | ecdsa_secp384r1_sha384
+                           | ecdsa_secp521r1_sha512
+                           | rsa_pss_rsae_sha256
+                           | rsa_pss_rsae_sha384
+                           | rsa_pss_rsae_sha512
+                           | rsa_pss_pss_sha256
+                           | rsa_pss_pss_sha384
+                           | rsa_pss_pss_sha512
+                           | rsa_pkcs1_sha1
+                           | ecdsa_sha1.
+
 -type key_algo()          :: rsa |
                              dhe_rsa | dhe_dss |
                              ecdhe_ecdsa | ecdh_ecdsa | ecdh_rsa |
@@ -228,6 +244,7 @@
                                 {password, key_password()} |
                                 {ciphers, cipher_suites()} |
                                 {eccs, eccs()} |
+                                {signature_algs_cert, signature_schemes()} |
                                 {secure_renegotiate, secure_renegotiation()} |
                                 {depth, allowed_cert_chain_length()} |
                                 {verify_fun, custom_verify()} |
@@ -237,6 +254,7 @@
                                 {partial_chain, root_fun()} |
                                 {versions, protocol_versions()} |
                                 {user_lookup_fun, custom_user_lookup()} |
+                                {log_level, logging_level()} |
                                 {log_alert, log_alert()} |
                                 {hibernate_after, hibernate_after()} |
                                 {padding_check, padding_check()} |
@@ -271,13 +289,14 @@
 -type root_fun()                 ::  fun().
 -type protocol_versions()        ::  [protocol_version()].
 -type signature_algs()           ::  [{hash(), sign_algo()}].
+-type signature_schemes()        ::  [sign_scheme()].
 -type custom_user_lookup()       ::  {Lookupfun :: fun(), UserState :: term()}.
 -type padding_check()            :: boolean(). 
 -type beast_mitigation()         :: one_n_minus_one | zero_n | disabled.
 -type srp_identity()             :: {Username :: string(), Password :: string()}.
 -type psk_identity()             :: string().
 -type log_alert()                :: boolean().
-
+-type logging_level()            :: logger:level().
 %% -------------------------------------------------------------------------------------------------------
 
 -type client_option()        :: {verify, client_verify_type()} |
-- 
cgit v1.2.3