aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-02-25 10:53:22 +0100
committerHenrik Nord <[email protected]>2016-02-25 10:53:22 +0100
commit6ea43be4d8a73371fb9fd0c77d4d0d05a86357ae (patch)
treec16a12f8f04d69cf8b6c8d30c76bec93e32004a3 /lib/ssl/doc
parent209804f87fa7a11468e5e373217917d2e11fcb9d (diff)
parent9c4fdefb8e9dde5e71ea7362ed37abfa425bb2bf (diff)
downloadotp-6ea43be4d8a73371fb9fd0c77d4d0d05a86357ae.tar.gz
otp-6ea43be4d8a73371fb9fd0c77d4d0d05a86357ae.tar.bz2
otp-6ea43be4d8a73371fb9fd0c77d4d0d05a86357ae.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/doc')
-rw-r--r--lib/ssl/doc/src/ssl.xml8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index d3881ad117..a76d46ee9b 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -271,7 +271,11 @@ atom()}} |
terminate regarding verification failures and the connection is
established.</p></item>
<item><p>If called with an extension unknown to the user application,
- return value <c>{unknown, UserState}</c> is to be used.</p></item>
+ return value <c>{unknown, UserState}</c> is to be used.</p>
+
+ <p>Note that if the fun returns <c>unknown</c> for an extension marked
+ as critical, validation will fail.</p>
+ </item>
</list>
<p>Default option <c>verify_fun</c> in <c>verify_peer mode</c>:</p>
@@ -293,6 +297,8 @@ atom()}} |
<code>
{fun(_,{bad_cert, _}, UserState) ->
{valid, UserState};
+ (_,{extension, #'Extension'{critical = true}}, UserState) ->
+ {valid, UserState};
(_,{extension, _}, UserState) ->
{unknown, UserState};
(_, valid, UserState) ->