aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZandra <[email protected]>2015-11-26 12:32:16 +0100
committerZandra <[email protected]>2015-11-26 12:32:16 +0100
commit3343f288354e751cb08ad2161d4f87da06c9f9cc (patch)
tree38b27cfef507090bf1f4cc412e3a16a124f3ca18
parentc06ea3ba3320740a448dbe2c361d6191eb2a9a46 (diff)
parente4ad53aa6206f66e843fadde61749a6ec010fdd9 (diff)
downloadotp-3343f288354e751cb08ad2161d4f87da06c9f9cc.tar.gz
otp-3343f288354e751cb08ad2161d4f87da06c9f9cc.tar.bz2
otp-3343f288354e751cb08ad2161d4f87da06c9f9cc.zip
Merge branch 'maint'
-rw-r--r--lib/ssl/src/ssl_connection.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index f8afbdb41d..12a56df69f 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -1781,7 +1781,7 @@ handle_trusted_certs_db(#state{ssl_options = #ssl_options{cacertfile = <<>>, cac
ok;
handle_trusted_certs_db(#state{cert_db_ref = Ref,
cert_db = CertDb,
- ssl_options = #ssl_options{cacertfile = <<>>}}) ->
+ ssl_options = #ssl_options{cacertfile = <<>>}}) when CertDb =/= undefined ->
%% Certs provided as DER directly can not be shared
%% with other connections and it is safe to delete them when the connection ends.
ssl_pkix_db:remove_trusted_certs(Ref, CertDb);