diff options
author | Damien Miller <djm@mindrot.org> | 2002-02-05 12:26:58 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-02-05 12:26:58 +1100 |
commit | ab57f351147ff8c1fb1ca5320f11674bd918d66d (patch) | |
tree | 8356634f9dc727a82f41889d495ee51caa7255b5 | |
parent | fcd9320440c7eb2758659ec2ac19b99054e43044 (diff) |
- stevesk@cvs.openbsd.org 2002/02/04 20:41:16
[ssh-add.1]
more sync for default ssh-add identities; ok markus@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-add.1 | 17 |
2 files changed, 10 insertions, 12 deletions
@@ -89,6 +89,9 @@ | |||
89 | [log.c log.h readconf.c servconf.c] | 89 | [log.c log.h readconf.c servconf.c] |
90 | add SYSLOG_FACILITY_NOT_SET = -1, SYSLOG_LEVEL_NOT_SET = -1, | 90 | add SYSLOG_FACILITY_NOT_SET = -1, SYSLOG_LEVEL_NOT_SET = -1, |
91 | fixes arm/netbsd; based on patch from bjh21@netbsd.org; ok djm@ | 91 | fixes arm/netbsd; based on patch from bjh21@netbsd.org; ok djm@ |
92 | - stevesk@cvs.openbsd.org 2002/02/04 20:41:16 | ||
93 | [ssh-add.1] | ||
94 | more sync for default ssh-add identities; ok markus@ | ||
92 | 95 | ||
93 | 20020130 | 96 | 20020130 |
94 | - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@ | 97 | - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@ |
@@ -7491,4 +7494,4 @@ | |||
7491 | - Wrote replacements for strlcpy and mkdtemp | 7494 | - Wrote replacements for strlcpy and mkdtemp |
7492 | - Released 1.0pre1 | 7495 | - Released 1.0pre1 |
7493 | 7496 | ||
7494 | $Id: ChangeLog,v 1.1823 2002/02/05 01:26:34 djm Exp $ | 7497 | $Id: ChangeLog,v 1.1824 2002/02/05 01:26:58 djm Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-add.1,v 1.29 2002/01/29 16:41:19 markus Exp $ | 1 | .\" $OpenBSD: ssh-add.1,v 1.30 2002/02/04 20:41:16 stevesk Exp $ |
2 | .\" | 2 | .\" |
3 | .\" -*- nroff -*- | 3 | .\" -*- nroff -*- |
4 | .\" | 4 | .\" |
@@ -94,21 +94,16 @@ Remove key in smartcard | |||
94 | .Bl -tag -width Ds | 94 | .Bl -tag -width Ds |
95 | .It Pa $HOME/.ssh/identity | 95 | .It Pa $HOME/.ssh/identity |
96 | Contains the protocol version 1 RSA authentication identity of the user. | 96 | Contains the protocol version 1 RSA authentication identity of the user. |
97 | This file should not be readable by anyone but the user. | ||
98 | Note that | ||
99 | .Nm | ||
100 | ignores this file if it is accessible by others. | ||
101 | It is possible to | ||
102 | specify a passphrase when generating the key; that passphrase will be | ||
103 | used to encrypt the private part of this file. | ||
104 | This is the default file added by | ||
105 | .Nm | ||
106 | when no other files have been specified. | ||
107 | .It Pa $HOME/.ssh/id_dsa | 97 | .It Pa $HOME/.ssh/id_dsa |
108 | Contains the protocol version 2 DSA authentication identity of the user. | 98 | Contains the protocol version 2 DSA authentication identity of the user. |
109 | .It Pa $HOME/.ssh/id_rsa | 99 | .It Pa $HOME/.ssh/id_rsa |
110 | Contains the protocol version 2 RSA authentication identity of the user. | 100 | Contains the protocol version 2 RSA authentication identity of the user. |
111 | .El | 101 | .El |
102 | .Pp | ||
103 | Identity files should not be readable by anyone but the user. | ||
104 | Note that | ||
105 | .Nm | ||
106 | ignores identity files if they are accessible by others. | ||
112 | .Sh ENVIRONMENT | 107 | .Sh ENVIRONMENT |
113 | .Bl -tag -width Ds | 108 | .Bl -tag -width Ds |
114 | .It Ev "DISPLAY" and "SSH_ASKPASS" | 109 | .It Ev "DISPLAY" and "SSH_ASKPASS" |