diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-02-06 16:05:01 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-02-06 16:05:01 +0100 |
| commit | bca4b9783e9f2d6845b970f23f1b2f9a0ded7121 (patch) | |
| tree | 997bef1bc4b1bc67b4fc86b70af1ea851d036b21 /lib/ssl/doc/src | |
| parent | 6cdbe4b9a3bb89d02f4d4f5cd513615d19191b5d (diff) | |
| parent | fa9fda4a50ad92bb55f2a5707f0ec1dc7cf47d79 (diff) | |
| download | otp-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')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 16 | ||||
| -rw-r--r-- | lib/ssl/doc/src/ssl_app.xml | 13 |
2 files changed, 25 insertions, 4 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} diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml index 43cb3934f7..f1377cabda 100644 --- a/lib/ssl/doc/src/ssl_app.xml +++ b/lib/ssl/doc/src/ssl_app.xml @@ -4,7 +4,7 @@ <appref> <header> <copyright> - <year>1999</year><year>2013</year> + <year>1999</year><year>2015</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -82,7 +82,16 @@ callback module, defaults to []. </p> </item> - + + <tag><c><![CDATA[ssl_pem_cache_clean = integer() <optional>]]></c></tag> + <item> + <p> + Number of milliseconds between PEM cache validations. + </p> + <seealso + marker="ssl#clear_pem_cache-0">ssl:clear_pem_cache/0</seealso> + + </item> </taglist> </section> |