remove OPENSSL_FIPSAPI

Reviewed-by: Tim Hudson <tjh@openssl.org>

51 files changed, 51 insertions, 51 deletions

diff --git a/crypto/bn/bn_add.c b/crypto/bn/bn_add.c
index caf3575915..659e1d22d7 100644
--- a/crypto/bn/bn_add.c
+++ b/crypto/bn/bn_add.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include "cryptlib.h"
 #include "bn_lcl.h"
diff --git a/crypto/bn/bn_blind.c b/crypto/bn/bn_blind.c
index c0fe57a829..a444d725be 100644
--- a/crypto/bn/bn_blind.c
+++ b/crypto/bn/bn_blind.c
@@ -109,7 +109,7 @@
  * [including the GNU Public Licence.]
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include "cryptlib.h"
 #include "bn_lcl.h"
diff --git a/crypto/bn/bn_ctx.c b/crypto/bn/bn_ctx.c
index 5288a20be9..9fe87519ee 100644
--- a/crypto/bn/bn_ctx.c
+++ b/crypto/bn/bn_ctx.c
@@ -60,7 +60,7 @@
 #endif
 #endif
 
-#define OPENSSL_FIPSAPI
+
 
 #include <assert.h>
 
diff --git a/crypto/bn/bn_div.c b/crypto/bn/bn_div.c
index 7adda12ad9..06d87d0aaf 100644
--- a/crypto/bn/bn_div.c
+++ b/crypto/bn/bn_div.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <openssl/bn.h>
 #include "cryptlib.h"
diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c
index 2d051b2c35..3a1941a998 100644
--- a/crypto/bn/bn_exp.c
+++ b/crypto/bn/bn_exp.c
@@ -109,7 +109,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include "cryptlib.h"
 #include "bn_lcl.h"
diff --git a/crypto/bn/bn_exp2.c b/crypto/bn/bn_exp2.c
index a00c115216..b95e3fb12e 100644
--- a/crypto/bn/bn_exp2.c
+++ b/crypto/bn/bn_exp2.c
@@ -109,7 +109,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <stdio.h>
 #include "cryptlib.h"
diff --git a/crypto/bn/bn_gcd.c b/crypto/bn/bn_gcd.c
index adef79e87f..63a77d2439 100644
--- a/crypto/bn/bn_gcd.c
+++ b/crypto/bn/bn_gcd.c
@@ -109,7 +109,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include "cryptlib.h"
 #include "bn_lcl.h"
diff --git a/crypto/bn/bn_gf2m.c b/crypto/bn/bn_gf2m.c
index 7b6b95c19c..a12ecd484e 100644
--- a/crypto/bn/bn_gf2m.c
+++ b/crypto/bn/bn_gf2m.c
@@ -88,7 +88,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <assert.h>
 #include <limits.h>
diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c
index cff4fc4f2f..0305a19e3d 100644
--- a/crypto/bn/bn_lib.c
+++ b/crypto/bn/bn_lib.c
@@ -61,7 +61,7 @@
 # define NDEBUG
 #endif
 
-#define OPENSSL_FIPSAPI
+
 
 #include <assert.h>
 #include <limits.h>
diff --git a/crypto/bn/bn_mod.c b/crypto/bn/bn_mod.c
index 49c74fbb83..5c8650b271 100644
--- a/crypto/bn/bn_mod.c
+++ b/crypto/bn/bn_mod.c
@@ -111,7 +111,7 @@
  * [including the GNU Public Licence.]
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include "cryptlib.h"
 #include "bn_lcl.h"
diff --git a/crypto/bn/bn_mont.c b/crypto/bn/bn_mont.c
index e41f849479..526b9cec5f 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_FIPSAPI
+
 
 #include "cryptlib.h"
 #include "bn_lcl.h"
diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index 7c0ec5153d..2ccd4777f9 100644
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c
@@ -109,7 +109,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <stdio.h>
 #include <time.h>
diff --git a/crypto/bn/bn_recp.c b/crypto/bn/bn_recp.c
index cec2863328..f99e1b4812 100644
--- a/crypto/bn/bn_recp.c
+++ b/crypto/bn/bn_recp.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include "cryptlib.h"
 #include "bn_lcl.h"
diff --git a/crypto/buffer/buf_str.c b/crypto/buffer/buf_str.c
index b4ff71ed5a..75c4ec2bd1 100644
--- a/crypto/buffer/buf_str.c
+++ b/crypto/buffer/buf_str.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <stdio.h>
 #include "cryptlib.h"
diff --git a/crypto/cmac/cmac.c b/crypto/cmac/cmac.c
index 5c84900a2f..394777faef 100644
--- a/crypto/cmac/cmac.c
+++ b/crypto/cmac/cmac.c
@@ -51,7 +51,7 @@
  * ====================================================================
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/crypto/dh/dh_gen.c b/crypto/dh/dh_gen.c
index c397c53bce..3da27923d1 100644
--- a/crypto/dh/dh_gen.c
+++ b/crypto/dh/dh_gen.c
@@ -61,7 +61,7 @@
  *  - Geoff
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <stdio.h>
 #include "cryptlib.h"
diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
index cfe365c6ea..584a33fd1e 100644
--- a/crypto/dh/dh_key.c
+++ b/crypto/dh/dh_key.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <stdio.h>
 #include "cryptlib.h"
diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index a3725d5914..861ff90e5d 100644
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -73,7 +73,7 @@
 
 #ifndef OPENSSL_NO_SHA
 
-#define OPENSSL_FIPSAPI
+
 
 #include <stdio.h>
 #include "cryptlib.h"
diff --git a/crypto/dsa/dsa_key.c b/crypto/dsa/dsa_key.c
index 96f74c18fe..dbf745a7f3 100644
--- a/crypto/dsa/dsa_key.c
+++ b/crypto/dsa/dsa_key.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <stdio.h>
 #include <time.h>
diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c
index bec13541b9..fb0030a66f 100644
--- a/crypto/dsa/dsa_ossl.c
+++ b/crypto/dsa/dsa_ossl.c
@@ -58,7 +58,7 @@
 
 /* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <stdio.h>
 #include "cryptlib.h"
diff --git a/crypto/dsa/dsa_sign.c b/crypto/dsa/dsa_sign.c
index 599093a4a8..8e01a147c0 100644
--- a/crypto/dsa/dsa_sign.c
+++ b/crypto/dsa/dsa_sign.c
@@ -58,7 +58,7 @@
 
 /* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
 
-#define OPENSSL_FIPSAPI
+
 
 #include "cryptlib.h"
 #include <openssl/dsa.h>
diff --git a/crypto/ec/ec2_mult.c b/crypto/ec/ec2_mult.c
index 06405d0716..ed46d58fdd 100644
--- a/crypto/ec/ec2_mult.c
+++ b/crypto/ec/ec2_mult.c
@@ -67,7 +67,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <openssl/err.h>
 
diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c
index 9a9476f0c1..6c81df0d44 100644
--- a/crypto/ec/ec2_smpl.c
+++ b/crypto/ec/ec2_smpl.c
@@ -67,7 +67,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <openssl/err.h>
 
diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c
index 3c26dced06..45060d6313 100644
--- a/crypto/ec/ec_curve.c
+++ b/crypto/ec/ec_curve.c
@@ -69,7 +69,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <string.h>
 #include "ec_lcl.h"
diff --git a/crypto/ec/ec_cvt.c b/crypto/ec/ec_cvt.c
index 58d6b4cadd..682425de38 100644
--- a/crypto/ec/ec_cvt.c
+++ b/crypto/ec/ec_cvt.c
@@ -69,7 +69,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <openssl/err.h>
 #include "ec_lcl.h"
diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index b276f9d23b..9be2f32703 100644
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -61,7 +61,7 @@
  * contributed to the OpenSSL project.
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <string.h>
 #include "ec_lcl.h"
diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c
index bef2e9572c..ec5892f7c7 100644
--- a/crypto/ec/ec_lib.c
+++ b/crypto/ec/ec_lib.c
@@ -61,7 +61,7 @@
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <string.h>
 
diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
index 334b39d86e..b12930d866 100644
--- a/crypto/ec/ec_mult.c
+++ b/crypto/ec/ec_mult.c
@@ -61,7 +61,7 @@
  * and contributed to the OpenSSL project.
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <string.h>
 
diff --git a/crypto/ec/ecp_mont.c b/crypto/ec/ecp_mont.c
index 232ae34e2a..21adf1c0c3 100644
--- a/crypto/ec/ecp_mont.c
+++ b/crypto/ec/ecp_mont.c
@@ -61,7 +61,7 @@
  * and contributed to the OpenSSL project.
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <openssl/err.h>
 
diff --git a/crypto/ec/ecp_nist.c b/crypto/ec/ecp_nist.c
index 906d41003d..54735ec1d8 100644
--- a/crypto/ec/ecp_nist.c
+++ b/crypto/ec/ecp_nist.c
@@ -61,7 +61,7 @@
  * and contributed to the OpenSSL project.
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <limits.h>
 
diff --git a/crypto/ec/ecp_smpl.c b/crypto/ec/ecp_smpl.c
index 77bf845bcb..47570e491e 100644
--- a/crypto/ec/ecp_smpl.c
+++ b/crypto/ec/ecp_smpl.c
@@ -62,7 +62,7 @@
  * and contributed to the OpenSSL project.
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <openssl/err.h>
 #include <openssl/symhacks.h>
diff --git a/crypto/ecdh/ech_kdf.c b/crypto/ecdh/ech_kdf.c
index 54caee56d7..352bbf2f62 100644
--- a/crypto/ecdh/ech_kdf.c
+++ b/crypto/ecdh/ech_kdf.c
@@ -51,7 +51,7 @@
  * ====================================================================
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <string.h>
 #include <openssl/ecdh.h>
diff --git a/crypto/ecdh/ech_key.c b/crypto/ecdh/ech_key.c
index ebd56ee2c9..ee75d839b3 100644
--- a/crypto/ecdh/ech_key.c
+++ b/crypto/ecdh/ech_key.c
@@ -67,7 +67,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include "ech_locl.h"
 
diff --git a/crypto/ecdh/ech_ossl.c b/crypto/ecdh/ech_ossl.c
index 1f0409feaf..a50e13d48d 100644
--- a/crypto/ecdh/ech_ossl.c
+++ b/crypto/ecdh/ech_ossl.c
@@ -67,7 +67,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <string.h>
 #include <limits.h>
diff --git a/crypto/ecdsa/ecs_ossl.c b/crypto/ecdsa/ecs_ossl.c
index af5d4c2468..794b1591fb 100644
--- a/crypto/ecdsa/ecs_ossl.c
+++ b/crypto/ecdsa/ecs_ossl.c
@@ -56,7 +56,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include "ecs_locl.h"
 #include <openssl/err.h>
diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 0f4481e8e6..ba3d43b9fa 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -48,7 +48,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_AES
diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c
index 7d22407479..c43091d28d 100644
--- a/crypto/evp/e_des3.c
+++ b/crypto/evp/e_des3.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <stdio.h>
 #include "cryptlib.h"
diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
index dc28d8da87..7028a9dc29 100644
--- a/crypto/hmac/hmac.c
+++ b/crypto/hmac/hmac.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c
index fda6f052d2..662b6ff6ca 100644
--- a/crypto/modes/gcm128.c
+++ b/crypto/modes/gcm128.c
@@ -47,7 +47,7 @@
  * ====================================================================
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <openssl/crypto.h>
 #include "modes_lcl.h"
diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index 3584cee3b6..143501e611 100644
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -109,7 +109,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #ifdef MD_RAND_DEBUG
 # ifndef NDEBUG
diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c
index e5195118ca..e7cbd05212 100644
--- a/crypto/rand/rand_win.c
+++ b/crypto/rand/rand_win.c
@@ -109,7 +109,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include "cryptlib.h"
 #include <openssl/rand.h>
diff --git a/crypto/rsa/rsa_crpt.c b/crypto/rsa/rsa_crpt.c
index 448265e217..78b8fcef3b 100644
--- a/crypto/rsa/rsa_crpt.c
+++ b/crypto/rsa/rsa_crpt.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <stdio.h>
 #include <openssl/crypto.h>
diff --git a/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c
index 6c2843116f..80dab8aa4f 100644
--- a/crypto/rsa/rsa_eay.c
+++ b/crypto/rsa/rsa_eay.c
@@ -109,7 +109,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include "cryptlib.h"
 #include <openssl/bn.h>
diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c
index a4eb675d9e..bf7ac3446b 100644
--- a/crypto/rsa/rsa_gen.c
+++ b/crypto/rsa/rsa_gen.c
@@ -62,7 +62,7 @@
  * - Geoff
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <stdio.h>
 #include <time.h>
diff --git a/crypto/rsa/rsa_none.c b/crypto/rsa/rsa_none.c
index f1fcd9c71d..2306ddad11 100644
--- a/crypto/rsa/rsa_none.c
+++ b/crypto/rsa/rsa_none.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include "cryptlib.h"
 #include <openssl/bn.h>
diff --git a/crypto/rsa/rsa_oaep.c b/crypto/rsa/rsa_oaep.c
index 5f1e2e196c..85eed8a637 100644
--- a/crypto/rsa/rsa_oaep.c
+++ b/crypto/rsa/rsa_oaep.c
@@ -18,7 +18,7 @@
  * an equivalent notion.
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include "constant_time_locl.h"
 
diff --git a/crypto/rsa/rsa_pk1.c b/crypto/rsa/rsa_pk1.c
index 2eb47c3841..0f856777b9 100644
--- a/crypto/rsa/rsa_pk1.c
+++ b/crypto/rsa/rsa_pk1.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include "constant_time_locl.h"
 
diff --git a/crypto/rsa/rsa_pss.c b/crypto/rsa/rsa_pss.c
index c776b78810..f890f894b8 100644
--- a/crypto/rsa/rsa_pss.c
+++ b/crypto/rsa/rsa_pss.c
@@ -56,7 +56,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <stdio.h>
 #include "cryptlib.h"
diff --git a/crypto/rsa/rsa_ssl.c b/crypto/rsa/rsa_ssl.c
index 1831fcf062..c0c1210ee9 100644
--- a/crypto/rsa/rsa_ssl.c
+++ b/crypto/rsa/rsa_ssl.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <stdio.h>
 #include "cryptlib.h"
diff --git a/crypto/rsa/rsa_x931.c b/crypto/rsa/rsa_x931.c
index f037f4e47d..c8c3b3934a 100644
--- a/crypto/rsa/rsa_x931.c
+++ b/crypto/rsa/rsa_x931.c
@@ -56,7 +56,7 @@
  *
  */
 
-#define OPENSSL_FIPSAPI
+
 
 #include <stdio.h>
 #include "cryptlib.h"
diff --git a/crypto/rsa/rsa_x931g.c b/crypto/rsa/rsa_x931g.c
index 2f37cf4699..2c91268a8a 100644
--- a/crypto/rsa/rsa_x931g.c
+++ b/