From ab30b92bd6953e44e8304606e343074b69da88da Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Tue, 6 Nov 2012 09:59:17 +0100
Subject: [PATCH] fix the man moduli page (#841065)

---
 openssh-6.1p1-man-moduli.patch | 24 ++++++++++++++++++++++++
 openssh.spec                   |  4 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 openssh-6.1p1-man-moduli.patch

diff --git a/openssh-6.1p1-man-moduli.patch b/openssh-6.1p1-man-moduli.patch
new file mode 100644
index 0000000..8874ede
--- /dev/null
+++ b/openssh-6.1p1-man-moduli.patch
@@ -0,0 +1,24 @@
+diff -up openssh-6.1p1/moduli.0.man-moduli openssh-6.1p1/moduli.0
+--- openssh-6.1p1/moduli.0.man-moduli	2012-11-06 09:42:13.677062887 +0100
++++ openssh-6.1p1/moduli.0	2012-11-06 09:42:58.693543381 +0100
+@@ -25,7 +25,7 @@ DESCRIPTION
+ 
+                         0     Unknown, not tested.
+                         2     "Safe" prime; (p-1)/2 is also prime.
+-                        4     Sophie Germain; (p+1)*2 is also prime.
++                        4     Sophie Germain; (p*2)+1 is also prime.
+ 
+                         Moduli candidates initially produced by ssh-keygen(1)
+                         are Sophie Germain primes (type 4).  Further primality
+diff -up openssh-6.1p1/moduli.5.man-moduli openssh-6.1p1/moduli.5
+--- openssh-6.1p1/moduli.5.man-moduli	2012-11-06 09:42:17.730035388 +0100
++++ openssh-6.1p1/moduli.5	2012-11-06 09:43:31.403180375 +0100
+@@ -61,7 +61,7 @@ Unknown, not tested.
+ .It 2
+ "Safe" prime; (p-1)/2 is also prime.
+ .It 4
+-Sophie Germain; (p+1)*2 is also prime.
++Sophie Germain; (p*2)+1 is also prime.
+ .El
+ .Pp
+ Moduli candidates initially produced by
diff --git a/openssh.spec b/openssh.spec
index 901eafc..be9fa5f 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -207,6 +207,9 @@ Patch801: openssh-5.8p2-force_krb.patch
 Patch900: openssh-6.1p1-gssapi-canohost.patch
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1780
 Patch901: openssh-6.1p1-kuserok.patch
+#https://bugzilla.redhat.com/show_bug.cgi?id=841065
+Patch902: openssh-6.1p1-man-moduli.patch
+
 #---
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1604
 # sctp
@@ -449,6 +452,7 @@ popd
 
 %patch900 -p1 -b .canohost
 %patch901 -p1 -b .kuserok
+%patch902 -p1 -b .man-moduli
 
 %if 0
 # Nothing here yet