[src/trunk]: src/crypto/dist/ssh refer ~/.ssh/id_rsa{.pub, }. sync with openb...

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/175dcb3a1482
branches:  trunk
changeset: 508356:175dcb3a1482
user:      itojun <itojun%NetBSD.org@localhost>
date:      Tue Apr 10 09:15:49 2001 +0000

description:
refer ~/.ssh/id_rsa{.pub,}.  sync with openbsd usr.bin/ssh.

diffstat:

 crypto/dist/ssh/ssh-add.1    |   8 +++++---
 crypto/dist/ssh/ssh-agent.1  |   8 +++++---
 crypto/dist/ssh/ssh-keygen.1 |  33 ++++++++++++++++++++++++++-------
 crypto/dist/ssh/ssh.1        |  19 ++++++++++++-------
 crypto/dist/ssh/sshd.8       |   9 ++++++---
 5 files changed, 54 insertions(+), 23 deletions(-)

diffs (224 lines):

diff -r 68c1aff414c5 -r 175dcb3a1482 crypto/dist/ssh/ssh-add.1
--- a/crypto/dist/ssh/ssh-add.1 Tue Apr 10 08:07:54 2001 +0000
+++ b/crypto/dist/ssh/ssh-add.1 Tue Apr 10 09:15:49 2001 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ssh-add.1,v 1.5 2001/04/10 08:08:01 itojun Exp $
+.\"    $NetBSD: ssh-add.1,v 1.6 2001/04/10 09:15:49 itojun Exp $
 .\"    $OpenBSD: ssh-add.1,v 1.23 2001/04/09 15:19:49 markus Exp $
 .\"
 .\"  -*- nroff -*-
@@ -81,7 +81,7 @@
 .Sh FILES
 .Bl -tag -width Ds
 .It Pa $HOME/.ssh/identity
-Contains the RSA authentication identity of the user.
+Contains the protocol version 1 RSA authentication identity of the user.
 This file should not be readable by anyone but the user.
 Note that
 .Nm
@@ -93,7 +93,9 @@
 .Nm
 when no other files have been specified.
 .It Pa $HOME/.ssh/id_dsa
-Contains the DSA authentication identity of the user.
+Contains the protocol version 2 DSA authentication identity of the user.
+.It Pa $HOME/.ssh/id_rsa
+Contains the protocol version 2 RSA authentication identity of the user.
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width Ds
diff -r 68c1aff414c5 -r 175dcb3a1482 crypto/dist/ssh/ssh-agent.1
--- a/crypto/dist/ssh/ssh-agent.1       Tue Apr 10 08:07:54 2001 +0000
+++ b/crypto/dist/ssh/ssh-agent.1       Tue Apr 10 09:15:49 2001 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ssh-agent.1,v 1.5 2001/04/10 08:08:02 itojun Exp $
+.\"    $NetBSD: ssh-agent.1,v 1.6 2001/04/10 09:15:49 itojun Exp $
 .\" $OpenBSD: ssh-agent.1,v 1.23 2001/04/02 17:32:23 deraadt Exp $
 .\"
 .\" Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -143,7 +143,7 @@
 .Sh FILES
 .Bl -tag -width Ds
 .It Pa $HOME/.ssh/identity
-Contains the RSA authentication identity of the user.
+Contains the protocol version 1 RSA authentication identity of the user.
 This file should not be readable by anyone but the user.
 It is possible to
 specify a passphrase when generating the key; that passphrase will be
@@ -154,7 +154,9 @@
 .Xr ssh-add 1
 at login time.
 .It Pa $HOME/.ssh/id_dsa
-Contains the DSA authentication identity of the user.
+Contains the protocol version 2 DSA authentication identity of the user.
+.It Pa $HOME/.ssh/id_rsa
+Contains the protocol version 2 RSA authentication identity of the user.
 .It Pa /tmp/ssh-XXXXXXXX/agent.<pid>
 Unix-domain sockets used to contain the connection to the
 authentication agent.
