From aa1562a060cb91214acb639b9be9e1c6a59db884 Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Wed, 31 Oct 2018 13:11:37 +0100 Subject: ssh: Add a common key_cb call function --- lib/ssh/src/ssh.hrl | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/ssh/src/ssh.hrl') diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl index f645201c4f..b0a35e0eab 100644 --- a/lib/ssh/src/ssh.hrl +++ b/lib/ssh/src/ssh.hrl @@ -380,7 +380,6 @@ algorithms, %% #alg{} - key_cb, %% Private/Public key callback module io_cb, %% Interaction callback module send_mac = none, %% send MAC algorithm -- cgit v1.2.3 From 4c3e66d5969e1abe2c8827b756edd860555038a8 Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Wed, 31 Oct 2018 15:34:39 +0100 Subject: ssh: Cleaning and polishing of ssh_auth No intentional api changes. Only to make the code less hard to read. --- lib/ssh/src/ssh.hrl | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib/ssh/src/ssh.hrl') diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl index b0a35e0eab..aa4b3ef098 100644 --- a/lib/ssh/src/ssh.hrl +++ b/lib/ssh/src/ssh.hrl @@ -380,8 +380,6 @@ algorithms, %% #alg{} - io_cb, %% Interaction callback module - send_mac = none, %% send MAC algorithm send_mac_key, %% key used in send MAC algorithm send_mac_size = 0, -- cgit v1.2.3 From 709534a5417f20f8edda1d3664669ed9d3129354 Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Thu, 1 Nov 2018 14:44:44 +0100 Subject: ssh: Generalize unpublished test support option Also rename the corresponding testcase in ssh_options_SUITE and add logging. --- lib/ssh/src/ssh.hrl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/ssh/src/ssh.hrl') diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl index aa4b3ef098..3e9b1add3b 100644 --- a/lib/ssh/src/ssh.hrl +++ b/lib/ssh/src/ssh.hrl @@ -240,7 +240,12 @@ | ?COMMON_OPTION . -type opaque_client_options() :: - {keyboard_interact_fun, fun((term(),term(),term()) -> term())} + {keyboard_interact_fun, fun((Name::iodata(), + Instruction::iodata(), + Prompts::[{Prompt::iodata(),Echo::boolean()}] + ) -> + [Response::iodata()] + )} | opaque_common_options(). -type host_accepting_client_options() :: -- cgit v1.2.3