aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2014-04-14 11:06:22 +0200
committerIngela Anderton Andin <ingela@erlang.org>2014-04-17 09:14:11 +0200
commit42884b9925d3d023ac99f0d70e4de4f38f7bae44 (patch)
treeae4ee65277d2df83b6e367be16b7065bc4fddfcf /lib/ssl
parentdf7dc4d8b6a2834136c5ffefb404009ce62ea939 (diff)
downloadotp-42884b9925d3d023ac99f0d70e4de4f38f7bae44.tar.gz
otp-42884b9925d3d023ac99f0d70e4de4f38f7bae44.tar.bz2
otp-42884b9925d3d023ac99f0d70e4de4f38f7bae44.zip
ssl: Graceful handling of warning alerts
Generalize last warning alert function clause
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/src/tls_connection.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index ffa04ee8ba..c3171da566 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2014. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -859,7 +859,8 @@ handle_alert(#alert{level = ?WARNING, description = ?NO_RENEGOTIATION} = Alert,
{Record, State} = next_record(State0),
next_state(StateName, connection, Record, State);
-handle_alert(#alert{level = ?WARNING, description = ?USER_CANCELED} = Alert, StateName,
+%% Gracefully log and ignore all other warning alerts
+handle_alert(#alert{level = ?WARNING} = Alert, StateName,
#state{ssl_options = SslOpts} = State0) ->
log_alert(SslOpts#ssl_options.log_alert, StateName, Alert),
{Record, State} = next_record(State0),