[src/trunk]: src On note by kleink: Add primes.5 to crypto/dist/ssh instead o...

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

details:   https://anonhg.NetBSD.org/src/rev/b4cc68df5e39
branches:  trunk
changeset: 511251:b4cc68df5e39
user:      wiz <wiz%NetBSD.org@localhost>
date:      Fri Jun 15 12:51:58 2001 +0000

description:
On note by kleink: Add primes.5 to crypto/dist/ssh instead of share/man/man5.

diffstat:

 share/man/man5/Makefile   |    4 +-
 share/man/man5/primes.5   |  161 ----------------------------------------------
 usr.bin/ssh/sshd/Makefile |    4 +-
 3 files changed, 4 insertions(+), 165 deletions(-)

diffs (198 lines):

diff -r d78f203cdafc -r b4cc68df5e39 share/man/man5/Makefile
--- a/share/man/man5/Makefile   Fri Jun 15 12:50:44 2001 +0000
+++ b/share/man/man5/Makefile   Fri Jun 15 12:51:58 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.39 2001/06/15 12:25:10 wiz Exp $
+#      $NetBSD: Makefile,v 1.40 2001/06/15 12:51:58 wiz Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/5/93
 
 # missing: dump.5 plot.5 
@@ -9,7 +9,7 @@
        ipsec.conf.5 ld.so.conf.5 link.5 lkm.conf.5 login.conf.5 \
        mk.conf.5 monthly.conf.5 motd.5 netconfig.5 netgroup.5 networks.5 \
        nsswitch.conf.5 passwd.5 passwd.conf.5 phones.5 \
-       primes.5 printcap.5 protocols.5 ranlib.5 rc.conf.5 remote.5 \
+       printcap.5 protocols.5 ranlib.5 rc.conf.5 remote.5 \
        resolv.conf.5 rpc.5 security.conf.5 services.5 shells.5 stab.5 \
        ttyaction.5 types.5 utmp.5 weekly.conf.5 wscons.conf.5
 MLINKS=        dir.5 dirent.5 fs.5 inode.5 hosts.equiv.5 rhosts.5
diff -r d78f203cdafc -r b4cc68df5e39 share/man/man5/primes.5
--- a/share/man/man5/primes.5   Fri Jun 15 12:50:44 2001 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-.\" $NetBSD: primes.5,v 1.2 2001/06/15 12:24:17 wiz Exp $
-.\"
-.\" $OpenBSD: primes.5,v 1.2 2001/06/14 20:00:46 deraadt Exp $
-.\"
-.\" Copyright 1997, 2000 William Allen Simpson <wsimpson%greendragon.com@localhost>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"      This product includes software designed by William Allen Simpson.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" Manual page, using -mandoc macros
-.\"
-.Dd June 15, 2001
-.Dt PRIMES 5
-.Os
-.Sh NAME
-.Nm primes
-.Nd system moduli file
-.Sh DESCRIPTION
-The
-.Pa /etc/primes
-file contains the system-wide Diffie-Hellman prime moduli for
-.Xr sshd 8 .
-.Pp
-Each line in this file contains the following fields:
-Time, Type, Tests, Tries, Size, Generator, Modulus.
-The fields are separated by white space (tab or blank).
-.Pp
-.Fa Time : yyyymmddhhmmss .
-Specifies the system time that the line was appended to the file.
-The value 00000000000000 means unknown (historic).
-.\"The file is sorted in ascending order.
-.Pp
-.Fa Type : decimal .
-Specifies the internal structure of the prime modulus.
-.Pp
-.Bl -tag -width indent -offset indent -compact
-.It 0 :
-unknown;
-often learned from peer during protocol operation,
-and saved for later analysis.
-.It 1 :
-unstructured;
-a common large number.
-.It 2 :
-safe (p = 2q + 1);
-meets basic structural requirements.
-.It 3 :
-Schnorr.
-.It 4 :
-Sophie-Germaine (q = (p-1)/2);
-usually generated in the process of testing safe or strong primes.
-.It 5 :
-strong;
-useful for RSA public key generation.
-.El
-.Pp
-.Fa Tests : decimal (bit field) .
-Specifies the methods used in checking for primality.
-Usually, more than one test is used.
-.Pp
-.Bl -tag -width indent -offset indent -compact
-.It 0 :
-not tested;
-often learned from peer during protocol operation,
-and saved for later analysis.
-.It 1 :
-composite;
-failed one or more tests.
-In this case, the highest bit specifies the test that failed.
-.It 2 :
-sieve;
-checked for division by a range of smaller primes.
-.It 4 :
-Miller-Rabin.
-.It 8 :
-Jacobi.
-.It 16 :
-Elliptic Curve.
-.El
-.Pp
-.Fa Tries : decimal .
-Depends on the value of the highest valid Test bit,
-where the method specified is:
-.Pp
-.Bl -tag -width indent -offset indent -compact
-.It 0 :
-not tested
-(always zero).
-.It 1 :
-composite
-(irrelevant).
-.It 2 :
-sieve;
-number of primes sieved.
-Commonly on the order of 32,000,000.
-.It 4 :
-Miller-Rabin;
-number of M-R iterations.
-Commonly on the order of 32 to 64.
-.It 8 :
-Jacobi;
-unknown
-(always zero).
-.It 16 :
-Elliptic Curve;
-unused
-(always zero).
-.El
-.Pp
-.Fa Size : decimal .
-Specifies the number of significant bits.
-.Pp
-.Fa Generator : hex string .
-Specifies the best generator for a Diffie-Hellman exchange.
-0 = unknown or variable,
-2, 3, 5, etc.
-.Pp
-.Fa Modulus : hex string .
-The prime modulus.
-.Pp
-The file is searched for moduli that meet the appropriate
-Time, Size and Generator criteria.
-When more than one meet the criteria,
-the selection should be weighted toward newer moduli,
-without completely disqualifying older moduli.
-.Sh FILES
-.Bl -tag -width /etc/primes -compact
-.It Pa /etc/primes
-.El
-.Sh SEE ALSO
-.Xr sshd 8
-.Sh HISTORY
-The
-.Nm
-file appeared in
-.Ox 2.8
-and
-.Nx 1.6 .
diff -r d78f203cdafc -r b4cc68df5e39 usr.bin/ssh/sshd/Makefile
--- a/usr.bin/ssh/sshd/Makefile Fri Jun 15 12:50:44 2001 +0000
+++ b/usr.bin/ssh/sshd/Makefile Fri Jun 15 12:51:58 2001 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.7 2001/04/10 08:08:06 itojun Exp $
+#      $NetBSD: Makefile,v 1.8 2001/06/15 12:51:59 wiz Exp $
 
 .include <bsd.own.mk>
 
 PROG=  sshd
-MAN=   sshd.8
+MAN=   sshd.8 primes.5
 
 BINDIR=        /usr/sbin