summaryrefslogtreecommitdiffstats
path: root/ssl/ssl.h
diff options
context:
space:
mode:
authorGeoff Thorpe <geoff@openssl.org>2004-05-17 18:53:47 +0000
committerGeoff Thorpe <geoff@openssl.org>2004-05-17 18:53:47 +0000
commitd095b68d63ca91d8e42afb5dc46bb16ed4e4e25d (patch)
tree308edce1a8c4e6b7b1f89414486242daf9a91eb5 /ssl/ssl.h
parent508999fa7d5bf5f06eeb5deb8912ad723e42bec9 (diff)
Deprecate quite a few recursive includes from the ssl.h API header and
remove some unnecessary includes from the internal header ssl_locl.h. This then requires adding includes for bn.h in four C files.
Diffstat (limited to 'ssl/ssl.h')
-rw-r--r--ssl/ssl.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 8a16d77ac4..04909c829a 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -178,9 +178,16 @@
#ifndef OPENSSL_NO_BIO
#include <openssl/bio.h>
#endif
+#ifndef OPENSSL_NO_DEPRECATED
#ifndef OPENSSL_NO_X509
#include <openssl/x509.h>
#endif
+#include <openssl/crypto.h>
+#include <openssl/lhash.h>
+#include <openssl/buffer.h>
+#endif
+#include <openssl/pem.h>
+
#include <openssl/kssl.h>
#include <openssl/safestack.h>
#include <openssl/symhacks.h>
@@ -318,11 +325,6 @@ extern "C" {
}
#endif
-#include <openssl/crypto.h>
-#include <openssl/lhash.h>
-#include <openssl/buffer.h>
-#include <openssl/pem.h>
-
#ifdef __cplusplus
extern "C" {
#endif