37 lines
2.1 KiB
Diff
37 lines
2.1 KiB
Diff
|
From d64d9fb0688092356a336e38a8717499113312a0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jakub Witczak <kuba@erlang.org>
|
||
|
|
Date: Fri, 21 Mar 2025 17:50:21 +0100
|
||
|
|
Subject: [PATCH] ssh: use chars_limit for bad packets error messages
|
||
|
|
|
||
|
|
Origin: https://github.com/erlang/otp/commit/d64d9fb0688092356a336e38a8717499113312a0
|
||
|
|
---
|
||
|
|
lib/ssh/src/ssh_connection_handler.erl | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
|
||
|
|
index bb62fc9219f5..a504a2fda722 100644
|
||
|
|
--- a/lib/ssh/src/ssh_connection_handler.erl
|
||
|
|
+++ b/lib/ssh/src/ssh_connection_handler.erl
|
||
|
|
@@ -1148,8 +1148,8 @@ handle_event(info, {Proto, Sock, NewData}, StateName,
|
||
|
|
MaxLogItemLen = ?GET_OPT(max_log_item_len,SshParams#ssh.opts),
|
||
|
|
{Shutdown, D} =
|
||
|
|
?send_disconnect(?SSH_DISCONNECT_PROTOCOL_ERROR,
|
||
|
|
- io_lib:format("Bad packet: Decrypted, but can't decode~n~p:~p~n~P",
|
||
|
|
- [C,E,ST,MaxLogItemLen]),
|
||
|
|
+ io_lib:format("Bad packet: Decrypted, but can't decode~n~p:~p~n~p",
|
||
|
|
+ [C,E,ST], [{chars_limit, MaxLogItemLen}]),
|
||
|
|
StateName, D1),
|
||
|
|
{stop, Shutdown, D}
|
||
|
|
end;
|
||
|
|
@@ -1183,8 +1183,8 @@ handle_event(info, {Proto, Sock, NewData}, StateName,
|
||
|
|
MaxLogItemLen = ?GET_OPT(max_log_item_len,SshParams#ssh.opts),
|
||
|
|
{Shutdown, D} =
|
||
|
|
?send_disconnect(?SSH_DISCONNECT_PROTOCOL_ERROR,
|
||
|
|
- io_lib:format("Bad packet: Couldn't decrypt~n~p:~p~n~P",
|
||
|
|
- [C,E,ST,MaxLogItemLen]),
|
||
|
|
+ io_lib:format("Bad packet: Couldn't decrypt~n~p:~p~n~p",
|
||
|
|
+ [C,E,ST], [{chars_limit, MaxLogItemLen}]),
|
||
|
|
StateName, D0),
|
||
|
|
{stop, Shutdown, D}
|
||
|
|
end;
|