diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2019-01-23 09:49:00 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2019-01-24 12:30:30 +1100 |
commit | be3e6cba95dffe5fcf190c713525b48c837e7875 (patch) | |
tree | 853716cfc355fa938a020310da115c3a4d174dd9 /moduli.c | |
parent | 8976f1c4b2721c26e878151f52bdf346dfe2d54c (diff) |
upstream: 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@
OpenBSD-Commit-ID: 1467652e6802ad3333b0959282d8d49dfe22c8cd
Diffstat (limited to 'moduli.c')
-rw-r--r-- | moduli.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: moduli.c,v 1.33 2019/01/20 02:01:59 tb Exp $ */ | 1 | /* $OpenBSD: moduli.c,v 1.34 2019/01/23 09:49:00 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 1994 Phil Karn <karn@qualcomm.com> | 3 | * Copyright 1994 Phil Karn <karn@qualcomm.com> |
4 | * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> | 4 | * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> |
@@ -716,8 +716,6 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, u_int32_t generator_wanted, | |||
716 | if (generator_known == 0) { | 716 | if (generator_known == 0) { |
717 | if (BN_mod_word(p, 24) == 11) | 717 | if (BN_mod_word(p, 24) == 11) |
718 | generator_known = 2; | 718 | generator_known = 2; |
719 | else if (BN_mod_word(p, 12) == 5) | ||
720 | generator_known = 3; | ||
721 | else { | 719 | else { |
722 | u_int32_t r = BN_mod_word(p, 10); | 720 | u_int32_t r = BN_mod_word(p, 10); |
723 | 721 | ||