summaryrefslogtreecommitdiff
path: root/src/lib/libssl/src/crypto/o_fips.c
diff options
context:
space:
mode:
authorjsing <>2014-04-15 13:42:55 +0000
committerjsing <>2014-04-15 13:42:55 +0000
commit179b5aba8054138fe6ae76eb86d0ba485fa99f67 (patch)
treef085d85cb06e6b6e1a1b1d52cced54d9f7d7e5f2 /src/lib/libssl/src/crypto/o_fips.c
parent91b7379546c278344ff2e20e9eb6ecec326f20cd (diff)
downloadopenbsd-179b5aba8054138fe6ae76eb86d0ba485fa99f67.tar.gz
openbsd-179b5aba8054138fe6ae76eb86d0ba485fa99f67.tar.bz2
openbsd-179b5aba8054138fe6ae76eb86d0ba485fa99f67.zip
First pass at applying KNF to the OpenSSL code, which almost makes it
readable. This pass is whitespace only and can readily be verified using tr and md5.
Diffstat (limited to 'src/lib/libssl/src/crypto/o_fips.c')
-rw-r--r--src/lib/libssl/src/crypto/o_fips.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/lib/libssl/src/crypto/o_fips.c b/src/lib/libssl/src/crypto/o_fips.c
index f6d1b21855..9c185cfb18 100644
--- a/src/lib/libssl/src/crypto/o_fips.c
+++ b/src/lib/libssl/src/crypto/o_fips.c
@@ -62,18 +62,20 @@
62#include <openssl/rand.h> 62#include <openssl/rand.h>
63#endif 63#endif
64 64
65int FIPS_mode(void) 65int
66 { 66FIPS_mode(void)
67{
67 OPENSSL_init(); 68 OPENSSL_init();
68#ifdef OPENSSL_FIPS 69#ifdef OPENSSL_FIPS
69 return FIPS_module_mode(); 70 return FIPS_module_mode();
70#else 71#else
71 return 0; 72 return 0;
72#endif 73#endif
73 } 74}
74 75
75int FIPS_mode_set(int r) 76int
76 { 77FIPS_mode_set(int r)
78{
77 OPENSSL_init(); 79 OPENSSL_init();
78#ifdef OPENSSL_FIPS 80#ifdef OPENSSL_FIPS
79#ifndef FIPS_AUTH_USER_PASS 81#ifndef FIPS_AUTH_USER_PASS
@@ -92,5 +94,4 @@ int FIPS_mode_set(int r)
92 CRYPTOerr(CRYPTO_F_FIPS_MODE_SET, CRYPTO_R_FIPS_MODE_NOT_SUPPORTED); 94 CRYPTOerr(CRYPTO_F_FIPS_MODE_SET, CRYPTO_R_FIPS_MODE_NOT_SUPPORTED);
93 return 0; 95 return 0;
94#endif 96#endif
95 } 97}
96