"Andrew W. Gray" <agray@iconsinc.com> says /GD is no longer a valid

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

diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index f874268e1aaa33578c480a1431c7e939aedf35a7..d4f169ec011d9963a993f6b03905535eba7501a4 100644 (file)
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -57,30 +57,35 @@
  */
 
 #include <stdio.h>
-#include "asn1.h"
-#include "bn.h"
-#include "buffer.h"
-#include "bio.h"
+#include <openssl/asn1.h>
+#include <openssl/bn.h>
+#include <openssl/buffer.h>
+#include <openssl/bio.h>
 #ifndef NO_RSA
-#include "rsa.h"
+#include <openssl/rsa.h>
 #endif
-#ifdef RSAref
-#include "rsaref.h"
+#if 0 /* was: #ifdef RSAref */
+#include <openssl/rsaref.h>
 #endif
 #ifndef NO_DH
-#include "dh.h"
+#include <openssl/dh.h>
 #endif
 #ifndef NO_DSA
-#include "dsa.h"
+#include <openssl/dsa.h>
 #endif
-#include "evp.h"
-#include "objects.h"
-#include "pem.h"
-#include "x509.h"
-#include "conf.h"
-#include "err.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/pem2.h>
+#include <openssl/x509.h>
+#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/err.h>
 
-void ERR_load_crypto_strings()
+void ERR_load_crypto_strings(void)
        {
        static int done=0;
 
@@ -93,7 +98,7 @@ void ERR_load_crypto_strings()
        ERR_load_BIO_strings();
        ERR_load_CONF_strings();
 #ifndef NO_RSA
-#ifdef RSAref
+#if 0 /* was: #ifdef RSAref */
        ERR_load_RSAREF_strings();
 #else
        ERR_load_RSA_strings();
@@ -110,7 +115,12 @@ void ERR_load_crypto_strings()
        ERR_load_OBJ_strings();
        ERR_load_PEM_strings();
        ERR_load_X509_strings();
+       ERR_load_X509V3_strings();
        ERR_load_CRYPTO_strings();
        ERR_load_PKCS7_strings();
+       ERR_load_PKCS12_strings();
+       ERR_load_RAND_strings();
+       ERR_load_DSO_strings();
+       ERR_load_ENGINE_strings();
 #endif
        }