summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crypto/bn/bn_mont.c2
-rw-r--r--crypto/crypto.h4
-rw-r--r--crypto/dsa/dsa_gen.c2
-rw-r--r--crypto/evp/evp.h2
-rw-r--r--crypto/hmac/hmac.c2
-rw-r--r--crypto/lock.c9
-rw-r--r--crypto/rand/md_rand.c2
-rw-r--r--crypto/rsa/rsa_eay.c2
-rw-r--r--crypto/rsa/rsa_oaep.c2
-rw-r--r--crypto/rsa/rsa_pss.c2
-rw-r--r--fips/aes/fips_aes_selftest.c2
-rw-r--r--fips/aes/fips_aesavs.c2
-rw-r--r--fips/des/fips_des_selftest.c2
-rw-r--r--fips/des/fips_desmovs.c2
-rw-r--r--fips/dsa/fips_dsa_selftest.c2
-rw-r--r--fips/dsa/fips_dsa_sign.c2
-rw-r--r--fips/dsa/fips_dssvs.c2
-rw-r--r--fips/fips.c2
-rw-r--r--fips/fips.h4
-rw-r--r--fips/fips_test_suite.c2
-rw-r--r--fips/rand/fips_rand.c2
-rw-r--r--fips/rsa/fips_rsa_sign.c2
-rw-r--r--fips/rsa/fips_rsagtest.c2
-rw-r--r--fips/rsa/fips_rsastest.c2
-rw-r--r--fips/rsa/fips_rsavtest.c2
-rw-r--r--fips/sha/fips_sha1_selftest.c2
-rw-r--r--fips/sha/fips_shatest.c2
-rw-r--r--fips/utl/fips_lck.c2
28 files changed, 38 insertions, 29 deletions
diff --git a/crypto/bn/bn_mont.c b/crypto/bn/bn_mont.c
index b00a8cf340..2f7fb843a9 100644
--- a/crypto/bn/bn_mont.c
+++ b/crypto/bn/bn_mont.c
@@ -116,7 +116,7 @@
* sections 3.8 and 4.2 in http://security.ece.orst.edu/koc/papers/r01rsasw.pdf
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <stdio.h>
#include "cryptlib.h"
diff --git a/crypto/crypto.h b/crypto/crypto.h
index 84d3520ec2..5089c65882 100644
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -249,10 +249,6 @@ typedef struct openssl_item_st
#define CRYPTO_add(a,b,c) ((*(a))+=(b))
#endif
-#if defined(OPENSSL_FIPSCANISTER) && defined(OPENSSL_FIPSEVP)
-#define CRYPTO_lock FIPS_lock
-#endif
-
/* Some applications as well as some parts of OpenSSL need to allocate
and deallocate locks in a dynamic fashion. The following typedef
makes this possible in a type-safe manner. */
diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index 8096a15eb2..d5a41c249a 100644
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -73,7 +73,7 @@
#ifndef OPENSSL_NO_SHA
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <stdio.h>
#include "cryptlib.h"
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 0db6f15ac9..086da7c794 100644
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -551,7 +551,7 @@ int FIPS_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
#endif
-#if defined(OPENSSL_FIPSCANISTER) && defined(OPENSSL_FIPSEVP)
+#if defined(OPENSSL_FIPSCANISTER) && defined(OPENSSL_FIPSAPI)
#define EVP_MD_CTX_init FIPS_md_ctx_init
#define EVP_MD_CTX_cleanup FIPS_md_ctx_cleanup
diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
index 88941bdb45..dc28d8da87 100644
--- a/crypto/hmac/hmac.c
+++ b/crypto/hmac/hmac.c
@@ -56,7 +56,7 @@
* [including the GNU Public Licence.]
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <stdio.h>
#include <stdlib.h>
diff --git a/crypto/lock.c b/crypto/lock.c
index 49db044fc1..bbce52addb 100644
--- a/crypto/lock.c
+++ b/crypto/lock.c
@@ -116,6 +116,9 @@
#include "cryptlib.h"
#include <openssl/safestack.h>
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)
static double SSLeay_MSVC5_hack=0.0; /* and for VC1.5 */
@@ -380,6 +383,9 @@ void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value *(*func)
void CRYPTO_set_dynlock_lock_callback(void (*func)(int mode,
struct CRYPTO_dynlock_value *l, const char *file, int line))
{
+#ifdef OPENSSL_FIPS
+ FIPS_set_locking_callback(CRYPTO_lock);
+#endif
dynlock_lock_callback=func;
}
@@ -405,6 +411,9 @@ int (*CRYPTO_get_add_lock_callback(void))(int *num,int mount,int type,
void CRYPTO_set_locking_callback(void (*func)(int mode,int type,
const char *file,int line))
{
+#ifdef OPENSSL_FIPS
+ FIPS_set_locking_callback(CRYPTO_lock);
+#endif
locking_callback=func;
}
diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index a06fd209d9..87d4bfb75d 100644
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -109,7 +109,7 @@
*
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#ifdef MD_RAND_DEBUG
# ifndef NDEBUG
diff --git a/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c
index 1f18854f06..b088d0dbf5 100644
--- a/crypto/rsa/rsa_eay.c
+++ b/crypto/rsa/rsa_eay.c
@@ -109,7 +109,7 @@
*
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <stdio.h>
#include "cryptlib.h"
diff --git a/crypto/rsa/rsa_oaep.c b/crypto/rsa/rsa_oaep.c
index bf8dd044b1..eaae712236 100644
--- a/crypto/rsa/rsa_oaep.c
+++ b/crypto/rsa/rsa_oaep.c
@@ -18,7 +18,7 @@
* an equivalent notion.
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
diff --git a/crypto/rsa/rsa_pss.c b/crypto/rsa/rsa_pss.c
index 794de9dff6..e8f6798bbd 100644
--- a/crypto/rsa/rsa_pss.c
+++ b/crypto/rsa/rsa_pss.c
@@ -56,7 +56,7 @@
*
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <stdio.h>
#include "cryptlib.h"
diff --git a/fips/aes/fips_aes_selftest.c b/fips/aes/fips_aes_selftest.c
index 8b6dd97566..8c5a0eeacd 100644
--- a/fips/aes/fips_aes_selftest.c
+++ b/fips/aes/fips_aes_selftest.c
@@ -47,7 +47,7 @@
*
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <string.h>
#include <openssl/err.h>
diff --git a/fips/aes/fips_aesavs.c b/fips/aes/fips_aesavs.c
index d7b18ee973..1f302a59fc 100644
--- a/fips/aes/fips_aesavs.c
+++ b/fips/aes/fips_aesavs.c
@@ -57,7 +57,7 @@
U.S.A.
----------------------------------------------*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <stdio.h>
#include <stdlib.h>
diff --git a/fips/des/fips_des_selftest.c b/fips/des/fips_des_selftest.c
index cad3270cc8..d93d3b5558 100644
--- a/fips/des/fips_des_selftest.c
+++ b/fips/des/fips_des_selftest.c
@@ -47,7 +47,7 @@
*
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <string.h>
#include <openssl/err.h>
diff --git a/fips/des/fips_desmovs.c b/fips/des/fips_desmovs.c
index baa0b0488b..6766d1c915 100644
--- a/fips/des/fips_desmovs.c
+++ b/fips/des/fips_desmovs.c
@@ -58,7 +58,7 @@
U.S.A.
----------------------------------------------*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <stdio.h>
#include <stdlib.h>
diff --git a/fips/dsa/fips_dsa_selftest.c b/fips/dsa/fips_dsa_selftest.c
index db000a8484..9524e634a3 100644
--- a/fips/dsa/fips_dsa_selftest.c
+++ b/fips/dsa/fips_dsa_selftest.c
@@ -56,7 +56,7 @@
* [including the GNU Public Licence.]
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <string.h>
#include <openssl/crypto.h>
diff --git a/fips/dsa/fips_dsa_sign.c b/fips/dsa/fips_dsa_sign.c
index c111ce0f25..7223589af3 100644
--- a/fips/dsa/fips_dsa_sign.c
+++ b/fips/dsa/fips_dsa_sign.c
@@ -56,7 +56,7 @@
*
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <string.h>
#include <openssl/evp.h>
diff --git a/fips/dsa/fips_dssvs.c b/fips/dsa/fips_dssvs.c
index 9c9e37b452..513df722cb 100644
--- a/fips/dsa/fips_dssvs.c
+++ b/fips/dsa/fips_dssvs.c
@@ -10,7 +10,7 @@ int main(int argc, char **argv)
}
#else
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <openssl/bn.h>
#include <openssl/dsa.h>
diff --git a/fips/fips.c b/fips/fips.c
index b6de3f7fdf..83b72e577f 100644
--- a/fips/fips.c
+++ b/fips/fips.c
@@ -47,7 +47,7 @@
*
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <openssl/rand.h>
#include <openssl/fips_rand.h>
diff --git a/fips/fips.h b/fips/fips.h
index 061ed9394b..96d8ff64bb 100644
--- a/fips/fips.h
+++ b/fips/fips.h
@@ -122,6 +122,10 @@ int FIPS_evp_md_ctx_cleanup(EVP_MD_CTX *ctx);
void FIPS_set_locking_callback (void (*func)(int mode, int type,
const char *file,int line));
+#if defined(OPENSSL_FIPSCANISTER) && defined(OPENSSL_FIPSAPI)
+#define CRYPTO_lock FIPS_lock
+#endif
+
/* 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.
diff --git a/fips/fips_test_suite.c b/fips/fips_test_suite.c
index 0d6bc807fd..6944dbca4a 100644
--- a/fips/fips_test_suite.c
+++ b/fips/fips_test_suite.c
@@ -12,7 +12,7 @@
*
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <stdio.h>
#include <assert.h>
diff --git a/fips/rand/fips_rand.c b/fips/rand/fips_rand.c
index b0505782d3..f573b26b61 100644
--- a/fips/rand/fips_rand.c
+++ b/fips/rand/fips_rand.c
@@ -47,7 +47,7 @@
*
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
/*
* This is a FIPS approved AES PRNG based on ANSI X9.31 A.2.4.
diff --git a/fips/rsa/fips_rsa_sign.c b/fips/rsa/fips_rsa_sign.c
index a7f73f5121..d07111b4be 100644
--- a/fips/rsa/fips_rsa_sign.c
+++ b/fips/rsa/fips_rsa_sign.c
@@ -56,7 +56,7 @@
*
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <string.h>
#include <openssl/evp.h>
diff --git a/fips/rsa/fips_rsagtest.c b/fips/rsa/fips_rsagtest.c
index 1b79ffa70f..95960ef007 100644
--- a/fips/rsa/fips_rsagtest.c
+++ b/fips/rsa/fips_rsagtest.c
@@ -56,7 +56,7 @@
*
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <stdio.h>
#include <ctype.h>
diff --git a/fips/rsa/fips_rsastest.c b/fips/rsa/fips_rsastest.c
index 2a125ae02d..9dff464a36 100644
--- a/fips/rsa/fips_rsastest.c
+++ b/fips/rsa/fips_rsastest.c
@@ -56,7 +56,7 @@
*
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <stdio.h>
#include <ctype.h>
diff --git a/fips/rsa/fips_rsavtest.c b/fips/rsa/fips_rsavtest.c
index 0421807623..0971f15fc0 100644
--- a/fips/rsa/fips_rsavtest.c
+++ b/fips/rsa/fips_rsavtest.c
@@ -56,7 +56,7 @@
*
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <stdio.h>
#include <ctype.h>
diff --git a/fips/sha/fips_sha1_selftest.c b/fips/sha/fips_sha1_selftest.c
index 2c6a5917d5..4291617596 100644
--- a/fips/sha/fips_sha1_selftest.c
+++ b/fips/sha/fips_sha1_selftest.c
@@ -47,7 +47,7 @@
*
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <string.h>
#include <openssl/err.h>
diff --git a/fips/sha/fips_shatest.c b/fips/sha/fips_shatest.c
index 97b68b82b1..480b990fb8 100644
--- a/fips/sha/fips_shatest.c
+++ b/fips/sha/fips_shatest.c
@@ -56,7 +56,7 @@
*
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <stdio.h>
#include <ctype.h>
diff --git a/fips/utl/fips_lck.c b/fips/utl/fips_lck.c
index 47168af233..63b4c0da73 100644
--- a/fips/utl/fips_lck.c
+++ b/fips/utl/fips_lck.c
@@ -51,7 +51,7 @@
* ====================================================================
*/
-#define OPENSSL_FIPSEVP
+#define OPENSSL_FIPSAPI
#include <openssl/evp.h>
#include <openssl/fips.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 06:51:08 +0000