Put back the #include <openssl/safestack.h> lines in public headers.

the latter includes the former.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4437)

diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h
index 3354fa7ac2c562d762795492b3a249e96ff7f70e..9522eec18f7a95938c4ea396ab5add6791380c90 100644 (file)
--- a/include/openssl/asn1.h
+++ b/include/openssl/asn1.h
@@ -14,6 +14,7 @@
 # include <openssl/e_os2.h>
 # include <openssl/opensslconf.h>
 # include <openssl/bio.h>
 # include <openssl/e_os2.h>
 # include <openssl/opensslconf.h>
 # include <openssl/bio.h>

+# include <openssl/safestack.h>

 # include <openssl/asn1err.h>
 # include <openssl/symhacks.h>
 
 # include <openssl/asn1err.h>
 # include <openssl/symhacks.h>
 

diff --git a/include/openssl/conf.h b/include/openssl/conf.h
index 205e13793bf009198e9e8cbe3ff83018d6de6efe..702dceb0a2563bbd1650ce2305acd107dffc66bc 100644 (file)
--- a/include/openssl/conf.h
+++ b/include/openssl/conf.h
@@ -12,6 +12,7 @@
 
 # include <openssl/bio.h>
 # include <openssl/lhash.h>
 
 # include <openssl/bio.h>
 # include <openssl/lhash.h>

+# include <openssl/safestack.h>

 # include <openssl/e_os2.h>
 # include <openssl/ossl_typ.h>
 # include <openssl/conferr.h>
 # include <openssl/e_os2.h>
 # include <openssl/ossl_typ.h>
 # include <openssl/conferr.h>

diff --git a/include/openssl/pem.h b/include/openssl/pem.h
index 215ae4c01e209dbd9f5748bff7f22ac6ba02862e..10b19a59855a5b045af23394db84b6e1f1e47d8e 100644 (file)
--- a/include/openssl/pem.h
+++ b/include/openssl/pem.h
@@ -12,6 +12,7 @@
 
 # include <openssl/e_os2.h>
 # include <openssl/bio.h>
 
 # include <openssl/e_os2.h>
 # include <openssl/bio.h>

+# include <openssl/safestack.h>

 # include <openssl/evp.h>
 # include <openssl/x509.h>
 # include <openssl/pem2.h>
 # include <openssl/evp.h>
 # include <openssl/x509.h>
 # include <openssl/pem2.h>

diff --git a/include/openssl/ts.h b/include/openssl/ts.h
index 2419e942c5bca16beb2b45f7f7cf3c2fb8f897db..5d56c96a3b5d4b8e94006e12b737d9268c0277ed 100644 (file)
--- a/include/openssl/ts.h
+++ b/include/openssl/ts.h
@@ -18,6 +18,7 @@
 # include <openssl/evp.h>
 # include <openssl/bio.h>
 # include <openssl/asn1.h>
 # include <openssl/evp.h>
 # include <openssl/bio.h>
 # include <openssl/asn1.h>

+# include <openssl/safestack.h>

 # include <openssl/rsa.h>
 # include <openssl/dsa.h>
 # include <openssl/dh.h>
 # include <openssl/rsa.h>
 # include <openssl/dsa.h>
 # include <openssl/dh.h>

diff --git a/include/openssl/txt_db.h b/include/openssl/txt_db.h
index fb5f3c74a2c8528e88a1f8de673811963ecf2349..ec981a439fe8bf5d7d52f7b603985ca4eb620a6e 100644 (file)
--- a/include/openssl/txt_db.h
+++ b/include/openssl/txt_db.h
@@ -12,6 +12,7 @@
 
 # include <openssl/opensslconf.h>
 # include <openssl/bio.h>
 
 # include <openssl/opensslconf.h>
 # include <openssl/bio.h>

+# include <openssl/safestack.h>

 # include <openssl/lhash.h>
 
 # define DB_ERROR_OK                     0
 # include <openssl/lhash.h>
 
 # define DB_ERROR_OK                     0

diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index be715ea25a846b1eeb214c3d9fea81dc707b414e..d8288b8b386916f7aaaa3ae207c11560d69cbde7 100644 (file)
--- a/include/openssl/x509.h
+++ b/include/openssl/x509.h
@@ -18,6 +18,7 @@
 # include <openssl/evp.h>
 # include <openssl/bio.h>
 # include <openssl/asn1.h>
 # include <openssl/evp.h>
 # include <openssl/bio.h>
 # include <openssl/asn1.h>

+# include <openssl/safestack.h>

 # include <openssl/ec.h>
 
 # if OPENSSL_API_COMPAT < 0x10100000L
 # include <openssl/ec.h>
 
 # if OPENSSL_API_COMPAT < 0x10100000L