diff -r 68c1aff414c5 -r 175dcb3a1482 crypto/dist/ssh/ssh-keygen.1
--- a/crypto/dist/ssh/ssh-keygen.1      Tue Apr 10 08:07:54 2001 +0000
+++ b/crypto/dist/ssh/ssh-keygen.1      Tue Apr 10 09:15:49 2001 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ssh-keygen.1,v 1.5 2001/04/10 08:08:02 itojun Exp $
+.\"    $NetBSD: ssh-keygen.1,v 1.6 2001/04/10 09:15:49 itojun Exp $
 .\"    $OpenBSD: ssh-keygen.1,v 1.35 2001/03/11 22:33:23 markus Exp $
 .\"
 .\"  -*- nroff -*-
@@ -90,9 +90,10 @@
 Normally each user wishing to use SSH
 with RSA or DSA authentication runs this once to create the authentication
 key in
-.Pa $HOME/.ssh/identity
+.Pa $HOME/.ssh/identity ,
+.Pa $HOME/.ssh/id_dsa
 or
-.Pa $HOME/.ssh/id_dsa .
+.Pa $HOME/.ssh/id_rsa .
 Additionally, the system administrator may use this to generate host keys,
 as seen in
 .Pa /etc/rc.d/sshd .
@@ -192,7 +193,7 @@
 .Sh FILES
 .Bl -tag -width Ds
 .It Pa $HOME/.ssh/identity
-Contains the RSA authentication identity of the user.
+Contains the protocol version 1 RSA authentication identity of the user.
 This file should not be readable by anyone but the user.
 It is possible to
 specify a passphrase when generating the key; that passphrase will be
@@ -203,14 +204,14 @@
 .Xr sshd 8
 will read this file when a login attempt is made.
 .It Pa $HOME/.ssh/identity.pub
-Contains the public key for authentication.
+Contains the protocol version 1 RSA public key for authentication.
 The contents of this file should be added to
 .Pa $HOME/.ssh/authorized_keys
 on all machines
 where you wish to log in using RSA authentication.
 There is no need to keep the contents of this file secret.
 .It Pa $HOME/.ssh/id_dsa
-Contains the DSA authentication identity of the user.
+Contains the protocol version 2 DSA authentication identity of the user.
 This file should not be readable by anyone but the user.
 It is possible to
 specify a passphrase when generating the key; that passphrase will be
@@ -221,7 +222,25 @@
 .Xr sshd 8
 will read this file when a login attempt is made.
 .It Pa $HOME/.ssh/id_dsa.pub
-Contains the public key for authentication.
+Contains the protocol version 2 DSA public key for authentication.
+The contents of this file should be added to
+.Pa $HOME/.ssh/authorized_keys2
+on all machines
+where you wish to log in using public key authentication.
+There is no need to keep the contents of this file secret.
+.It Pa $HOME/.ssh/id_rsa
+Contains the protocol version 2 RSA authentication identity of the user.
+This file should not be readable by anyone but the user.
+It is possible to
+specify a passphrase when generating the key; that passphrase will be
+used to encrypt the private part of this file using 3DES.
+This file is not automatically accessed by
+.Nm
+but it is offered as the default file for the private key.
+.Xr sshd 8
+will read this file when a login attempt is made.
+.It Pa $HOME/.ssh/id_rsa.pub
+Contains the protocol version 2 RSA public key for authentication.
 The contents of this file should be added to
 .Pa $HOME/.ssh/authorized_keys2
 on all machines
