From af3e5e1bda6fa59b5637ca31c0c80a17b29a3787 Mon Sep 17 00:00:00 2001
From: Pauli <paul.dale@oracle.com>
Date: Fri, 29 Sep 2017 07:56:35 +1000
Subject: [PATCH] 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)
---
 include/openssl/asn1.h   | 1 +
 include/openssl/conf.h   | 1 +
 include/openssl/pem.h    | 1 +
 include/openssl/ts.h     | 1 +
 include/openssl/txt_db.h | 1 +
 include/openssl/x509.h   | 1 +
 6 files changed, 6 insertions(+)

diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h
index 3354fa7ac2..9522eec18f 100644
--- 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/safestack.h>
 # include <openssl/asn1err.h>
 # include <openssl/symhacks.h>
 
diff --git a/include/openssl/conf.h b/include/openssl/conf.h
index 205e13793b..702dceb0a2 100644
--- a/include/openssl/conf.h
+++ b/include/openssl/conf.h
@@ -12,6 +12,7 @@
 
 # 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>
diff --git a/include/openssl/pem.h b/include/openssl/pem.h
index 215ae4c01e..10b19a5985 100644
--- 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/safestack.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 2419e942c5..5d56c96a3b 100644
--- 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/safestack.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 fb5f3c74a2..ec981a439f 100644
--- 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/safestack.h>
 # include <openssl/lhash.h>
 
 # define DB_ERROR_OK                     0
diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index be715ea25a..d8288b8b38 100644
--- 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/safestack.h>
 # include <openssl/ec.h>
 
 # if OPENSSL_API_COMPAT < 0x10100000L
-- 
2.34.1