Deprecate some recursive includes from the store.h API header, and put back

required includes back via the internal header and str_lib.c.

diff --git a/crypto/store/store.h b/crypto/store/store.h
index 40fb38fc43932f13a81332a6fb55c145d7460b72..b2e7e198f97f47eb372d17f3b7e900d3f63508db 100644 (file)
--- a/crypto/store/store.h
+++ b/crypto/store/store.h
@@ -60,9 +60,11 @@
 #define HEADER_STORE_H
 
 #include <openssl/ossl_typ.h>
-#include <openssl/x509.h>
+#ifndef OPENSSL_NO_DEPRECATED
 #include <openssl/evp.h>
 #include <openssl/bn.h>
+#include <openssl/x509.h>
+#endif
 
 #ifdef  __cplusplus
 extern "C" {

diff --git a/crypto/store/str_lib.c b/crypto/store/str_lib.c
index eb9e6426be04d95241e3d1872f3b53c9a9129b5f..7e59ee1d06a8ff57234b284b802abdef62351c65 100644 (file)
--- a/crypto/store/str_lib.c
+++ b/crypto/store/str_lib.c
@@ -60,6 +60,8 @@
 #include <openssl/bn.h>
 #include <openssl/err.h>
 #include <openssl/engine.h>
+#include <openssl/sha.h>
+#include <openssl/x509.h>
 #include "str_locl.h"
 
 const char * const STORE_object_type_string[STORE_OBJECT_TYPE_NUM+1] =

diff --git a/crypto/store/str_locl.h b/crypto/store/str_locl.h
index c8decfa87dfa092be79f73c3ad19cf010d519848..3f8cb75619c733a1ab865cf95b640ed2b799fcc0 100644 (file)
--- a/crypto/store/str_locl.h
+++ b/crypto/store/str_locl.h
@@ -59,6 +59,7 @@
 #ifndef HEADER_STORE_LOCL_H
 #define HEADER_STORE_LOCL_H
 
+#include <openssl/crypto.h>
 #include <openssl/store.h>
 
 #ifdef  __cplusplus