X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Ferr%2Ferr_all.c;h=d9a2a576824c453e4d11eb047d5dd368e4e5e753;hb=2f1a5d1694c4b59ea94115ed4e9577c5bb826c26;hp=54693ed3f402909e9c294c0dd0d210bb90222930;hpb=0f113f3ee4d629ef9a4a30911b22b224772085e5;p=oweals%2Fopenssl.git

diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index 54693ed3f4..d9a2a57682 100644
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -56,8 +56,6 @@
  * [including the GNU Public Licence.]
  */
 
-#define OPENSSL_NO_FIPS_ERR
-
 #include <stdio.h>
 #include <openssl/asn1.h>
 #include <openssl/bn.h>
@@ -78,10 +76,8 @@
 #ifndef OPENSSL_NO_DSA
 # include <openssl/dsa.h>
 #endif
-#ifndef OPENSSL_NO_ECDSA
+#ifndef OPENSSL_NO_EC
 # include <openssl/ecdsa.h>
-#endif
-#ifndef OPENSSL_NO_ECDH
 # include <openssl/ecdh.h>
 #endif
 #include <openssl/evp.h>
@@ -109,6 +105,7 @@
 #ifndef OPENSSL_NO_JPAKE
 # include <openssl/jpake.h>
 #endif
+#include <internal/ct_int.h>
 
 void ERR_load_crypto_strings(void)
 {
@@ -140,11 +137,7 @@ void ERR_load_crypto_strings(void)
 # endif
 # 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 */
@@ -169,5 +162,8 @@ void ERR_load_crypto_strings(void)
 # ifndef OPENSSL_NO_JPAKE
     ERR_load_JPAKE_strings();
 # endif
+# ifndef OPENSSL_NO_CT
+    ERR_load_CT_strings();
+# endif
 #endif
 }