summaryrefslogtreecommitdiff
path: root/ssh-add.1
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2017-05-03 06:32:02 +0000
committerDamien Miller <djm@mindrot.org>2017-05-08 09:18:05 +1000
commit2b6f799e9b230cf13a7eefc05ecead7d8569d6b5 (patch)
treec0abc7946a2e79b528d4e2e8b59520b686d6c4ac /ssh-add.1
parentf10c0d32cde2084d2a0b19bc47d80cb93e85a093 (diff)
upstream commit
more protocol 1 stuff to go; ok djm Upstream-ID: 307a30441d2edda480fd1661d998d36665671e47
Diffstat (limited to 'ssh-add.1')
-rw-r--r--ssh-add.19
1 files changed, 3 insertions, 6 deletions
diff --git a/ssh-add.1 b/ssh-add.1
index f02b595d5..38631f858 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-add.1,v 1.62 2015/03/30 18:28:37 jmc Exp $ 1.\" $OpenBSD: ssh-add.1,v 1.63 2017/05/03 06:32:02 jmc Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37.\" 37.\"
38.Dd $Mdocdate: March 30 2015 $ 38.Dd $Mdocdate: May 3 2017 $
39.Dt SSH-ADD 1 39.Dt SSH-ADD 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -59,9 +59,8 @@ When run without arguments, it adds the files
59.Pa ~/.ssh/id_rsa , 59.Pa ~/.ssh/id_rsa ,
60.Pa ~/.ssh/id_dsa , 60.Pa ~/.ssh/id_dsa ,
61.Pa ~/.ssh/id_ecdsa , 61.Pa ~/.ssh/id_ecdsa ,
62.Pa ~/.ssh/id_ed25519
63and 62and
64.Pa ~/.ssh/identity . 63.Pa ~/.ssh/id_ed25519 .
65After loading a private key, 64After loading a private key,
66.Nm 65.Nm
67will try to load corresponding certificate information from the 66will try to load corresponding certificate information from the
@@ -174,8 +173,6 @@ socket used to communicate with the agent.
174.El 173.El
175.Sh FILES 174.Sh FILES
176.Bl -tag -width Ds 175.Bl -tag -width Ds
177.It Pa ~/.ssh/identity
178Contains the protocol version 1 RSA authentication identity of the user.
179.It Pa ~/.ssh/id_dsa 176.It Pa ~/.ssh/id_dsa
180Contains the protocol version 2 DSA authentication identity of the user. 177Contains the protocol version 2 DSA authentication identity of the user.
181.It Pa ~/.ssh/id_ecdsa 178.It Pa ~/.ssh/id_ecdsa