Remove fipscanister build functionality from makefiles.

[openssl.git] / crypto / err / err_all.c

diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index 3eff403127f122fc7be85970246a48c9f2cba01f..33a8f96652a18647ee28db86586082b9711ae703 100644 (file)
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -56,6 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
  * [including the GNU Public Licence.]
  */
 

+#define OPENSSL_NO_FIPS_ERR
+

 #include <stdio.h>
 #include <openssl/asn1.h>
 #include <openssl/bn.h>
 #include <stdio.h>
 #include <openssl/asn1.h>
 #include <openssl/bn.h>


@@ -64,6 +66,9 @@
 #endif
 #include <openssl/buffer.h>
 #include <openssl/bio.h>
 #endif
 #include <openssl/buffer.h>
 #include <openssl/bio.h>

+#ifndef OPENSSL_NO_COMP
+#include <openssl/comp.h>
+#endif

 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif


@@ -94,10 +99,22 @@
 #include <openssl/ui.h>
 #include <openssl/ocsp.h>
 #include <openssl/err.h>
 #include <openssl/ui.h>
 #include <openssl/ocsp.h>
 #include <openssl/err.h>

+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif

 #include <openssl/ts.h>
 #include <openssl/ts.h>

+#ifndef OPENSSL_NO_CMS
+#include <openssl/cms.h>
+#endif
+#ifndef OPENSSL_NO_JPAKE
+#include <openssl/jpake.h>
+#endif

 
 void ERR_load_crypto_strings(void)
        {
 
 void ERR_load_crypto_strings(void)
        {

+#ifdef OPENSSL_FIPS
+       FIPS_set_error_callbacks(ERR_put_error, ERR_add_error_vdata);
+#endif

 #ifndef OPENSSL_NO_ERR
        ERR_load_ERR_strings(); /* include error strings for SYSerr */
        ERR_load_BN_strings();
 #ifndef OPENSSL_NO_ERR
        ERR_load_ERR_strings(); /* include error strings for SYSerr */
        ERR_load_BN_strings();


@@ -118,6 +135,9 @@ void ERR_load_crypto_strings(void)
        ERR_load_ASN1_strings();
        ERR_load_CONF_strings();
        ERR_load_CRYPTO_strings();
        ERR_load_ASN1_strings();
        ERR_load_CONF_strings();
        ERR_load_CRYPTO_strings();

+#ifndef OPENSSL_NO_COMP
+       ERR_load_COMP_strings();
+#endif

 #ifndef OPENSSL_NO_EC
        ERR_load_EC_strings();
 #endif
 #ifndef OPENSSL_NO_EC
        ERR_load_EC_strings();
 #endif


@@ -140,5 +160,14 @@ void ERR_load_crypto_strings(void)
 #endif
        ERR_load_OCSP_strings();
        ERR_load_UI_strings();
 #endif
        ERR_load_OCSP_strings();
        ERR_load_UI_strings();

+#ifdef OPENSSL_FIPS
+       ERR_load_FIPS_strings();
+#endif
+#ifndef OPENSSL_NO_CMS
+       ERR_load_CMS_strings();
+#endif
+#ifndef OPENSSL_NO_JPAKE
+       ERR_load_JPAKE_strings();
+#endif

 #endif
        }
 #endif
        }