diff -r 68c1aff414c5 -r 175dcb3a1482 crypto/dist/ssh/ssh.1
--- a/crypto/dist/ssh/ssh.1     Tue Apr 10 08:07:54 2001 +0000
+++ b/crypto/dist/ssh/ssh.1     Tue Apr 10 09:15:49 2001 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ssh.1,v 1.10 2001/04/10 08:08:03 itojun Exp $
+.\"    $NetBSD: ssh.1,v 1.11 2001/04/10 09:15:49 itojun Exp $
 .\"  -*- nroff -*-
 .\"
 .\" Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -213,8 +213,10 @@
 The public key method is similar to RSA authentication described
 in the previous section except that the DSA or RSA algorithm is used
 instead.
-The client uses his private key
+The client uses his private key,
 .Pa $HOME/.ssh/id_dsa
+or
+.Pa $HOME/.ssh/id_rsa ,
 to sign the session identifier and sends the result to the server.
 The server checks whether the matching public key is listed in
 .Pa $HOME/.ssh/authorized_keys2
@@ -1137,8 +1139,9 @@
 for protocol version 2).
 See
 .Xr sshd 8 .
-.It Pa $HOME/.ssh/identity, $HOME/.ssh/id_dsa
-Contains the RSA and the DSA authentication identity of the user.
+.It Pa $HOME/.ssh/identity, $HOME/.ssh/id_dsa, $HOME/.ssh/id_rsa
+Contains the authentication identity of the user.
+They are for protocol 1 RSA, protocol 2 DSA, and protocol 2 RSA, respectively.
 These files
 contain sensitive data and should be readable by the user but not
 accessible by others (read/write/execute).
@@ -1148,7 +1151,7 @@
 It is possible to specify a passphrase when
 generating the key; the passphrase will be used to encrypt the
 sensitive part of this file using 3DES.
-.It Pa $HOME/.ssh/identity.pub, $HOME/.ssh/id_dsa.pub
+.It Pa $HOME/.ssh/identity.pub, $HOME/.ssh/id_dsa.pub, $HOME/.ssh/id_rsa.pub
 Contains the public key for authentication (public part of the
 identity file in human-readable form).
 The contents of the
@@ -1156,13 +1159,15 @@
 file should be added to
 .Pa $HOME/.ssh/authorized_keys
 on all machines
-where you wish to log in using RSA authentication.
+where you wish to log in using protocol version 1 RSA authentication.
 The contents of the
 .Pa $HOME/.ssh/id_dsa.pub
+and
+.Pa $HOME/.ssh/id_rsa.pub
 file should be added to
 .Pa $HOME/.ssh/authorized_keys2
 on all machines
-where you wish to log in using DSA authentication.
+where you wish to log in using protocol version 2 DSA/RSA authentication.
 These files are not
 sensitive and can (but need not) be readable by anyone.
 These files are
diff -r 68c1aff414c5 -r 175dcb3a1482 crypto/dist/ssh/sshd.8
--- a/crypto/dist/ssh/sshd.8    Tue Apr 10 08:07:54 2001 +0000
+++ b/crypto/dist/ssh/sshd.8    Tue Apr 10 09:15:49 2001 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: sshd.8,v 1.9 2001/04/10 08:08:04 itojun Exp $
+.\"    $NetBSD: sshd.8,v 1.10 2001/04/10 09:15:49 itojun Exp $
 .\"  -*- nroff -*-
 .\"
 .\" Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -822,9 +822,10 @@
 Note that lines in this file are usually several hundred bytes long
 (because of the size of the RSA key modulus).
 You don't want to type them in; instead, copy the
-.Pa identity.pub
+.Pa identity.pub ,
+.Pa id_dsa.pub
 or the
-.Pa id_dsa.pub
+.Pa id_rsa.pub
 file and edit it.
 .Pp
 The options (if present) consist of comma-separated option
@@ -1015,6 +1016,8 @@
 The format of this file is described above.
 Users will place the contents of their
 .Pa id_dsa.pub
+and/or
+.Pa id_rsa.pub
 files into this file, as described in
 .Xr ssh-keygen 1 .
 .It Pa "/etc/ssh_known_hosts" and "$HOME/.ssh/known_hosts"