aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc/src/ssl.xml
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-02-06 16:05:01 +0100
committerIngela Anderton Andin <[email protected]>2015-02-06 16:05:01 +0100
commitbca4b9783e9f2d6845b970f23f1b2f9a0ded7121 (patch)
tree997bef1bc4b1bc67b4fc86b70af1ea851d036b21 /lib/ssl/doc/src/ssl.xml
parent6cdbe4b9a3bb89d02f4d4f5cd513615d19191b5d (diff)
parentfa9fda4a50ad92bb55f2a5707f0ec1dc7cf47d79 (diff)
downloadotp-bca4b9783e9f2d6845b970f23f1b2f9a0ded7121.tar.gz
otp-bca4b9783e9f2d6845b970f23f1b2f9a0ded7121.tar.bz2
otp-bca4b9783e9f2d6845b970f23f1b2f9a0ded7121.zip
Merge branch 'ia/ssl/pem-cache/OTP-12464' into maint
* ia/ssl/pem-cache/OTP-12464: ssl: Improve PEM cache by validating entries
Diffstat (limited to 'lib/ssl/doc/src/ssl.xml')
-rw-r--r--lib/ssl/doc/src/ssl.xml16
1 files changed, 14 insertions, 2 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 39b9b70579..249fee5760 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -163,7 +163,7 @@
is supplied it will override the certfile option.</item>
<tag>{certfile, path()}</tag>
- <item>Path to a file containing the user's certificate.</item>
+ <item>Path to a file containing the user's PEM encoded certificate.</item>
<tag>{key, {'RSAPrivateKey'| 'DSAPrivateKey' | 'ECPrivateKey' |'PrivateKeyInfo', der_encoded()}}</tag>
<item> The DER encoded users private key. If this option
@@ -550,7 +550,19 @@ fun(srp, Username :: string(), UserState :: term()) ->
</p>
</desc>
</func>
-
+
+ <func>
+ <name>clear_pem_cache() -> ok </name>
+ <fsummary> Clears the pem cache</fsummary>
+
+ <desc><p>PEM files, used by ssl API-functions, are cached. The
+ cache is regularly checked to see if any cache entries should be
+ invalidated, however this function provides a way to
+ unconditionally clear the whole cache.
+ </p>
+ </desc>
+ </func>
+
<func>
<name>connect(Socket, SslOptions) -> </name>
<name>connect(Socket, SslOptions, Timeout) -> {ok, SslSocket}