From 53f4aff60a7c1a08a23917bd47496f8901c471f5 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@dtucker.net>
Date: Sat, 16 Apr 2022 14:33:20 +1000
Subject: [PATCH] Resync moduli.5 with upstream.

1.18: remove duplicate publication year; carsten dot kunze at arcor dot de
1.19: ssh-keygen's -G/-T have been replaced with -M generate/screen.
---
 moduli.5 | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/moduli.5 b/moduli.5
index ef0de0850..5086a6d42 100644
--- a/moduli.5
+++ b/moduli.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: moduli.5,v 1.17 2012/09/26 17:34:38 jmc Exp $
+.\"	$OpenBSD: moduli.5,v 1.19 2022/04/16 04:30:10 dtucker Exp $
 .\"
 .\" Copyright (c) 2008 Damien Miller <djm@mindrot.org>
 .\"
@@ -13,7 +13,7 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.Dd $Mdocdate: September 26 2012 $
+.Dd $Mdocdate: April 16 2022 $
 .Dt MODULI 5
 .Os
 .Sh NAME
@@ -32,12 +32,12 @@ using a two-step process.
 An initial
 .Em candidate generation
 pass, using
-.Ic ssh-keygen -G ,
+.Ic ssh-keygen -M generate ,
 calculates numbers that are likely to be useful.
 A second
 .Em primality testing
 pass, using
-.Ic ssh-keygen -T ,
+.Ic ssh-keygen -M screen ,
 provides a high degree of assurance that the numbers are prime and are
 safe for use in Diffie-Hellman operations by
 .Xr sshd 8 .
@@ -123,5 +123,4 @@ that best meets the size requirement.
 .%D March 2006
 .%R RFC 4419
 .%T Diffie-Hellman Group Exchange for the Secure Shell (SSH) Transport Layer Protocol
-.%D 2006
 .Re