aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-10-20 13:13:59 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-12-08 13:25:38 +0000
commit73e45b2dd127b10d6259203082fe2b49aa268986 (patch)
tree94a7e13fd002fa83c9840e27f125723109f59b81 /crypto
parentb2ecc05a9a5854e104460deeaad7d5efba73fa0a (diff)
downloadopenssl-73e45b2dd127b10d6259203082fe2b49aa268986.zip
openssl-73e45b2dd127b10d6259203082fe2b49aa268986.tar.gz
openssl-73e45b2dd127b10d6259203082fe2b49aa268986.tar.bz2
remove OPENSSL_FIPSAPI
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/bn/bn_add.c2
-rw-r--r--crypto/bn/bn_blind.c2
-rw-r--r--crypto/bn/bn_ctx.c2
-rw-r--r--crypto/bn/bn_div.c2
-rw-r--r--crypto/bn/bn_exp.c2
-rw-r--r--crypto/bn/bn_exp2.c2
-rw-r--r--crypto/bn/bn_gcd.c2
-rw-r--r--crypto/bn/bn_gf2m.c2
-rw-r--r--crypto/bn/bn_lib.c2
-rw-r--r--crypto/bn/bn_mod.c2
-rw-r--r--crypto/bn/bn_mont.c2
-rw-r--r--crypto/bn/bn_rand.c2
-rw-r--r--crypto/bn/bn_recp.c2
-rw-r--r--crypto/buffer/buf_str.c2
-rw-r--r--crypto/cmac/cmac.c2
-rw-r--r--crypto/dh/dh_gen.c2
-rw-r--r--crypto/dh/dh_key.c2
-rw-r--r--crypto/dsa/dsa_gen.c2
-rw-r--r--crypto/dsa/dsa_key.c2
-rw-r--r--crypto/dsa/dsa_ossl.c2
-rw-r--r--crypto/dsa/dsa_sign.c2
-rw-r--r--crypto/ec/ec2_mult.c2
-rw-r--r--crypto/ec/ec2_smpl.c2
-rw-r--r--crypto/ec/ec_curve.c2
-rw-r--r--crypto/ec/ec_cvt.c2
-rw-r--r--crypto/ec/ec_key.c2
-rw-r--r--crypto/ec/ec_lib.c2
-rw-r--r--crypto/ec/ec_mult.c2
-rw-r--r--crypto/ec/ecp_mont.c2
-rw-r--r--crypto/ec/ecp_nist.c2
-rw-r--r--crypto/ec/ecp_smpl.c2
-rw-r--r--crypto/ecdh/ech_kdf.c2
-rw-r--r--crypto/ecdh/ech_key.c2
-rw-r--r--crypto/ecdh/ech_ossl.c2
-rw-r--r--crypto/ecdsa/ecs_ossl.c2
-rw-r--r--crypto/evp/e_aes.c2
-rw-r--r--crypto/evp/e_des3.c2
-rw-r--r--crypto/hmac/hmac.c2
-rw-r--r--crypto/modes/gcm128.c2
-rw-r--r--crypto/rand/md_rand.c2
-rw-r--r--crypto/rand/rand_win.c2
-rw-r--r--crypto/rsa/rsa_crpt.c2
-rw-r--r--crypto/rsa/rsa_eay.c2
-rw-r--r--crypto/rsa/rsa_gen.c2
-rw-r--r--crypto/rsa/rsa_none.c2
-rw-r--r--crypto/rsa/rsa_oaep.c2
-rw-r--r--crypto/rsa/rsa_pk1.c2
-rw-r--r--crypto/rsa/rsa_pss.c2
-rw-r--r--crypto/rsa/rsa_ssl.c2
-rw-r--r--crypto/rsa/rsa_x931.c2
-rw-r--r--crypto/rsa/rsa_x931g.c2
51 files changed, 51 insertions, 51 deletions
diff --git a/crypto/bn/bn_add.c b/crypto/bn/bn_add.c
index caf3575..659e1d2 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 c0fe57a..a444d72 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 5288a20..9fe8751 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 7adda12..06d87d0 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 2d051b2..3a1941a 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 a00c115..b95e3fb 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 adef79e..63a77d2 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 7b6b95c..a12ecd4 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 cff4fc4..0305a19 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 49c74fb..5c8650b 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 e41f849..526b9ce 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 7c0ec51..2ccd477 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 cec2863..f99e1b4 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 b4ff71e..75c4ec2 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 5c84900..394777f 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 c397c53..3da2792 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 cfe365c..584a33f 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 a3725d5..861ff90 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 96f74c1..dbf745a 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 bec1354..fb0030a 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 599093a..8e01a14 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 06405d0..ed46d58 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 9a9476f..6c81df0 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 3c26dce..45060d6 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 58d6b4c..682425d 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 b276f9d..9be2f32 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 bef2e95..ec5892f 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 334b39d..b12930d 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 232ae34..21adf1c 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 906d410..54735ec 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 77bf845..47570e4 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 54caee5..352bbf2 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 ebd56ee..ee75d83 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 1f0409f..a50e13d 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 af5d4c2..794b159 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 0f4481e..ba3d43b 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 7d22407..c43091d 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 dc28d8d..7028a9d 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 fda6f05..662b6ff 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 3584cee..143501e 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 e519511..e7cbd05 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 448265e..78b8fce 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 6c28431..80dab8a 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 a4eb675..bf7ac34 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 f1fcd9c..2306dda 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 5f1e2e1..85eed8a 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 2eb47c3..0f85677 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 c776b78..f890f89 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 1831fcf..c0c1210 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 f037f4e..c8c3b39 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 2f37cf4..2c91268 100644
--- a/crypto/rsa/rsa_x931g.c
+++ b/crypto/rsa/rsa_x931g.c
@@ -56,7 +56,7 @@
* [including the GNU Public Licence.]
*/
-#define OPENSSL_FIPSAPI
+
#include <stdio.h>
#include <string.h>