Add an Ed25519 signature maleability test

[openssl.git] / crypto / o_init.c

diff --git a/crypto/o_init.c b/crypto/o_init.c
index 2e0c126095f6c208f19531e83d03d24ef34ec4f9..ed6b1303d8adf5bb072501d6b9f198ab43b2fdc5 100644 (file)
--- a/crypto/o_init.c
+++ b/crypto/o_init.c
@@ -7,28 +7,15 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <e_os.h>
+#include "e_os.h"
 #include <openssl/err.h>
-#ifdef OPENSSL_FIPS
-# 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 does
+ * nothing.
  */
 
 void OPENSSL_init(void)
 {
-    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();
-#endif
+    return;
 }