Additionally, rename des_encrypt to des_encrypt1 in files that are

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

diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index f465f260c26915ca5d6ed06e62b16eda694976da..638ed3fe715d9ad3c064011f3f76ce5023c64fa9 100644 (file)
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -64,7 +64,7 @@
 #ifndef NO_RSA
 #include <openssl/rsa.h>
 #endif
-#if 0 /* was: #ifdef RSAref */
+#ifdef RSAref
 #include <openssl/rsaref.h>
 #endif
 #ifndef NO_DH
@@ -81,10 +81,8 @@
 #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>
+#include <openssl/dso.h>
 
 void ERR_load_crypto_strings(void)
        {
@@ -99,7 +97,7 @@ void ERR_load_crypto_strings(void)
        ERR_load_BIO_strings();
        ERR_load_CONF_strings();
 #ifndef NO_RSA
-#if 0 /* was: #ifdef RSAref */
+#ifdef RSAref
        ERR_load_RSAREF_strings();
 #else
        ERR_load_RSA_strings();
@@ -122,7 +120,5 @@ void ERR_load_crypto_strings(void)
        ERR_load_PKCS12_strings();
        ERR_load_RAND_strings();
        ERR_load_DSO_strings();
-       ERR_load_ENGINE_strings();
-       ERR_load_OCSP_strings();
 #endif
        }