diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-08-14 15:52:47 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-08-14 15:52:47 +0200 |
| commit | f54e6b513e746344d5252c269b8bb072dd6136a3 (patch) | |
| tree | 417f509d9b45e9cace955a9d62696a717da330cb /lib/ssl/src/ssl_manager.erl | |
| parent | 80fc5d8bbb7d3fbc626e7206ef8125fd6749a7c6 (diff) | |
| parent | e6361e0df384d1b8358955529c1d6f02c694274b (diff) | |
| download | otp-f54e6b513e746344d5252c269b8bb072dd6136a3.tar.gz otp-f54e6b513e746344d5252c269b8bb072dd6136a3.tar.bz2 otp-f54e6b513e746344d5252c269b8bb072dd6136a3.zip | |
Merge branch 'ingela/ssl/ERL-686/OTP-15224' into maint
* ingela/ssl/ERL-686/OTP-15224:
ssl: Error handling improvment
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 f44fe6a2bf..52aa164420 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. %%-------------------------------------------------------------------- |