diff options
author | tedu <> | 2014-04-15 20:06:10 +0000 |
---|---|---|
committer | tedu <> | 2014-04-15 20:06:10 +0000 |
commit | 3c7d2178681a2741a8cc8a042cb2ea6ee28528b8 (patch) | |
tree | 11be20c8110348001494179db4f9b0b67ce149ba /src/lib/libcrypto/o_init.c | |
parent | 4c8a9a73429ac4a1d79f4bab6a397df643934861 (diff) | |
download | openbsd-3c7d2178681a2741a8cc8a042cb2ea6ee28528b8.tar.gz openbsd-3c7d2178681a2741a8cc8a042cb2ea6ee28528b8.tar.bz2 openbsd-3c7d2178681a2741a8cc8a042cb2ea6ee28528b8.zip |
remove FIPS mode support. people who require FIPS can buy something that
meets their needs, but dumping it in here only penalizes the rest of us.
ok beck deraadt
Diffstat (limited to 'src/lib/libcrypto/o_init.c')
-rw-r--r-- | src/lib/libcrypto/o_init.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/lib/libcrypto/o_init.c b/src/lib/libcrypto/o_init.c index 07c8e0d694..5e905d9315 100644 --- a/src/lib/libcrypto/o_init.c +++ b/src/lib/libcrypto/o_init.c | |||
@@ -54,10 +54,6 @@ | |||
54 | 54 | ||
55 | #include <e_os.h> | 55 | #include <e_os.h> |
56 | #include <openssl/err.h> | 56 | #include <openssl/err.h> |
57 | #ifdef OPENSSL_FIPS | ||
58 | #include <openssl/fips.h> | ||
59 | #include <openssl/rand.h> | ||
60 | #endif | ||
61 | 57 | ||
62 | /* Perform any essential OpenSSL initialization operations. | 58 | /* Perform any essential OpenSSL initialization operations. |
63 | * Currently only sets FIPS callbacks | 59 | * Currently only sets FIPS callbacks |
@@ -70,12 +66,6 @@ OPENSSL_init(void) | |||
70 | if (done) | 66 | if (done) |
71 | return; | 67 | return; |
72 | done = 1; | 68 | done = 1; |
73 | #ifdef OPENSSL_FIPS | ||
74 | FIPS_set_locking_callbacks(CRYPTO_lock, CRYPTO_add_lock); | ||
75 | FIPS_set_error_callbacks(ERR_put_error, ERR_add_error_vdata); | ||
76 | FIPS_set_malloc_callbacks(CRYPTO_malloc, CRYPTO_free); | ||
77 | RAND_init_fips(); | ||
78 | #endif | ||
79 | #if 0 | 69 | #if 0 |
80 | fprintf(stderr, "Called OPENSSL_init\n"); | 70 | fprintf(stderr, "Called OPENSSL_init\n"); |
81 | #endif | 71 | #endif |