aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2012-02-14 14:56:46 +0100
committerIngela Anderton Andin <ingela@erlang.org>2012-02-15 11:59:08 +0100
commitcd667daee8ac822bd689de73d54e3a4421706519 (patch)
treeefb052dc7ecfc7cdad4664496a18c6a9a423af0a /lib/ssh/doc
parent4a9cf8de2125832cdc636693ec23f625f195b9e8 (diff)
downloadotp-cd667daee8ac822bd689de73d54e3a4421706519.tar.gz
otp-cd667daee8ac822bd689de73d54e3a4421706519.tar.bz2
otp-cd667daee8ac822bd689de73d54e3a4421706519.zip
Add support for key files protected by pass phrases
Diffstat (limited to 'lib/ssh/doc')
-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