resolve conflicts

1 files changed, 18 insertions, 7 deletions

diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c
index 4dc9300892..5813060ce2 100644
--- a/src/lib/libcrypto/err/err_all.c
+++ b/src/lib/libcrypto/err/err_all.c
@@ -73,6 +73,12 @@
 #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>
@@ -85,16 +91,15 @@
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
+#include <openssl/ui.h>
 #include <openssl/ocsp.h>
 #include <openssl/err.h>
-#include <openssl/fips.h>
+#ifndef OPENSSL_NO_CMS
+#include <openssl/cms.h>
+#endif
 
 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();
@@ -118,6 +123,12 @@ void ERR_load_crypto_strings(void)
 #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();
         ERR_load_PKCS7_strings();       
@@ -130,8 +141,8 @@ void ERR_load_crypto_strings(void)
 #endif
         ERR_load_OCSP_strings();
         ERR_load_UI_strings();
+#ifndef OPENSSL_NO_CMS
+        ERR_load_CMS_strings();
 #endif
-#ifdef OPENSSL_FIPS
-        ERR_load_FIPS_strings();
 #endif
         }