summaryrefslogtreecommitdiff
path: root/ssh-add.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-03-26 13:04:51 +1000
committerDamien Miller <djm@mindrot.org>2000-03-26 13:04:51 +1000
commit450a7a1ff40fe7c2d84c93b83cf2df53445d807d (patch)
treedb6d08bdea65edd34ba2e323a31e2b1ca5e5fbd4 /ssh-add.1
parent2c9279fa667827384fceb243f890cba1dbe480de (diff)
- OpenBSD CVS update
- [auth-krb4.c] -Wall - [auth-rh-rsa.c auth-rsa.c hostfile.c hostfile.h key.c key.h match.c] [match.h ssh.c ssh.h sshconnect.c sshd.c] initial support for DSA keys. ok deraadt@, niels@ - [cipher.c cipher.h] remove unused cipher_attack_detected code - [scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8] Fix some formatting problems I missed before. - [ssh.1 sshd.8] fix spelling errors, From: FreeBSD - [ssh.c] switch to raw mode only if he _get_ a pty (not if we _want_ a pty).
Diffstat (limited to 'ssh-add.1')
-rw-r--r--ssh-add.133
1 files changed, 18 insertions, 15 deletions
diff --git a/ssh-add.1 b/ssh-add.1
index e56140d12..6c35996b6 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -9,7 +9,7 @@
9.\" 9.\"
10.\" Created: Sat Apr 22 23:55:14 1995 ylo 10.\" Created: Sat Apr 22 23:55:14 1995 ylo
11.\" 11.\"
12.\" $Id: ssh-add.1,v 1.9 2000/01/22 08:57:40 damien Exp $ 12.\" $Id: ssh-add.1,v 1.10 2000/03/26 03:04:53 damien Exp $
13.\" 13.\"
14.Dd September 25, 1999 14.Dd September 25, 1999
15.Dt SSH-ADD 1 15.Dt SSH-ADD 1
@@ -27,11 +27,11 @@ adds identities to the authentication agent,
27.Xr ssh-agent 1 . 27.Xr ssh-agent 1 .
28When run without arguments, it adds the file 28When run without arguments, it adds the file
29.Pa $HOME/.ssh/identity . 29.Pa $HOME/.ssh/identity .
30Alternative file names can be given on the 30Alternative file names can be given on the command line.
31command line. If any file requires a passphrase, 31If any file requires a passphrase,
32.Nm 32.Nm
33asks for the passphrase from the user. 33asks for the passphrase from the user.
34The Passphrase it is read from the user's tty. 34The Passphrase it is read from the user's tty.
35.Pp 35.Pp
36The authentication agent must be running and must be an ancestor of 36The authentication agent must be running and must be an ancestor of
37the current process for 37the current process for
@@ -52,15 +52,15 @@ Deletes all identities from the agent.
52.Sh FILES 52.Sh FILES
53.Bl -tag -width Ds 53.Bl -tag -width Ds
54.It Pa $HOME/.ssh/identity 54.It Pa $HOME/.ssh/identity
55Contains the RSA authentication identity of the user. This file 55Contains the RSA authentication identity of the user.
56should not be readable by anyone but the user. 56This file should not be readable by anyone but the user.
57Note that 57Note that
58.Nm 58.Nm
59ignores this file if it is accessible by others. 59ignores this file if it is accessible by others.
60It is possible to 60It is possible to
61specify a passphrase when generating the key; that passphrase will be 61specify a passphrase when generating the key; that passphrase will be
62used to encrypt the private part of this file. This is the 62used to encrypt the private part of this file.
63default file added by 63This is the default file added by
64.Nm 64.Nm
65when no other files have been specified. 65when no other files have been specified.
66.Pp 66.Pp
@@ -70,7 +70,8 @@ when no other files have been specified.
70If 70If
71.Nm 71.Nm
72needs a passphrase, it will read the passphrase from the current 72needs a passphrase, it will read the passphrase from the current
73terminal if it was run from a terminal. If 73terminal if it was run from a terminal.
74If
74.Nm 75.Nm
75does not have a terminal associated with it but 76does not have a terminal associated with it but
76.Ev DISPLAY 77.Ev DISPLAY
@@ -78,12 +79,13 @@ and
78.Ev SSH_ASKPASS 79.Ev SSH_ASKPASS
79are set, it will execute the program specified by 80are set, it will execute the program specified by
80.Ev SSH_ASKPASS 81.Ev SSH_ASKPASS
81and open an X11 window to read the passphrase. This is particularly 82and open an X11 window to read the passphrase.
82useful when calling 83This is particularly useful when calling
83.Nm 84.Nm
84from a 85from a
85.Pa .Xsession 86.Pa .Xsession
86or related script. (Note that on some machines it 87or related script.
88(Note that on some machines it
87may be necessary to redirect the input from 89may be necessary to redirect the input from
88.Pa /dev/null 90.Pa /dev/null
89to make this work.) 91to make this work.)
@@ -92,9 +94,10 @@ Tatu Ylonen <ylo@cs.hut.fi>
92.Pp 94.Pp
93OpenSSH 95OpenSSH
94is a derivative of the original (free) ssh 1.2.12 release, but with bugs 96is a derivative of the original (free) ssh 1.2.12 release, but with bugs
95removed and newer features re-added. Rapidly after the 1.2.12 release, 97removed and newer features re-added.
96newer versions bore successively more restrictive licenses. This version 98Rapidly after the 1.2.12 release,
97of OpenSSH 99newer versions bore successively more restrictive licenses.
100This version of OpenSSH
98.Bl -bullet 101.Bl -bullet
99.It 102.It
100has all components of a restrictive nature (i.e., patents, see 103has all components of a restrictive nature (i.e., patents, see