summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2019-01-23 09:49:00 +0000
committerdtucker <dtucker@openbsd.org>2019-01-23 09:49:00 +0000
commit067900adede5cb8a3c9a7e2a5fe420eb8f6ffc25 (patch)
tree17fced68b18aa0a6eff7c8e4689695746e1fc0dd
parentteach ldpd to ask if a potential pseudowire interface can do pwe3 (diff)
downloadwireguard-openbsd-067900adede5cb8a3c9a7e2a5fe420eb8f6ffc25.tar.xz
wireguard-openbsd-067900adede5cb8a3c9a7e2a5fe420eb8f6ffc25.zip
Remove 3 as a guess for possible generator during moduli generation.
It's not mentioned in RFC4419 and it's not possible for Sophie-Germain primes greater than 5. bz#2330, from Christian Wittenhorst , ok djm@ tb@
-rw-r--r--usr.bin/ssh/moduli.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.bin/ssh/moduli.c b/usr.bin/ssh/moduli.c
index 574f3e9ae32..278ef27d78c 100644
--- a/usr.bin/ssh/moduli.c
+++ b/usr.bin/ssh/moduli.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: moduli.c,v 1.33 2019/01/20 02:01:59 tb Exp $ */
+/* $OpenBSD: moduli.c,v 1.34 2019/01/23 09:49:00 dtucker Exp $ */
/*
* Copyright 1994 Phil Karn <karn@qualcomm.com>
* Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@@ -710,8 +710,6 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, u_int32_t generator_wanted,
if (generator_known == 0) {
if (BN_mod_word(p, 24) == 11)
generator_known = 2;
- else if (BN_mod_word(p, 12) == 5)
- generator_known = 3;
else {
u_int32_t r = BN_mod_word(p, 10);