aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-01-19 17:28:19 +0100
committerHans Nilsson <[email protected]>2017-01-19 17:28:19 +0100
commit973d79eae0ff8f00ae284d4457717176e6746695 (patch)
treef77eab99b6a0952f918f8d87244723c60562e74a
parent7f52af8875a1ab1ba96c6cb2403211bfc876639c (diff)
parent9ff231ba932dded5d712bb34fffe1f396d975a2c (diff)
downloadotp-973d79eae0ff8f00ae284d4457717176e6746695.tar.gz
otp-973d79eae0ff8f00ae284d4457717176e6746695.tar.bz2
otp-973d79eae0ff8f00ae284d4457717176e6746695.zip
Merge branch 'hans/ssh/reduce_decrypt_error_info_leakage/OTP-14109' into maint
-rw-r--r--lib/ssh/src/ssh_connection_handler.erl9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 7451c9e6d0..8718e92fa2 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -1206,7 +1206,7 @@ handle_event(info, {Proto, Sock, NewData}, StateName, D0 = #data{socket = Sock,
catch
_C:_E ->
disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_PROTOCOL_ERROR,
- description = "Encountered unexpected input"},
+ description = "Bad packet"},
StateName, D)
end;
@@ -1221,13 +1221,12 @@ handle_event(info, {Proto, Sock, NewData}, StateName, D0 = #data{socket = Sock,
{bad_mac, Ssh1} ->
disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_PROTOCOL_ERROR,
- description = "Bad mac"},
+ description = "Bad packet"},
StateName, D0#data{ssh_params=Ssh1});
- {error, {exceeds_max_size,PacketLen}} ->
+ {error, {exceeds_max_size,_PacketLen}} ->
disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_PROTOCOL_ERROR,
- description = "Bad packet length "
- ++ integer_to_list(PacketLen)},
+ description = "Bad packet"},
StateName, D0)
catch
_C:_E ->