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 7815378ccbfbc96b79a0614f680ba5e319cda4e6..33a8f96652a18647ee28db86586082b9711ae703 100644 (file)
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -56,11 +56,19 @@
  * [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>

+#ifndef OPENSSL_NO_EC
+#include <openssl/ec.h>
+#endif

 #include <openssl/buffer.h>
 #include <openssl/bio.h>
 #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


@@ -70,6 +78,12 @@
 #ifndef OPENSSL_NO_DSA
 #include <openssl/dsa.h>
 #endif
 #ifndef OPENSSL_NO_DSA
 #include <openssl/dsa.h>
 #endif

+#ifndef OPENSSL_NO_ECDSA
+#include <openssl/ecdsa.h>
+#endif
+#ifndef OPENSSL_NO_ECDH
+#include <openssl/ecdh.h>
+#endif

 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/pem2.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/pem2.h>


@@ -79,19 +93,31 @@
 #include <openssl/pkcs12.h>
 #include <openssl/rand.h>
 #include <openssl/dso.h>
 #include <openssl/pkcs12.h>
 #include <openssl/rand.h>
 #include <openssl/dso.h>

+#ifndef OPENSSL_NO_ENGINE

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

+#endif
+#include <openssl/ui.h>

 #include <openssl/ocsp.h>
 #include <openssl/err.h>
 #include <openssl/ocsp.h>
 #include <openssl/err.h>

+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+#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)
        {

-       static int done=0;
-
-       if (done) return;
-       done=1;
+#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 */
 #ifndef OPENSSL_NO_ERR
        ERR_load_ERR_strings(); /* include error strings for SYSerr */

-       ERR_load_BN_strings()
+       ERR_load_BN_strings();

 #ifndef OPENSSL_NO_RSA
        ERR_load_RSA_strings();
 #endif
 #ifndef OPENSSL_NO_RSA
        ERR_load_RSA_strings();
 #endif


@@ -109,7 +135,18 @@ 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();
        ERR_load_EC_strings();

+#endif
+#ifndef OPENSSL_NO_ECDSA
+       ERR_load_ECDSA_strings();
+#endif
+#ifndef OPENSSL_NO_ECDH
+       ERR_load_ECDH_strings();
+#endif

        /* skip ERR_load_SSL_strings() because it is not in this library */
        ERR_load_BIO_strings();
        ERR_load_PKCS7_strings();       
        /* skip ERR_load_SSL_strings() because it is not in this library */
        ERR_load_BIO_strings();
        ERR_load_PKCS7_strings();       


@@ -117,7 +154,20 @@ void ERR_load_crypto_strings(void)
        ERR_load_PKCS12_strings();
        ERR_load_RAND_strings();
        ERR_load_DSO_strings();
        ERR_load_PKCS12_strings();
        ERR_load_RAND_strings();
        ERR_load_DSO_strings();

+       ERR_load_TS_strings();
+#ifndef OPENSSL_NO_ENGINE

        ERR_load_ENGINE_strings();
        ERR_load_ENGINE_strings();

+#endif

        ERR_load_OCSP_strings();
        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
        }