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_manager.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_manager.erl')
| -rw-r--r-- | lib/ssl/src/ssl_manager.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl index 6ec65023e4..b3a425b2fe 100644 --- a/lib/ssl/src/ssl_manager.erl +++ b/lib/ssl/src/ssl_manager.erl @@ -127,7 +127,13 @@ cache_pem_file(File, DbHandle) -> [Content] -> {ok, Content}; undefined -> - ssl_pem_cache:insert(File) + case ssl_pkix_db:decode_pem_file(File) of + {ok, Content} -> + ssl_pem_cache:insert(File, Content), + {ok, Content}; + Error -> + Error + end end. %%-------------------------------------------------------------------- |