Remove 'done' variable since it stops error codes being reloaded.

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

diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index 812ab7cbe64c10e6e7d9a62473d72544df4e5ac3..f6b5e7238af19ce7a593b32623a3351248252dd3 100644 (file)
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -73,12 +73,6 @@
 #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>
@@ -88,16 +82,15 @@
 #include <openssl/pkcs12.h>
 #include <openssl/rand.h>
 #include <openssl/dso.h>
+#ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
+#endif
 #include <openssl/ocsp.h>
 #include <openssl/err.h>
+#include <openssl/fips.h>
 
 void ERR_load_crypto_strings(void)
        {
-       static int done=0;
-
-       if (done) return;
-       done=1;
 #ifndef OPENSSL_NO_ERR
        ERR_load_ERR_strings(); /* include error strings for SYSerr */
        ERR_load_BN_strings();
@@ -120,12 +113,6 @@ void ERR_load_crypto_strings(void)
        ERR_load_CRYPTO_strings();
 #ifndef OPENSSL_NO_EC
        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();
@@ -134,8 +121,13 @@ void ERR_load_crypto_strings(void)
        ERR_load_PKCS12_strings();
        ERR_load_RAND_strings();
        ERR_load_DSO_strings();
+#ifndef OPENSSL_NO_ENGINE
        ERR_load_ENGINE_strings();
+#endif
        ERR_load_OCSP_strings();
        ERR_load_UI_strings();
+#endif
+#ifdef OPENSSL_FIPS
+       ERR_load_FIPS_strings();
 #endif
        }