diff options
Diffstat (limited to 'ssh-add.1')
-rw-r--r-- | ssh-add.1 | 33 |
1 files changed, 18 insertions, 15 deletions
@@ -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 . |
28 | When run without arguments, it adds the file | 28 | When run without arguments, it adds the file |
29 | .Pa $HOME/.ssh/identity . | 29 | .Pa $HOME/.ssh/identity . |
30 | Alternative file names can be given on the | 30 | Alternative file names can be given on the command line. |
31 | command line. If any file requires a passphrase, | 31 | If any file requires a passphrase, |
32 | .Nm | 32 | .Nm |
33 | asks for the passphrase from the user. | 33 | asks for the passphrase from the user. |
34 | The Passphrase it is read from the user's tty. | 34 | The Passphrase it is read from the user's tty. |
35 | .Pp | 35 | .Pp |
36 | The authentication agent must be running and must be an ancestor of | 36 | The authentication agent must be running and must be an ancestor of |
37 | the current process for | 37 | the 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 |
55 | Contains the RSA authentication identity of the user. This file | 55 | Contains the RSA authentication identity of the user. |
56 | should not be readable by anyone but the user. | 56 | This file should not be readable by anyone but the user. |
57 | Note that | 57 | Note that |
58 | .Nm | 58 | .Nm |
59 | ignores this file if it is accessible by others. | 59 | ignores this file if it is accessible by others. |
60 | It is possible to | 60 | It is possible to |
61 | specify a passphrase when generating the key; that passphrase will be | 61 | specify a passphrase when generating the key; that passphrase will be |
62 | used to encrypt the private part of this file. This is the | 62 | used to encrypt the private part of this file. |
63 | default file added by | 63 | This is the default file added by |
64 | .Nm | 64 | .Nm |
65 | when no other files have been specified. | 65 | when no other files have been specified. |
66 | .Pp | 66 | .Pp |
@@ -70,7 +70,8 @@ when no other files have been specified. | |||
70 | If | 70 | If |
71 | .Nm | 71 | .Nm |
72 | needs a passphrase, it will read the passphrase from the current | 72 | needs a passphrase, it will read the passphrase from the current |
73 | terminal if it was run from a terminal. If | 73 | terminal if it was run from a terminal. |
74 | If | ||
74 | .Nm | 75 | .Nm |
75 | does not have a terminal associated with it but | 76 | does 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 |
79 | are set, it will execute the program specified by | 80 | are set, it will execute the program specified by |
80 | .Ev SSH_ASKPASS | 81 | .Ev SSH_ASKPASS |
81 | and open an X11 window to read the passphrase. This is particularly | 82 | and open an X11 window to read the passphrase. |
82 | useful when calling | 83 | This is particularly useful when calling |
83 | .Nm | 84 | .Nm |
84 | from a | 85 | from a |
85 | .Pa .Xsession | 86 | .Pa .Xsession |
86 | or related script. (Note that on some machines it | 87 | or related script. |
88 | (Note that on some machines it | ||
87 | may be necessary to redirect the input from | 89 | may be necessary to redirect the input from |
88 | .Pa /dev/null | 90 | .Pa /dev/null |
89 | to make this work.) | 91 | to make this work.) |
@@ -92,9 +94,10 @@ Tatu Ylonen <ylo@cs.hut.fi> | |||
92 | .Pp | 94 | .Pp |
93 | OpenSSH | 95 | OpenSSH |
94 | is a derivative of the original (free) ssh 1.2.12 release, but with bugs | 96 | is a derivative of the original (free) ssh 1.2.12 release, but with bugs |
95 | removed and newer features re-added. Rapidly after the 1.2.12 release, | 97 | removed and newer features re-added. |
96 | newer versions bore successively more restrictive licenses. This version | 98 | Rapidly after the 1.2.12 release, |
97 | of OpenSSH | 99 | newer versions bore successively more restrictive licenses. |
100 | This version of OpenSSH | ||
98 | .Bl -bullet | 101 | .Bl -bullet |
99 | .It | 102 | .It |
100 | has all components of a restrictive nature (i.e., patents, see | 103 | has all components of a restrictive nature (i.e., patents, see |