summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-08-06 21:18:57 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-08-06 21:18:57 +0000
commit07d24dcbd8818a18224d0b40b76160832dcbd4c6 (patch)
tree22a3fb60e81b0c4b54efe91335168ef28aeb52fc
parent2772a3f8643d085b78110afdd1b84296c04baca9 (diff)
- markus@cvs.openbsd.org 2001/07/28 09:21:15
[sshd.8] cleanup some RSA vs DSA vs SSH1 vs SSH2 notes
-rw-r--r--ChangeLog5
-rw-r--r--sshd.88
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 @@
52 - deraadt@cvs.openbsd.org 2001/07/27 17:26:16 52 - deraadt@cvs.openbsd.org 2001/07/27 17:26:16
53 [scp.c] 53 [scp.c]
54 shorten lines 54 shorten lines
55 - markus@cvs.openbsd.org 2001/07/28 09:21:15
56 [sshd.8]
57 cleanup some RSA vs DSA vs SSH1 vs SSH2 notes
55 58
5620010803 5920010803
57 - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on 60 - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
@@ -6162,4 +6165,4 @@
6162 - Wrote replacements for strlcpy and mkdtemp 6165 - Wrote replacements for strlcpy and mkdtemp
6163 - Released 1.0pre1 6166 - Released 1.0pre1
6164 6167
6165$Id: ChangeLog,v 1.1440 2001/08/06 21:17:12 mouring Exp $ 6168$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 @@
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.137 2001/07/26 17:18:22 stevesk Exp $ 37.\" $OpenBSD: sshd.8,v 1.138 2001/07/28 09:21:15 markus Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -130,7 +130,7 @@ into the machine).
130.Ss SSH protocol version 2 130.Ss SSH protocol version 2
131.Pp 131.Pp
132Version 2 works similarly: 132Version 2 works similarly:
133Each host has a host-specific DSA key used to identify the host. 133Each host has a host-specific key (RSA or DSA) used to identify the host.
134However, when the daemon starts, it does not generate a server key. 134However, when the daemon starts, it does not generate a server key.
135Forward security is provided through a Diffie-Hellman key agreement. 135Forward security is provided through a Diffie-Hellman key agreement.
136This key agreement results in a shared session key. 136This key agreement results in a shared session key.
@@ -340,8 +340,8 @@ are separately checked, allowing you to restrict logins to particular
340users from particular hosts. 340users from particular hosts.
341.Pp 341.Pp
342.It Cm AuthorizedKeysFile 342.It Cm AuthorizedKeysFile
343Specifies the file that contains the public RSA keys that can be used 343Specifies the file that contains the public keys that can be used
344for RSA authentication in protocol version 1. 344for user authentication.
345.Cm AuthorizedKeysFile 345.Cm AuthorizedKeysFile
346may contain tokens of the form %T which are substituted during connection 346may contain tokens of the form %T which are substituted during connection
347set-up. The following tokens are defined; %% is replaces by a literal '%', 347set-up. The following tokens are defined; %% is replaces by a literal '%',