summaryrefslogtreecommitdiff
path: root/crypto/engine/eng_all.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-22 03:40:55 +0000
committerMatt Caswell <matt@openssl.org>2015-01-22 09:20:09 +0000
commit0f113f3ee4d629ef9a4a30911b22b224772085e5 (patch)
treee014603da5aed1d0751f587a66d6e270b6bda3de /crypto/engine/eng_all.c
parent22b52164aaed31d6e93dbd2d397ace041360e6aa (diff)
downloadopenssl-new-0f113f3ee4d629ef9a4a30911b22b224772085e5.tar.gz
Run util/openssl-format-source -v -c .
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/engine/eng_all.c')
-rw-r--r--crypto/engine/eng_all.c100
1 files changed, 52 insertions, 48 deletions
diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index fa6febfcfd..e81506c3a9 100644
--- 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
@@ -60,76 +61,79 @@
#include "eng_int.h"
void ENGINE_load_builtin_engines(void)
- {
- /* Some ENGINEs need this */
- OPENSSL_cpuid_setup();
+{
+ /* 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();
+ /*
+ * 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
#if !defined(OPENSSL_NO_HW) && (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))
- ENGINE_load_cryptodev();
+ ENGINE_load_cryptodev();
#endif
#ifndef OPENSSL_NO_RDRAND
- ENGINE_load_rdrand();
+ ENGINE_load_rdrand();
#endif
- ENGINE_load_dynamic();
+ ENGINE_load_dynamic();
#ifndef OPENSSL_NO_STATIC_ENGINE
-#ifndef OPENSSL_NO_HW
-#ifndef OPENSSL_NO_HW_4758_CCA
- ENGINE_load_4758cca();
-#endif
+# 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();
+ ENGINE_load_aep();
#endif
#ifndef OPENSSL_NO_HW_ATALLA
- ENGINE_load_atalla();
+ ENGINE_load_atalla();
#endif
#ifndef OPENSSL_NO_HW_CSWIFT
- ENGINE_load_cswift();
+ ENGINE_load_cswift();
#endif
#ifndef OPENSSL_NO_HW_NCIPHER
- ENGINE_load_chil();
+ ENGINE_load_chil();
#endif
#ifndef OPENSSL_NO_HW_NURON
- ENGINE_load_nuron();
+ ENGINE_load_nuron();
#endif
#ifndef OPENSSL_NO_HW_SUREWARE
- ENGINE_load_sureware();
+ ENGINE_load_sureware();
#endif
#ifndef OPENSSL_NO_HW_UBSEC
- ENGINE_load_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();
- }
+# 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();
+}
#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;
+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