2 files changed, 2 insertions, 16 deletions

diff --git a/src/lib/libcrypto/dh/dh_check.c b/src/lib/libcrypto/dh/dh_check.c
index 0f6c50b055..93e1003bd6 100644
--- a/src/lib/libcrypto/dh/dh_check.c
+++ b/src/lib/libcrypto/dh/dh_check.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_check.c,v 1.14 2014/07/12 16:03:37 miod Exp $ */
+/* $OpenBSD: dh_check.c,v 1.15 2015/02/07 13:19:15 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -91,12 +91,6 @@ 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)) {
                 l = BN_mod_word(dh->p, 10);
                 if (l != 3 && l != 7)
diff --git a/src/lib/libcrypto/dh/dh_gen.c b/src/lib/libcrypto/dh/dh_gen.c
index 6a884eff9e..1bc37b987e 100644
--- a/src/lib/libcrypto/dh/dh_gen.c
+++ b/src/lib/libcrypto/dh/dh_gen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_gen.c,v 1.13 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: dh_gen.c,v 1.14 2015/02/07 13:19:15 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -136,14 +136,6 @@ dh_builtin_genparams(DH *ret, int prime_len, int generator, BN_GENCB *cb)
                 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) {
                 if (!BN_set_word(t1, 10))
                         goto err;