Use "==0" instead of "!strcmp" etc

[openssl.git] / crypto / engine / eng_all.c

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index e4d48dae85445bf1f9e05982451f82dd828f33f0..b7d2529596dd4bd69b2b5c8d47e0c4ad6babeefa 100644 (file)
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -1,6 +1,7 @@
 /* crypto/engine/eng_all.c -*- mode: C; c-file-style: "eay" -*- */
-/* Written by Richard Levitte <richard@levitte.org> for the OpenSSL
- * project 2000.
+/*
+ * Written by Richard Levitte <richard@levitte.org> for the OpenSSL project
+ * 2000.
  */
 /* ====================================================================
  * Copyright (c) 2000-2001 The OpenSSL Project.  All rights reserved.
@@ -10,7 +11,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -56,58 +57,74 @@
  *
  */
 
-#include <openssl/err.h>
-#include <openssl/engine.h>
+#include "cryptlib.h"
 #include "eng_int.h"
 
 void ENGINE_load_builtin_engines(void)
-       {
-       /* 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). */
-#if 0
-       ENGINE_load_openssl();
+{
+    /* Some ENGINEs need this */
+    OPENSSL_cpuid_setup();
+#if !defined(OPENSSL_NO_HW) && (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))
+    ENGINE_load_cryptodev();
 #endif
-       ENGINE_load_dynamic();
-#ifndef OPENSSL_NO_HW
-#ifndef OPENSSL_NO_HW_CSWIFT
-       ENGINE_load_cswift();
+#ifndef OPENSSL_NO_RDRAND
+    ENGINE_load_rdrand();
 #endif
-#ifndef OPENSSL_NO_HW_NCIPHER
-       ENGINE_load_chil();
+    ENGINE_load_dynamic();
+#ifndef OPENSSL_NO_STATIC_ENGINE
+# ifndef OPENSSL_NO_HW
+#  ifndef OPENSSL_NO_HW_4758_CCA
+    ENGINE_load_4758cca();
+#  endif
+/*-
+ * These engines have been disabled as they do not currently build
+#ifndef OPENSSL_NO_HW_AEP
+        ENGINE_load_aep();
 #endif
 #ifndef OPENSSL_NO_HW_ATALLA
-       ENGINE_load_atalla();
+        ENGINE_load_atalla();
 #endif
-#ifndef OPENSSL_NO_HW_NURON
-       ENGINE_load_nuron();
+#ifndef OPENSSL_NO_HW_CSWIFT
+        ENGINE_load_cswift();
 #endif
-#ifndef OPENSSL_NO_HW_UBSEC
-       ENGINE_load_ubsec();
+#ifndef OPENSSL_NO_HW_NCIPHER
+        ENGINE_load_chil();
 #endif
-#ifndef OPENSSL_NO_HW_AEP
-       ENGINE_load_aep();
+#ifndef OPENSSL_NO_HW_NURON
+        ENGINE_load_nuron();
 #endif
 #ifndef OPENSSL_NO_HW_SUREWARE
-       ENGINE_load_sureware();
+        ENGINE_load_sureware();
 #endif
-#ifndef OPENSSL_NO_HW_4758_CCA
-       ENGINE_load_4758cca();
-#endif
-#ifdef __OpenBSD__
-       ENGINE_load_cryptodev();
+#ifndef OPENSSL_NO_HW_UBSEC
+        ENGINE_load_ubsec();
 #endif
+*/
+#  ifndef OPENSSL_NO_HW_PADLOCK
+    ENGINE_load_padlock();
+#  endif
+# endif
+# ifndef OPENSSL_NO_GOST
+    ENGINE_load_gost();
+# endif
+# ifndef OPENSSL_NO_GMP
+    ENGINE_load_gmp();
+# endif
+# if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
+    ENGINE_load_capi();
+# endif
 #endif
-       }
+    ENGINE_register_all_complete();
+}
 
-#ifdef __OpenBSD__
-void ENGINE_setup_openbsd(void) {
-       static int openbsd_default_loaded = 0;
-       if (!openbsd_default_loaded) {
-               ENGINE_load_cryptodev();
-               ENGINE_register_all_complete();
-       }
-       openbsd_default_loaded=1;
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
+void ENGINE_setup_bsd_cryptodev(void)
+{
+    static int bsd_cryptodev_default_loaded = 0;
+    if (!bsd_cryptodev_default_loaded) {
+        ENGINE_load_cryptodev();
+        ENGINE_register_all_complete();
+    }
+    bsd_cryptodev_default_loaded = 1;
 }
 #endif