Fixes to make 'no-ec' work (it should not turn 'objects' into 'objts' for example)

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

diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index a6f6447a73744a92b0ab0b15cc635ba68adb9b09..b088de65f5f30d94f473bc6ed999653b421bc249 100644 (file)
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -59,18 +59,18 @@
 #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>
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
-#ifdef RSAref
-#include <openssl/rsaref.h>
-#endif
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
 #endif
-#ifndef NO_DSA
+#ifndef OPENSSL_NO_DSA
 #include <openssl/dsa.h>
 #endif
 #include <openssl/evp.h>
@@ -80,6 +80,10 @@
 #include <openssl/x509v3.h>
 #include <openssl/conf.h>
 #include <openssl/pkcs12.h>
+#include <openssl/rand.h>
+#include <openssl/dso.h>
+#include <openssl/engine.h>
+#include <openssl/ocsp.h>
 #include <openssl/err.h>
 
 void ERR_load_crypto_strings(void)
@@ -88,34 +92,37 @@ void ERR_load_crypto_strings(void)
 
        if (done) return;
        done=1;
-#ifndef NO_ERR
-       ERR_load_ASN1_strings();
+#ifndef OPENSSL_NO_ERR
+       ERR_load_ERR_strings(); /* include error strings for SYSerr */
        ERR_load_BN_strings();
-       ERR_load_BUF_strings();
-       ERR_load_BIO_strings();
-       ERR_load_CONF_strings();
-#ifndef NO_RSA
-#ifdef RSAref
-       ERR_load_RSAREF_strings();
-#else
+#ifndef OPENSSL_NO_RSA
        ERR_load_RSA_strings();
 #endif
-#endif
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
        ERR_load_DH_strings();
 #endif
-#ifndef NO_DSA
-       ERR_load_DSA_strings();
-#endif
-       ERR_load_ERR_strings();
        ERR_load_EVP_strings();
+       ERR_load_BUF_strings();
        ERR_load_OBJ_strings();
        ERR_load_PEM_strings();
+#ifndef OPENSSL_NO_DSA
+       ERR_load_DSA_strings();
+#endif
        ERR_load_X509_strings();
-       ERR_load_X509V3_strings();
+       ERR_load_ASN1_strings();
+       ERR_load_CONF_strings();
        ERR_load_CRYPTO_strings();
-       ERR_load_PKCS7_strings();
+#ifndef OPENSSL_NO_EC
+       ERR_load_EC_strings();
+#endif
+       /* skip ERR_load_SSL_strings() because it is not in this library */
+       ERR_load_BIO_strings();
+       ERR_load_PKCS7_strings();       
+       ERR_load_X509V3_strings();
        ERR_load_PKCS12_strings();
        ERR_load_RAND_strings();
+       ERR_load_DSO_strings();
+       ERR_load_ENGINE_strings();
+       ERR_load_OCSP_strings();
 #endif
        }