commit fd49993c3b94aef54669e095f1e6c417efb202aa
author Adam Langley <agl@google.com> Tue Apr 04 14:21:43 2017 -0700
committer Adam Langley <agl@google.com> Fri Apr 07 00:05:34 2017 +0000
tree e1654103a8cb187ad9a2bb05bc5dbfc5fc54d846
parent 0ef8c7bd8fe1bf50ee18c672998625b7e54f6456

First part of the FIPS module.

Change-Id: Ic3a91ccd2c8cdc364740f256fdb8a7ff66177947
Reviewed-on: https://boringssl-review.googlesource.com/14506
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>

crypto/crypto.c

diff --git a/crypto/crypto.c b/crypto/crypto.c
index 174c74a..a52b808 100644
--- a/crypto/crypto.c
+++ b/crypto/crypto.c
@@ -93,6 +93,11 @@
 
 #endif
 
+#if defined(BORINGSSL_FIPS)
+/* In FIPS mode, the power-on self-test function calls |CRYPTO_library_init|
+ * because we have to ensure that CPUID detection occurs first. */
+#define BORINGSSL_NO_STATIC_INITIALIZER
+#endif
 
 #if defined(OPENSSL_WINDOWS) && !defined(BORINGSSL_NO_STATIC_INITIALIZER)
 #define OPENSSL_CDECL __cdecl
@@ -166,5 +171,3 @@
 }
 
 void OPENSSL_load_builtin_modules(void) {}
-
-int FIPS_mode(void) { return 0; }