diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-08-14 15:55:32 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-08-14 15:55:32 +0200 |
| commit | 9ccd5b239b885f9ebb16a519d6878932e42782dc (patch) | |
| tree | 703a700bdf98676ee6943f1d80b22f0acf4fddde /lib/ssl/src/ssl_pem_cache.erl | |
| parent | 054c8fc92724672f0fdff486b80a4356347762d4 (diff) | |
| parent | f54e6b513e746344d5252c269b8bb072dd6136a3 (diff) | |
| download | otp-9ccd5b239b885f9ebb16a519d6878932e42782dc.tar.gz otp-9ccd5b239b885f9ebb16a519d6878932e42782dc.tar.bz2 otp-9ccd5b239b885f9ebb16a519d6878932e42782dc.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl_pem_cache.erl')
| -rw-r--r-- | lib/ssl/src/ssl_pem_cache.erl | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/ssl/src/ssl_pem_cache.erl b/lib/ssl/src/ssl_pem_cache.erl index 115ab4451d..a952e20133 100644 --- a/lib/ssl/src/ssl_pem_cache.erl +++ b/lib/ssl/src/ssl_pem_cache.erl @@ -29,7 +29,7 @@ -export([start_link/1, start_link_dist/1, name/1, - insert/1, + insert/2, clear/0]). % Spawn export @@ -90,19 +90,17 @@ start_link_dist(_) -> %%-------------------------------------------------------------------- --spec insert(binary()) -> {ok, term()} | {error, reason()}. +-spec insert(binary(), term()) -> ok | {error, reason()}. %% %% Description: Cache a pem file and return its content. %%-------------------------------------------------------------------- -insert(File) -> - {ok, PemBin} = file:read_file(File), - Content = public_key:pem_decode(PemBin), +insert(File, Content) -> case bypass_cache() of true -> - {ok, Content}; + ok; false -> cast({cache_pem, File, Content}), - {ok, Content} + ok end. %%-------------------------------------------------------------------- |