Deprecate some recursive includes from the store.h API header, and put back
authorGeoff Thorpe <geoff@openssl.org>
Mon, 17 May 2004 18:49:06 +0000 (18:49 +0000)
committerGeoff Thorpe <geoff@openssl.org>
Mon, 17 May 2004 18:49:06 +0000 (18:49 +0000)
required includes back via the internal header and str_lib.c.

crypto/store/store.h
crypto/store/str_lib.c
crypto/store/str_locl.h

index 40fb38f..b2e7e19 100644 (file)
 #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" {
index eb9e642..7e59ee1 100644 (file)
@@ -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] =
index c8decfa..3f8cb75 100644 (file)
@@ -59,6 +59,7 @@
 #ifndef HEADER_STORE_LOCL_H
 #define HEADER_STORE_LOCL_H
 
+#include <openssl/crypto.h>
 #include <openssl/store.h>
 
 #ifdef  __cplusplus