diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-add.1 | 8 | ||||
-rw-r--r-- | ssh-agent.1 | 8 | ||||
-rw-r--r-- | ssh-keygen.1 | 33 | ||||
-rw-r--r-- | ssh.1 | 19 | ||||
-rw-r--r-- | sshd.8 | 9 |
6 files changed, 58 insertions, 24 deletions
@@ -3,6 +3,9 @@ | |||
3 | - markus@cvs.openbsd.org 2001/04/10 07:46:58 | 3 | - markus@cvs.openbsd.org 2001/04/10 07:46:58 |
4 | [channels.c] | 4 | [channels.c] |
5 | cleanup socks4 handling | 5 | cleanup socks4 handling |
6 | - itojun@cvs.openbsd.org 2001/04/10 09:13:22 | ||
7 | [ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8] | ||
8 | document id_rsa{.pub,}. markus ok | ||
6 | 9 | ||
7 | 20010410 | 10 | 20010410 |
8 | - OpenBSD CVS Sync | 11 | - OpenBSD CVS Sync |
@@ -4996,4 +4999,4 @@ | |||
4996 | - Wrote replacements for strlcpy and mkdtemp | 4999 | - Wrote replacements for strlcpy and mkdtemp |
4997 | - Released 1.0pre1 | 5000 | - Released 1.0pre1 |
4998 | 5001 | ||
4999 | $Id: ChangeLog,v 1.1094 2001/04/11 15:57:50 mouring Exp $ | 5002 | $Id: ChangeLog,v 1.1095 2001/04/11 15:59:35 mouring Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-add.1,v 1.23 2001/04/09 15:19:49 markus Exp $ | 1 | .\" $OpenBSD: ssh-add.1,v 1.24 2001/04/10 09:13:21 itojun Exp $ |
2 | .\" | 2 | .\" |
3 | .\" -*- nroff -*- | 3 | .\" -*- nroff -*- |
4 | .\" | 4 | .\" |
@@ -80,7 +80,7 @@ Deletes all identities from the agent. | |||
80 | .Sh FILES | 80 | .Sh FILES |
81 | .Bl -tag -width Ds | 81 | .Bl -tag -width Ds |
82 | .It Pa $HOME/.ssh/identity | 82 | .It Pa $HOME/.ssh/identity |
83 | Contains the RSA authentication identity of the user. | 83 | Contains the protocol version 1 RSA authentication identity of the user. |
84 | This file should not be readable by anyone but the user. | 84 | This file should not be readable by anyone but the user. |
85 | Note that | 85 | Note that |
86 | .Nm | 86 | .Nm |
@@ -92,7 +92,9 @@ This is the default file added by | |||
92 | .Nm | 92 | .Nm |
93 | when no other files have been specified. | 93 | when no other files have been specified. |
94 | .It Pa $HOME/.ssh/id_dsa | 94 | .It Pa $HOME/.ssh/id_dsa |
95 | Contains the DSA authentication identity of the user. | 95 | Contains the protocol version 2 DSA authentication identity of the user. |
96 | .It Pa $HOME/.ssh/id_rsa | ||
97 | Contains the protocol version 2 RSA authentication identity of the user. | ||
96 | .El | 98 | .El |
97 | .Sh ENVIRONMENT | 99 | .Sh ENVIRONMENT |
98 | .Bl -tag -width Ds | 100 | .Bl -tag -width Ds |
diff --git a/ssh-agent.1 b/ssh-agent.1 index a14f359a4..1d214698d 100644 --- a/ssh-agent.1 +++ b/ssh-agent.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-agent.1,v 1.23 2001/04/02 17:32:23 deraadt Exp $ | 1 | .\" $OpenBSD: ssh-agent.1,v 1.24 2001/04/10 09:13:21 itojun 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 |
@@ -142,7 +142,7 @@ line terminates. | |||
142 | .Sh FILES | 142 | .Sh FILES |
143 | .Bl -tag -width Ds | 143 | .Bl -tag -width Ds |
144 | .It Pa $HOME/.ssh/identity | 144 | .It Pa $HOME/.ssh/identity |
145 | Contains the RSA authentication identity of the user. | 145 | Contains the protocol version 1 RSA authentication identity of the user. |
146 | This file should not be readable by anyone but the user. | 146 | This file should not be readable by anyone but the user. |
147 | It is possible to | 147 | It is possible to |
148 | specify a passphrase when generating the key; that passphrase will be | 148 | specify a passphrase when generating the key; that passphrase will be |
@@ -153,7 +153,9 @@ but is normally added to the agent using | |||
153 | .Xr ssh-add 1 | 153 | .Xr ssh-add 1 |
154 | at login time. | 154 | at login time. |
155 | .It Pa $HOME/.ssh/id_dsa | 155 | .It Pa $HOME/.ssh/id_dsa |
156 | Contains the DSA authentication identity of the user. | 156 | Contains the protocol version 2 DSA authentication identity of the user. |
157 | .It Pa $HOME/.ssh/id_rsa | ||
158 | Contains the protocol version 2 RSA authentication identity of the user. | ||
157 | .It Pa /tmp/ssh-XXXXXXXX/agent.<pid> | 159 | .It Pa /tmp/ssh-XXXXXXXX/agent.<pid> |
158 | Unix-domain sockets used to contain the connection to the | 160 | Unix-domain sockets used to contain the connection to the |
159 | authentication agent. | 161 | authentication agent. |
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index a3914680e..6808ede69 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.35 2001/03/11 22:33:23 markus Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.36 2001/04/10 09:13:21 itojun Exp $ |
2 | .\" | 2 | .\" |
3 | .\" -*- nroff -*- | 3 | .\" -*- nroff -*- |
4 | .\" | 4 | .\" |
@@ -89,9 +89,10 @@ option allows you to create a key for use by protocol 2.0. | |||
89 | Normally each user wishing to use SSH | 89 | Normally each user wishing to use SSH |
90 | with RSA or DSA authentication runs this once to create the authentication | 90 | with RSA or DSA authentication runs this once to create the authentication |
91 | key in | 91 | key in |
92 | .Pa $HOME/.ssh/identity | 92 | .Pa $HOME/.ssh/identity , |
93 | .Pa $HOME/.ssh/id_dsa | ||
93 | or | 94 | or |
94 | .Pa $HOME/.ssh/id_dsa . | 95 | .Pa $HOME/.ssh/id_rsa . |
95 | Additionally, the system administrator may use this to generate host keys, | 96 | Additionally, the system administrator may use this to generate host keys, |
96 | as seen in | 97 | as seen in |
97 | .Pa /etc/rc . | 98 | .Pa /etc/rc . |
@@ -191,7 +192,7 @@ OpenSSH format file and print an OpenSSH public key to stdout. | |||
191 | .Sh FILES | 192 | .Sh FILES |
192 | .Bl -tag -width Ds | 193 | .Bl -tag -width Ds |
193 | .It Pa $HOME/.ssh/identity | 194 | .It Pa $HOME/.ssh/identity |
194 | Contains the RSA authentication identity of the user. | 195 | Contains the protocol version 1 RSA authentication identity of the user. |
195 | This file should not be readable by anyone but the user. | 196 | This file should not be readable by anyone but the user. |
196 | It is possible to | 197 | It is possible to |
197 | specify a passphrase when generating the key; that passphrase will be | 198 | specify a passphrase when generating the key; that passphrase will be |
@@ -202,14 +203,14 @@ but it is offered as the default file for the private key. | |||
202 | .Xr sshd 8 | 203 | .Xr sshd 8 |
203 | will read this file when a login attempt is made. | 204 | will read this file when a login attempt is made. |
204 | .It Pa $HOME/.ssh/identity.pub | 205 | .It Pa $HOME/.ssh/identity.pub |
205 | Contains the public key for authentication. | 206 | Contains the protocol version 1 RSA public key for authentication. |
206 | The contents of this file should be added to | 207 | The contents of this file should be added to |
207 | .Pa $HOME/.ssh/authorized_keys | 208 | .Pa $HOME/.ssh/authorized_keys |
208 | on all machines | 209 | on all machines |
209 | where you wish to log in using RSA authentication. | 210 | where you wish to log in using RSA authentication. |
210 | There is no need to keep the contents of this file secret. | 211 | There is no need to keep the contents of this file secret. |
211 | .It Pa $HOME/.ssh/id_dsa | 212 | .It Pa $HOME/.ssh/id_dsa |
212 | Contains the DSA authentication identity of the user. | 213 | Contains the protocol version 2 DSA authentication identity of the user. |
213 | This file should not be readable by anyone but the user. | 214 | This file should not be readable by anyone but the user. |
214 | It is possible to | 215 | It is possible to |
215 | specify a passphrase when generating the key; that passphrase will be | 216 | specify a passphrase when generating the key; that passphrase will be |
@@ -220,7 +221,25 @@ but it is offered as the default file for the private key. | |||
220 | .Xr sshd 8 | 221 | .Xr sshd 8 |
221 | will read this file when a login attempt is made. | 222 | will read this file when a login attempt is made. |
222 | .It Pa $HOME/.ssh/id_dsa.pub | 223 | .It Pa $HOME/.ssh/id_dsa.pub |
223 | Contains the public key for authentication. | 224 | Contains the protocol version 2 DSA public key for authentication. |
225 | The contents of this file should be added to | ||
226 | .Pa $HOME/.ssh/authorized_keys2 | ||
227 | on all machines | ||
228 | where you wish to log in using public key authentication. | ||
229 | There is no need to keep the contents of this file secret. | ||
230 | .It Pa $HOME/.ssh/id_rsa | ||
231 | Contains the protocol version 2 RSA authentication identity of the user. | ||
232 | This file should not be readable by anyone but the user. | ||
233 | It is possible to | ||
234 | specify a passphrase when generating the key; that passphrase will be | ||
235 | used to encrypt the private part of this file using 3DES. | ||
236 | This file is not automatically accessed by | ||
237 | .Nm | ||
238 | but it is offered as the default file for the private key. | ||
239 | .Xr sshd 8 | ||
240 | will read this file when a login attempt is made. | ||
241 | .It Pa $HOME/.ssh/id_rsa.pub | ||
242 | Contains the protocol version 2 RSA public key for authentication. | ||
224 | The contents of this file should be added to | 243 | The contents of this file should be added to |
225 | .Pa $HOME/.ssh/authorized_keys2 | 244 | .Pa $HOME/.ssh/authorized_keys2 |
226 | on all machines | 245 | on all machines |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh.1,v 1.101 2001/04/05 15:45:43 markus Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.102 2001/04/10 09:13:22 itojun Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -212,8 +212,10 @@ If this method fails password authentication is tried. | |||
212 | The public key method is similar to RSA authentication described | 212 | The public key method is similar to RSA authentication described |
213 | in the previous section except that the DSA or RSA algorithm is used | 213 | in the previous section except that the DSA or RSA algorithm is used |
214 | instead. | 214 | instead. |
215 | The client uses his private key | 215 | The client uses his private key, |
216 | .Pa $HOME/.ssh/id_dsa | 216 | .Pa $HOME/.ssh/id_dsa |
217 | or | ||
218 | .Pa $HOME/.ssh/id_rsa , | ||
217 | to sign the session identifier and sends the result to the server. | 219 | to sign the session identifier and sends the result to the server. |
218 | The server checks whether the matching public key is listed in | 220 | The server checks whether the matching public key is listed in |
219 | .Pa $HOME/.ssh/authorized_keys2 | 221 | .Pa $HOME/.ssh/authorized_keys2 |
@@ -1136,8 +1138,9 @@ for protocol version 1 or | |||
1136 | for protocol version 2). | 1138 | for protocol version 2). |
1137 | See | 1139 | See |
1138 | .Xr sshd 8 . | 1140 | .Xr sshd 8 . |
1139 | .It Pa $HOME/.ssh/identity, $HOME/.ssh/id_dsa | 1141 | .It Pa $HOME/.ssh/identity, $HOME/.ssh/id_dsa, $HOME/.ssh/id_rsa |
1140 | Contains the RSA and the DSA authentication identity of the user. | 1142 | Contains the authentication identity of the user. |
1143 | They are for protocol 1 RSA, protocol 2 DSA, and protocol 2 RSA, respectively. | ||
1141 | These files | 1144 | These files |
1142 | contain sensitive data and should be readable by the user but not | 1145 | contain sensitive data and should be readable by the user but not |
1143 | accessible by others (read/write/execute). | 1146 | accessible by others (read/write/execute). |
@@ -1147,7 +1150,7 @@ ignores a private key file if it is accessible by others. | |||
1147 | It is possible to specify a passphrase when | 1150 | It is possible to specify a passphrase when |
1148 | generating the key; the passphrase will be used to encrypt the | 1151 | generating the key; the passphrase will be used to encrypt the |
1149 | sensitive part of this file using 3DES. | 1152 | sensitive part of this file using 3DES. |
1150 | .It Pa $HOME/.ssh/identity.pub, $HOME/.ssh/id_dsa.pub | 1153 | .It Pa $HOME/.ssh/identity.pub, $HOME/.ssh/id_dsa.pub, $HOME/.ssh/id_rsa.pub |
1151 | Contains the public key for authentication (public part of the | 1154 | Contains the public key for authentication (public part of the |
1152 | identity file in human-readable form). | 1155 | identity file in human-readable form). |
1153 | The contents of the | 1156 | The contents of the |
@@ -1155,13 +1158,15 @@ The contents of the | |||
1155 | file should be added to | 1158 | file should be added to |
1156 | .Pa $HOME/.ssh/authorized_keys | 1159 | .Pa $HOME/.ssh/authorized_keys |
1157 | on all machines | 1160 | on all machines |
1158 | where you wish to log in using RSA authentication. | 1161 | where you wish to log in using protocol version 1 RSA authentication. |
1159 | The contents of the | 1162 | The contents of the |
1160 | .Pa $HOME/.ssh/id_dsa.pub | 1163 | .Pa $HOME/.ssh/id_dsa.pub |
1164 | and | ||
1165 | .Pa $HOME/.ssh/id_rsa.pub | ||
1161 | file should be added to | 1166 | file should be added to |
1162 | .Pa $HOME/.ssh/authorized_keys2 | 1167 | .Pa $HOME/.ssh/authorized_keys2 |
1163 | on all machines | 1168 | on all machines |
1164 | where you wish to log in using DSA authentication. | 1169 | where you wish to log in using protocol version 2 DSA/RSA authentication. |
1165 | These files are not | 1170 | These files are not |
1166 | sensitive and can (but need not) be readable by anyone. | 1171 | sensitive and can (but need not) be readable by anyone. |
1167 | These files are | 1172 | These files are |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: sshd.8,v 1.112 2001/04/09 18:00:15 stevesk Exp $ | 37 | .\" $OpenBSD: sshd.8,v 1.113 2001/04/10 09:13:22 itojun Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD 8 | 39 | .Dt SSHD 8 |
40 | .Os | 40 | .Os |
@@ -821,9 +821,10 @@ or | |||
821 | Note that lines in this file are usually several hundred bytes long | 821 | Note that lines in this file are usually several hundred bytes long |
822 | (because of the size of the RSA key modulus). | 822 | (because of the size of the RSA key modulus). |
823 | You don't want to type them in; instead, copy the | 823 | You don't want to type them in; instead, copy the |
824 | .Pa identity.pub | 824 | .Pa identity.pub , |
825 | or the | ||
826 | .Pa id_dsa.pub | 825 | .Pa id_dsa.pub |
826 | or the | ||
827 | .Pa id_rsa.pub | ||
827 | file and edit it. | 828 | file and edit it. |
828 | .Pp | 829 | .Pp |
829 | The options (if present) consist of comma-separated option | 830 | The options (if present) consist of comma-separated option |
@@ -1014,6 +1015,8 @@ It is recommended that it not be accessible by others. | |||
1014 | The format of this file is described above. | 1015 | The format of this file is described above. |
1015 | Users will place the contents of their | 1016 | Users will place the contents of their |
1016 | .Pa id_dsa.pub | 1017 | .Pa id_dsa.pub |
1018 | and/or | ||
1019 | .Pa id_rsa.pub | ||
1017 | files into this file, as described in | 1020 | files into this file, as described in |
1018 | .Xr ssh-keygen 1 . | 1021 | .Xr ssh-keygen 1 . |
1019 | .It Pa "/etc/ssh_known_hosts" and "$HOME/.ssh/known_hosts" | 1022 | .It Pa "/etc/ssh_known_hosts" and "$HOME/.ssh/known_hosts" |