aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-10-10 13:44:22 +0200
committerHans Nilsson <[email protected]>2017-10-10 13:44:22 +0200
commitb42792cb96262b1c10baf3c756e439f68b1dc8e1 (patch)
treed374c84d45043e3e578ee54c6ac4da38fba727e2
parent7d3a88f370b140664f34b4d3b73d38d30952a830 (diff)
parentc38f7ea8a4ac9906f94ec69e011296d3763392b7 (diff)
downloadotp-b42792cb96262b1c10baf3c756e439f68b1dc8e1.tar.gz
otp-b42792cb96262b1c10baf3c756e439f68b1dc8e1.tar.bz2
otp-b42792cb96262b1c10baf3c756e439f68b1dc8e1.zip
Merge branch 'hans/ssh/ssh_dbg_hostkey/OTP-14658' into maint
-rw-r--r--lib/ssh/src/ssh_dbg.erl11
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh_dbg.erl b/lib/ssh/src/ssh_dbg.erl
index 906640b490..af9ad52d68 100644
--- a/lib/ssh/src/ssh_dbg.erl
+++ b/lib/ssh/src/ssh_dbg.erl
@@ -24,6 +24,7 @@
-export([messages/0, messages/1, messages/2, messages/3,
auth/0, auth/1, auth/2, auth/3,
+ algs/0, algs/1, algs/2, algs/3,
hostkey/0, hostkey/1, hostkey/2, hostkey/3,
stop/0
]).
@@ -47,6 +48,11 @@ auth(F) -> start(auth,F).
auth(F,X) -> start(auth,F,X).
auth(F,M,I) -> start(auth,F,M,I).
+algs() -> start(algs).
+algs(F) -> start(algs,F).
+algs(F,X) -> start(algs,F,X).
+algs(F,M,I) -> start(algs,F,M,I).
+
hostkey() -> start(hostkey).
hostkey(F) -> start(hostkey,F).
hostkey(F,X) -> start(hostkey,F,X).
@@ -95,6 +101,11 @@ dbg_ssh0(auth) ->
[publickey_msg, password_msg, keyboard_interactive_msg])
];
+dbg_ssh0(algs) ->
+ [dbg:tpl(ssh_transport,select_algorithm,4, x),
+ dbg:tpl(ssh_connection_handler,ext_info,2, x)
+ ];
+
dbg_ssh0(hostkey) ->
[dbg:tpl(ssh_transport, verify_host_key, 4, x),
dbg:tp(ssh_transport, verify, 4, x),