diff options
author | Hans Nilsson <hans@erlang.org> | 2017-10-02 12:46:32 +0200 |
---|---|---|
committer | Hans Nilsson <hans@erlang.org> | 2017-10-02 12:46:32 +0200 |
commit | c46c699a518f9068b35d1c591ed8aed067b832ba (patch) | |
tree | d951a1b13857ab7ebf71fd2aa5b6da7b181f81e6 /lib/ssh/src | |
parent | f178f46023da20fb2728e9b95b3d14a1c4c6b5ce (diff) | |
parent | 8d37b35a3d68a5acf4889d5df20b51790ec19097 (diff) | |
download | otp-c46c699a518f9068b35d1c591ed8aed067b832ba.tar.gz otp-c46c699a518f9068b35d1c591ed8aed067b832ba.tar.bz2 otp-c46c699a518f9068b35d1c591ed8aed067b832ba.zip |
Merge branch 'hans/ssh/ecdsa_pass_phrase/OTP-14602' into maint
Diffstat (limited to 'lib/ssh/src')
-rw-r--r-- | lib/ssh/src/ssh_options.erl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh_options.erl b/lib/ssh/src/ssh_options.erl index 6939094401..68c99743ee 100644 --- a/lib/ssh/src/ssh_options.erl +++ b/lib/ssh/src/ssh_options.erl @@ -421,6 +421,12 @@ default(client) -> class => user_options }, + {ecdsa_pass_phrase, def} => + #{default => undefined, + chk => fun check_string/1, + class => user_options + }, + {silently_accept_hosts, def} => #{default => false, chk => fun check_silently_accept_hosts/1, |