4 files changed, 9 insertions, 45 deletions

diff --git a/src/lib/libcrypto/engine/eng_all.c b/src/lib/libcrypto/engine/eng_all.c
index 21b76266c7..014bcb132e 100644
--- a/src/lib/libcrypto/engine/eng_all.c
+++ b/src/lib/libcrypto/engine/eng_all.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_all.c,v 1.26 2014/07/10 22:45:57 jsing Exp $ */
+/* $OpenBSD: eng_all.c,v 1.27 2015/02/07 13:19:15 doug Exp $ */
 /* Written by Richard Levitte <richard@levitte.org> for the OpenSSL
  * project 2000.
  */
@@ -66,13 +66,6 @@ ENGINE_load_builtin_engines(void)
 {
         /* Some ENGINEs need this */
         OPENSSL_cpuid_setup();
-#if 0
-        /* There's no longer any need for an "openssl" ENGINE unless, one day,
-         * it is the *only* way for standard builtin implementations to be be
-         * accessed (ie. it would be possible to statically link binaries with
-         * *no* builtin implementations). */
-        ENGINE_load_openssl();
-#endif
 
 #ifndef OPENSSL_NO_RSAX
         ENGINE_load_rsax();
diff --git a/src/lib/libcrypto/engine/eng_list.c b/src/lib/libcrypto/engine/eng_list.c
index b84504102f..78e978116a 100644
--- a/src/lib/libcrypto/engine/eng_list.c
+++ b/src/lib/libcrypto/engine/eng_list.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_list.c,v 1.15 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: eng_list.c,v 1.16 2015/02/07 13:19:15 doug Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
@@ -378,14 +378,7 @@ ENGINE_by_id(const char *id)
                 }
         }
         CRYPTO_w_unlock(CRYPTO_LOCK_ENGINE);
-#if 0
-        if (iterator == NULL) {
-                ENGINEerr(ENGINE_F_ENGINE_BY_ID,
-                    ENGINE_R_NO_SUCH_ENGINE);
-                ERR_asprintf_error_data("id=%s", id);
-        }
-        return iterator;
-#else
+
         /* EEK! Experimental code starts */
         if (iterator)
                 return iterator;
@@ -415,7 +408,6 @@ notfound:
         ERR_asprintf_error_data("id=%s", id);
         return NULL;
         /* EEK! Experimental code ends */
-#endif
 }
 
 int
diff --git a/src/lib/libcrypto/engine/eng_padlock.c b/src/lib/libcrypto/engine/eng_padlock.c
index 48040db82d..1c86a343df 100644
--- a/src/lib/libcrypto/engine/eng_padlock.c
+++ b/src/lib/libcrypto/engine/eng_padlock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_padlock.c,v 1.13 2014/10/18 17:20:40 jsing Exp $ */
+/* $OpenBSD: eng_padlock.c,v 1.14 2015/02/07 13:19:15 doug Exp $ */
 /*
  * Support for VIA PadLock Advanced Cryptography Engine (ACE)
  * Written by Michal Ludvig <michal@logix.cz>
@@ -168,9 +168,11 @@ padlock_bind_helper(ENGINE *e)
         /* Check available features */
         padlock_available();
 
-#if 1   /* disable RNG for now, see commentary in vicinity of RNG code */
+        /*
+         * RNG is currently disabled for reasons discussed in commentary just
+         * before padlock_rand_bytes function.
+         */
         padlock_use_rng = 0;
-#endif
 
         /* Generate a nice engine name with available features */
         (void) snprintf(padlock_name, sizeof(padlock_name),
diff --git a/src/lib/libcrypto/engine/tb_store.c b/src/lib/libcrypto/engine/tb_store.c
index 2f0cc004f3..e9ad11ab01 100644
--- a/src/lib/libcrypto/engine/tb_store.c
+++ b/src/lib/libcrypto/engine/tb_store.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tb_store.c,v 1.4 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: tb_store.c,v 1.5 2015/02/07 13:19:15 doug Exp $ */
 /* ====================================================================
  * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
  *
@@ -93,29 +93,6 @@ ENGINE_register_all_STORE(void)
                 ENGINE_register_STORE(e);
 }
 
-/* The following two functions are removed because they're useless. */
-#if 0
-int
-ENGINE_set_default_STORE(ENGINE *e)
-{
-        if (e->store_meth)
-                return engine_table_register(&store_table,
-                    engine_unregister_all_STORE, e, &dummy_nid, 1, 1);
-        return 1;
-}
-#endif
-
-#if 0
-/* Exposed API function to get a functional reference from the implementation
- * table (ie. try to get a functional reference from the tabled structural
- * references). */
-ENGINE *
-ENGINE_get_default_STORE(void)
-{
-        return engine_table_select(&store_table, dummy_nid);
-}
-#endif
-
 /* Obtains an STORE implementation from an ENGINE functional reference */
 const STORE_METHOD *
 ENGINE_get_STORE(const ENGINE *e)