From 07d24dcbd8818a18224d0b40b76160832dcbd4c6 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Mon, 6 Aug 2001 21:18:57 +0000 Subject: [PATCH] - markus@cvs.openbsd.org 2001/07/28 09:21:15 [sshd.8] cleanup some RSA vs DSA vs SSH1 vs SSH2 notes --- ChangeLog | 5 ++++- sshd.8 | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index af21b0870..ec667c728 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,9 @@ - deraadt@cvs.openbsd.org 2001/07/27 17:26:16 [scp.c] shorten lines + - markus@cvs.openbsd.org 2001/07/28 09:21:15 + [sshd.8] + cleanup some RSA vs DSA vs SSH1 vs SSH2 notes 20010803 - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on @@ -6162,4 +6165,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1440 2001/08/06 21:17:12 mouring Exp $ +$Id: ChangeLog,v 1.1441 2001/08/06 21:18:57 mouring Exp $ diff --git a/sshd.8 b/sshd.8 index 94bd62738..26d42452d 100644 --- a/sshd.8 +++ b/sshd.8 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd.8,v 1.137 2001/07/26 17:18:22 stevesk Exp $ +.\" $OpenBSD: sshd.8,v 1.138 2001/07/28 09:21:15 markus Exp $ .Dd September 25, 1999 .Dt SSHD 8 .Os @@ -130,7 +130,7 @@ into the machine). .Ss SSH protocol version 2 .Pp Version 2 works similarly: -Each host has a host-specific DSA key used to identify the host. +Each host has a host-specific key (RSA or DSA) used to identify the host. However, when the daemon starts, it does not generate a server key. Forward security is provided through a Diffie-Hellman key agreement. This key agreement results in a shared session key. @@ -340,8 +340,8 @@ are separately checked, allowing you to restrict logins to particular users from particular hosts. .Pp .It Cm AuthorizedKeysFile -Specifies the file that contains the public RSA keys that can be used -for RSA authentication in protocol version 1. +Specifies the file that contains the public keys that can be used +for user authentication. .Cm AuthorizedKeysFile may contain tokens of the form %T which are substituted during connection set-up. The following tokens are defined; %% is replaces by a literal '%',