The use of "exp" as a variable name in a prototype causes a conflict with FC2

[oweals/openssl.git] / crypto / crypto.h

diff --git a/crypto/crypto.h b/crypto/crypto.h
index 273bc5e3f87df60d82e4dc75feed4c109d2ce3e0..b779a14d12f10feece4af82f2e00f282d3be9747 100644 (file)
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -128,7 +128,9 @@ extern "C" {
 #define CRYPTO_LOCK_ENGINE             30
 #define CRYPTO_LOCK_UI                 31
 #define CRYPTO_LOCK_HWCRHK             32 /* This is a HACK which will disappear in 0.9.8 */
-#define CRYPTO_NUM_LOCKS               33
+#define CRYPTO_LOCK_FIPS               33
+#define CRYPTO_LOCK_FIPS2              34
+#define CRYPTO_NUM_LOCKS               35
 
 #define CRYPTO_LOCK            1
 #define CRYPTO_UNLOCK          2
@@ -434,6 +436,11 @@ void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb);
 void OpenSSLDie(const char *file,int line,const char *assertion);
 #define OPENSSL_assert(e)      ((e) ? (void)0 : OpenSSLDie(__FILE__, __LINE__, #e))
 
+#ifdef OPENSSL_FIPS
+int FIPS_mode(void);
+void *FIPS_rand_check(void);
+#endif /* def OPENSSL_FIPS */
+
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.