summaryrefslogtreecommitdiff
path: root/crypto/conf/conf_sap.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/conf/conf_sap.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/conf/conf_sap.c')
-rw-r--r--crypto/conf/conf_sap.c70
1 files changed, 35 insertions, 35 deletions
diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c
index e00766e12c..a3e78961e3 100644
--- a/crypto/conf/conf_sap.c
+++ b/crypto/conf/conf_sap.c
@@ -1,6 +1,7 @@
/* conf_sap.c */
-/* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
- * project 2001.
+/*
+ * Written by Stephen Henson (steve@openssl.org) for the OpenSSL project
+ * 2001.
*/
/* ====================================================================
* Copyright (c) 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
@@ -64,49 +65,48 @@
#include <openssl/x509.h>
#include <openssl/asn1.h>
#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
+# include <openssl/engine.h>
#endif
-/* This is the automatic configuration loader: it is called automatically by
- * OpenSSL when any of a number of standard initialisation functions are called,
- * unless this is overridden by calling OPENSSL_no_config()
+/*
+ * This is the automatic configuration loader: it is called automatically by
+ * OpenSSL when any of a number of standard initialisation functions are
+ * called, unless this is overridden by calling OPENSSL_no_config()
*/
static int openssl_configured = 0;
void OPENSSL_config(const char *config_name)
- {
- if (openssl_configured)
- return;
+{
+ if (openssl_configured)
+ return;
- OPENSSL_load_builtin_modules();
+ OPENSSL_load_builtin_modules();
#ifndef OPENSSL_NO_ENGINE
- /* Need to load ENGINEs */
- ENGINE_load_builtin_engines();
+ /* Need to load ENGINEs */
+ ENGINE_load_builtin_engines();
#endif
- /* Add others here? */
+ /* Add others here? */
+ ERR_clear_error();
+ if (CONF_modules_load_file(NULL, config_name,
+ CONF_MFLAGS_DEFAULT_SECTION |
+ CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) {
+ BIO *bio_err;
+ ERR_load_crypto_strings();
+ if ((bio_err = BIO_new_fp(stderr, BIO_NOCLOSE)) != NULL) {
+ BIO_printf(bio_err, "Auto configuration failed\n");
+ ERR_print_errors(bio_err);
+ BIO_free(bio_err);
+ }
+ fprintf(stderr, "OpenSSL could not auto-configure.\n");
+ exit(1);
+ }
- ERR_clear_error();
- if (CONF_modules_load_file(NULL, config_name,
- CONF_MFLAGS_DEFAULT_SECTION|CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0)
- {
- BIO *bio_err;
- ERR_load_crypto_strings();
- if ((bio_err=BIO_new_fp(stderr, BIO_NOCLOSE)) != NULL)
- {
- BIO_printf(bio_err,"Auto configuration failed\n");
- ERR_print_errors(bio_err);
- BIO_free(bio_err);
- }
- fprintf(stderr, "OpenSSL could not auto-configure.\n");
- exit(1);
- }
-
- return;
- }
+ return;
+}
void OPENSSL_no_config()
- {
- openssl_configured = 1;
- }
+{
+ openssl_configured = 1;
+}