use fips-dev not dev-fips

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

diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index bfb4c1ab12ba4664698d67d8d2ed245f892693b9..39796f7cc8cd90097efd0f775743cec28a9f57fd 100644 (file)
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -94,13 +94,20 @@
 #include <openssl/ui.h>
 #include <openssl/ocsp.h>
 #include <openssl/err.h>
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
+#ifndef OPENSSL_NO_CMS
+#include <openssl/cms.h>
+#endif
+#ifndef OPENSSL_NO_JPAKE
+#include <openssl/jpake.h>
+#endif
+#include <openssl/comp.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();
@@ -142,5 +149,15 @@ void ERR_load_crypto_strings(void)
 #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
+       ERR_load_COMP_strings();
 #endif
        }