diff options
author | Hans Nilsson <[email protected]> | 2018-11-19 17:24:38 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2018-11-19 17:24:38 +0100 |
commit | cc2ab960ec1ac8702303cd4d80e12118089f97ca (patch) | |
tree | 349407e3ad051220b8cc3a12474022927145bfde /lib/ssh/src/ssh.hrl | |
parent | 5503d96504a89b1b00a78f7e7d12e79be553b215 (diff) | |
parent | b4ad3a9eb7a1b375d2dbbf93069ea9ae038d121f (diff) | |
download | otp-cc2ab960ec1ac8702303cd4d80e12118089f97ca.tar.gz otp-cc2ab960ec1ac8702303cd4d80e12118089f97ca.tar.bz2 otp-cc2ab960ec1ac8702303cd4d80e12118089f97ca.zip |
Merge branch 'hans/ssh/robust_pubkey_prechecks/OTP-15424' into maint
* hans/ssh/robust_pubkey_prechecks/OTP-15424:
ssh: Make host and user key pre-checking better
ssh: Generalize unpublished test support option
ssh: Cleaning and polishing of ssh_auth
ssh: Add a common key_cb call function
Diffstat (limited to 'lib/ssh/src/ssh.hrl')
-rw-r--r-- | lib/ssh/src/ssh.hrl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl index f645201c4f..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() :: @@ -380,9 +385,6 @@ algorithms, %% #alg{} - key_cb, %% Private/Public key callback module - io_cb, %% Interaction callback module - send_mac = none, %% send MAC algorithm send_mac_key, %% key used in send MAC algorithm send_mac_size = 0, |