aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-02-16 09:24:30 +0100
committerIngela Anderton Andin <[email protected]>2012-02-16 09:24:30 +0100
commit4d9dd06871d268942df763e556a0afb0bb6cf471 (patch)
tree020df21faf1409067cf8c92327ade0b7e1f856be /lib/ssh/doc/src
parent4a9cf8de2125832cdc636693ec23f625f195b9e8 (diff)
parent489fac442f15f08adf7745fb2d399cd521f0db74 (diff)
downloadotp-4d9dd06871d268942df763e556a0afb0bb6cf471.tar.gz
otp-4d9dd06871d268942df763e556a0afb0bb6cf471.tar.bz2
otp-4d9dd06871d268942df763e556a0afb0bb6cf471.zip
Merge branch 'ia/ssh/pass-phrase-protected-keys/OTP-6400' into maint
* ia/ssh/pass-phrase-protected-keys/OTP-6400: Remove unused files from test data as it is confusing Add support for key files protected by pass phrases
Diffstat (limited to 'lib/ssh/doc/src')
-rw-r--r--lib/ssh/doc/src/ssh.xml14
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 0f7add6d36..c205fc5dc7 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -86,7 +86,7 @@
by calling ssh_connect:session_channel/2.</p>
<p>Options are:</p>
<taglist>
- <tag><c><![CDATA[{user_dir, String}]]></c></tag>
+ <tag><c><![CDATA[{user_dir, string()}]]></c></tag>
<item>
<p>Sets the user directory e.i. the directory containing
ssh configuration files for the user such as
@@ -94,6 +94,18 @@
<c><![CDATA[authorized_key]]></c>. Defaults to the directory normally
referred to as <c><![CDATA[~/.ssh]]></c> </p>
</item>
+ <tag><c><![CDATA[{dsa_pass_phrase, string()}]]></c></tag>
+ <item>
+ <p>If the user dsa key is protected by a pass phrase it can be
+ supplied with this option.
+ </p>
+ </item>
+ <tag><c><![CDATA[{rsa_pass_phrase, string()}]]></c></tag>
+ <item>
+ <p>If the user rsa key is protected by a pass phrase it can be
+ supplied with this option.
+ </p>
+ </item>
<tag><c><![CDATA[{silently_accept_hosts, boolean()}]]></c></tag>
<item>
<p>When true hosts are added to the