diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-02-03 11:20:56 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-02-03 11:20:56 -0500 |
| commit | dfb56425b68314b2b57e17c82c1df42e7a015132 (patch) | |
| tree | 0f727a8bfd00e1ca5bccc77cc0f25ef27f911f0f /crypto/dh | |
| parent | 156a872233b56558c72561789b8f33ff71a88fa7 (diff) | |
Dead code: crypto/dh,modes,pkcs12,ripemd,rsa,srp
And an uncompiled C++ test file.
Also remove srp_lcl.h, with help from Richard.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/dh')
| -rw-r--r-- | crypto/dh/dh_check.c | 10 | ||||
| -rw-r--r-- | crypto/dh/dh_gen.c | 12 |
2 files changed, 2 insertions, 20 deletions
diff --git a/crypto/dh/dh_check.c b/crypto/dh/dh_check.c index 347467c6a4..7a8e063fc8 100644 --- a/crypto/dh/dh_check.c +++ b/crypto/dh/dh_check.c @@ -116,15 +116,7 @@ int DH_check(const DH *dh, int *ret) l = BN_mod_word(dh->p, 24); if (l != 11) *ret |= DH_NOT_SUITABLE_GENERATOR; - } -#if 0 - else if (BN_is_word(dh->g, DH_GENERATOR_3)) { - l = BN_mod_word(dh->p, 12); - if (l != 5) - *ret |= DH_NOT_SUITABLE_GENERATOR; - } -#endif - else if (BN_is_word(dh->g, DH_GENERATOR_5)) { + } else if (BN_is_word(dh->g, DH_GENERATOR_5)) { l = BN_mod_word(dh->p, 10); if ((l != 3) && (l != 7)) *ret |= DH_NOT_SUITABLE_GENERATOR; diff --git a/crypto/dh/dh_gen.c b/crypto/dh/dh_gen.c index 9b9db6458b..99ccae33bf 100644 --- a/crypto/dh/dh_gen.c +++ b/crypto/dh/dh_gen.c @@ -136,17 +136,7 @@ static int dh_builtin_genparams(DH *ret, int prime_len, int generator, if (!BN_set_word(t2, 11)) goto err; g = 2; - } -#if 0 /* does not work for safe primes */ - else if (generator == DH_GENERATOR_3) { - if (!BN_set_word(t1, 12)) - goto err; - if (!BN_set_word(t2, 5)) - goto err; - g = 3; - } -#endif - else if (generator == DH_GENERATOR_5) { + } else if (generator == DH_GENERATOR_5) { if (!BN_set_word(t1, 10)) goto err; if (!BN_set_word(t2, 3)) |