aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZandra <[email protected]>2015-11-26 12:31:57 +0100
committerZandra <[email protected]>2015-11-26 12:31:57 +0100
commite4ad53aa6206f66e843fadde61749a6ec010fdd9 (patch)
tree589aff8e552ca7cf52b387971b66c557330a00d2
parent725184f45c1cf3dcfc2e9e27592b9489e1ed5141 (diff)
parent3dc5591d92876070e004242ff875b3f04ff92c34 (diff)
downloadotp-e4ad53aa6206f66e843fadde61749a6ec010fdd9.tar.gz
otp-e4ad53aa6206f66e843fadde61749a6ec010fdd9.tar.bz2
otp-e4ad53aa6206f66e843fadde61749a6ec010fdd9.zip
Merge branch 'legoscia/ssl_connection_terminate_crash' into maint
* legoscia/ssl_connection_terminate_crash: Avoid crash for SSL connections with nonexistent keyfile OTP-13144
-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);