aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-10-10 13:46:09 +0200
committerHans Nilsson <[email protected]>2017-10-10 13:46:09 +0200
commit32ff5b0372e3dd4db8d9a30de2e0b9995d3fc883 (patch)
treea841b75db9ab1ef368a378b55bf55d84d9f57879
parented2700c3f517e4575ff15558d5d109ee2904083a (diff)
parentb42792cb96262b1c10baf3c756e439f68b1dc8e1 (diff)
downloadotp-32ff5b0372e3dd4db8d9a30de2e0b9995d3fc883.tar.gz
otp-32ff5b0372e3dd4db8d9a30de2e0b9995d3fc883.tar.bz2
otp-32ff5b0372e3dd4db8d9a30de2e0b9995d3fc883.zip
Merge branch '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),