diff options
author | Matt Caswell <matt@openssl.org> | 2015-01-22 04:40:55 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2015-01-22 10:20:09 +0100 |
commit | 0f113f3ee4d629ef9a4a30911b22b224772085e5 (patch) | |
tree | e014603da5aed1d0751f587a66d6e270b6bda3de /crypto/o_init.c | |
parent | More tweaks for comments due indent issues (diff) | |
download | openssl-0f113f3ee4d629ef9a4a30911b22b224772085e5.tar.xz openssl-0f113f3ee4d629ef9a4a30911b22b224772085e5.zip |
Run util/openssl-format-source -v -c .
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/o_init.c')
-rw-r--r-- | crypto/o_init.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/crypto/o_init.c b/crypto/o_init.c index db4cdc443b..2088388128 100644 --- a/crypto/o_init.c +++ b/crypto/o_init.c @@ -1,5 +1,6 @@ /* o_init.c */ -/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL +/* + * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ /* ==================================================================== @@ -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 @@ -55,28 +56,28 @@ #include <e_os.h> #include <openssl/err.h> #ifdef OPENSSL_FIPS -#include <openssl/fips.h> -#include <openssl/rand.h> +# include <openssl/fips.h> +# include <openssl/rand.h> #endif -/* Perform any essential OpenSSL initialization operations. - * Currently only sets FIPS callbacks +/* + * Perform any essential OpenSSL initialization operations. Currently only + * sets FIPS callbacks */ void OPENSSL_init(void) - { - static int done = 0; - if (done) - return; - done = 1; +{ + static int done = 0; + if (done) + return; + done = 1; #ifdef OPENSSL_FIPS - FIPS_set_locking_callbacks(CRYPTO_lock, CRYPTO_add_lock); - FIPS_set_error_callbacks(ERR_put_error, ERR_add_error_vdata); - FIPS_set_malloc_callbacks(CRYPTO_malloc, CRYPTO_free); - RAND_init_fips(); + FIPS_set_locking_callbacks(CRYPTO_lock, CRYPTO_add_lock); + FIPS_set_error_callbacks(ERR_put_error, ERR_add_error_vdata); + FIPS_set_malloc_callbacks(CRYPTO_malloc, CRYPTO_free); + RAND_init_fips(); #endif #if 0 - fprintf(stderr, "Called OPENSSL_init\n"); + fprintf(stderr, "Called OPENSSL_init\n"); #endif - } - +} |