header includes

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/crypto/x509/t_x509.c b/crypto/x509/t_x509.c
index b4d7a3e0dc668848383f3268f3b8cfc3328b227c..4cab108bf27c49d73f63e94a3c5ce0e098c0705a 100644 (file)
--- a/crypto/x509/t_x509.c
+++ b/crypto/x509/t_x509.c
@@ -60,19 +60,11 @@
 #include "internal/cryptlib.h"
 #include <openssl/buffer.h>
 #include <openssl/bn.h>
-#ifndef OPENSSL_NO_RSA
-# include <openssl/rsa.h>
-#endif
-#ifndef OPENSSL_NO_DSA
-# include <openssl/dsa.h>
-#endif
-#ifndef OPENSSL_NO_EC
-# include <openssl/ec.h>
-#endif
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include "internal/asn1_int.h"
+#include "internal/x509_int.h"
 
 #ifndef OPENSSL_NO_STDIO
 int X509_print_fp(FILE *fp, X509 *x)

diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c
index 1284bcb3db15e78b54bc5168dfa0d8339247cc66..7873edf33de82d706095a0f1ded87314ade149d1 100644 (file)
--- a/crypto/x509/x509_set.c
+++ b/crypto/x509/x509_set.c
@@ -62,6 +62,7 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
+#include "internal/x509_int.h"
 
 int X509_set_version(X509 *x, long version)
 {

diff --git a/crypto/x509/x_x509.c b/crypto/x509/x_x509.c
index d775eeb162ab802bd57a607e695df7ffe4e2f29d..028c75a924a0ce0956001476a09be04699f1c2f2 100644 (file)
--- a/crypto/x509/x_x509.c
+++ b/crypto/x509/x_x509.c
@@ -62,6 +62,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
+#include "internal/x509_int.h"
 
 ASN1_SEQUENCE_enc(X509_CINF, enc, 0) = {
         ASN1_EXP_OPT(X509_CINF, version, ASN1_INTEGER, 0),

diff --git a/crypto/x509v3/pcy_cache.c b/crypto/x509v3/pcy_cache.c
index 61065aadc5b1bd5967db028c70bf19ac96d58201..41a748d872d8753a8a251cad13a64dcff969a137 100644 (file)
--- a/crypto/x509v3/pcy_cache.c
+++ b/crypto/x509v3/pcy_cache.c
@@ -60,6 +60,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
+#include "internal/x509_int.h"
 
 #include "pcy_int.h"
 

diff --git a/crypto/x509v3/pcy_map.c b/crypto/x509v3/pcy_map.c
index a4ff30cb76316b721e7aedc5acf31896b8967c50..4989a816c4bf6dc6b301fbf6e840c5122c7199b7 100644 (file)
--- a/crypto/x509v3/pcy_map.c
+++ b/crypto/x509v3/pcy_map.c
@@ -60,6 +60,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
+#include "internal/x509_int.h"
 
 #include "pcy_int.h"
 

diff --git a/crypto/x509v3/v3_addr.c b/crypto/x509v3/v3_addr.c
index ff6fb32a968ddf7f461e6ae3b978182e79d6a4f1..f4a3bcbedac19380125da6284b8f1f1fcf7bf775 100644 (file)
--- a/crypto/x509v3/v3_addr.c
+++ b/crypto/x509v3/v3_addr.c
@@ -68,6 +68,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/buffer.h>
 #include <openssl/x509v3.h>
+#include "internal/x509_int.h"
 #include "ext_dat.h"
 
 #ifndef OPENSSL_NO_RFC3779

diff --git a/crypto/x509v3/v3_asid.c b/crypto/x509v3/v3_asid.c
index e1cde646f202a20805867780b453baa7ad334508..af527ebc1b9ba418c1439336106ce724b35e19b7 100644 (file)
--- a/crypto/x509v3/v3_asid.c
+++ b/crypto/x509v3/v3_asid.c
@@ -67,6 +67,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/x509v3.h>
 #include <openssl/x509.h>
+#include "internal/x509_int.h"
 #include <openssl/bn.h>
 #include "ext_dat.h"