summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Lautrbach <plautrba@redhat.com>2012-11-06 08:59:17 (GMT)
committerPetr Lautrbach <plautrba@redhat.com>2012-11-06 09:19:35 (GMT)
commitee0729e302ee922ea743a1f88e6603b8a7426d80 (patch)
treefc51c16c9ae6cfcad2f2e6f777d1a00444e99f8c
parente9057845edd153b6a65b91d595ec5dfb025ec57c (diff)
downloadopenssh-ee0729e302ee922ea743a1f88e6603b8a7426d80.zip
openssh-ee0729e302ee922ea743a1f88e6603b8a7426d80.tar.gz
openssh-ee0729e302ee922ea743a1f88e6603b8a7426d80.tar.xz
fix the man moduli page (#841065)
-rw-r--r--openssh-5.8p2-man-moduli.patch24
-rw-r--r--openssh.spec4
2 files changed, 28 insertions, 0 deletions
diff --git a/openssh-5.8p2-man-moduli.patch b/openssh-5.8p2-man-moduli.patch
new file mode 100644
index 0000000..840e3dd
--- /dev/null
+++ b/openssh-5.8p2-man-moduli.patch
@@ -0,0 +1,24 @@
+diff -up openssh-5.8p2/moduli.0.man-moduli openssh-5.8p2/moduli.0
+--- openssh-5.8p2/moduli.0.man-moduli 2011-05-05 03:58:10.000000000 +0200
++++ openssh-5.8p2/moduli.0 2012-11-06 10:18:11.301710631 +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). Futher primality
+diff -up openssh-5.8p2/moduli.5.man-moduli openssh-5.8p2/moduli.5
+--- openssh-5.8p2/moduli.5.man-moduli 2008-06-26 07:59:32.000000000 +0200
++++ openssh-5.8p2/moduli.5 2012-11-06 10:16:40.320224142 +0100
+@@ -62,7 +62,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 cbd4fab..de90484 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -200,6 +200,9 @@ Patch69: openssh-5.8p2-askpass-ld.patch
Patch70: openssh-5.8p2-copy-id-restorecon.patch
# warn users for unsupported UsePAM=no
Patch71: openssh-5.8p2-log-usepam-no.patch
+#https://bugzilla.redhat.com/show_bug.cgi?id=841065
+Patch72: openssh-5.8p2-man-moduli.patch
+
#---
#https://bugzilla.mindrot.org/show_bug.cgi?id=1604
# sctp
@@ -440,6 +443,7 @@ popd
%patch69 -p1 -b .askpass-ld
%patch70 -p1 -b .restorecon
%patch71 -p1 -b .log-usepam-no
+%patch72 -p1 -b .man-moduli
autoreconf
pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}