diff options
| author | Raimo Niskanen <[email protected]> | 2018-12-04 13:49:29 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2018-12-04 14:36:03 +0100 |
| commit | 09b620eae7ebb623d7e62cbcab28c06e65d90008 (patch) | |
| tree | 8a3821ad4e51c66a6d6b14503f1e52856bdeef30 /lib/ssl/src/ssl_connection.erl | |
| parent | 27e2677c08252b427690698e40c22c459bbaa83c (diff) | |
| parent | f37c8b37f49034fe10898ea47ed9c043ad2ba173 (diff) | |
| download | otp-09b620eae7ebb623d7e62cbcab28c06e65d90008.tar.gz otp-09b620eae7ebb623d7e62cbcab28c06e65d90008.tar.bz2 otp-09b620eae7ebb623d7e62cbcab28c06e65d90008.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/test/ssl_dist_bench_SUITE.erl
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 8b752f0fda..5d5fd6e450 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -52,8 +52,8 @@ %% Alert and close handling -export([handle_own_alert/4, handle_alert/3, - handle_normal_shutdown/3, stop/2, stop_and_reply/3 - ]). + handle_normal_shutdown/3, stop/2, stop_and_reply/3, + handle_trusted_certs_db/1]). %% Data handling -export([read_application_data/2, internal_renegotiation/2]). @@ -1103,6 +1103,12 @@ downgrade(internal, #alert{description = ?CLOSE_NOTIFY}, downgrade(timeout, downgrade, #state{downgrade = {_, From}} = State, _) -> gen_statem:reply(From, {error, timeout}), stop(normal, State); +downgrade( + info, {CloseTag, Socket}, + #state{socket = Socket, close_tag = CloseTag, downgrade = {_, From}} = + State, _) -> + gen_statem:reply(From, {error, CloseTag}), + stop(normal, State); downgrade(Type, Event, State, Connection) -> handle_common_event(Type, Event, ?FUNCTION_NAME, State, Connection). |