From 3a87a9b9db07f8d3c6d9aa7f20e01f053007a703 Mon Sep 17 00:00:00 2001
From: Geoff Thorpe <geoff@openssl.org>
Date: Mon, 19 Apr 2004 17:46:04 +0000
Subject: Reduce header interdependencies, initially in engine.h (the rest of
 the changes are the fallout). As this could break source code that doesn't
 directly include headers for interfaces it uses, changes to recursive
 includes are covered by the OPENSSL_NO_DEPRECATED symbol. It's better to
 define this when building and using openssl, and then adapt code where
 necessary - this is how to stay current. However the mechanism exists for the
 lethargic.

---
 crypto/engine/eng_openssl.c | 1 +
 crypto/engine/eng_table.c   | 3 ++-
 crypto/engine/engine.h      | 9 ++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'crypto/engine')

diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
index 09d281c19d..4b9cc0a83d 100644
--- a/crypto/engine/eng_openssl.c
+++ b/crypto/engine/eng_openssl.c
@@ -69,6 +69,7 @@
 #include <openssl/dso.h>
 #include <openssl/pem.h>
 #include <openssl/evp.h>
+#include <openssl/rand.h>
 
 /* This testing gunk is implemented (and explained) lower down. It also assumes
  * the application explicitly calls "ENGINE_load_openssl()" because this is no
diff --git a/crypto/engine/eng_table.c b/crypto/engine/eng_table.c
index c69a84a8bf..23e41110cb 100644
--- a/crypto/engine/eng_table.c
+++ b/crypto/engine/eng_table.c
@@ -52,8 +52,9 @@
  *
  */
 
+#include "cryptlib.h"
 #include <openssl/evp.h>
-#include <openssl/engine.h>
+#include <openssl/lhash.h>
 #include "eng_int.h"
 
 /* This is the type of item in the 'implementation' table. Each 'nid' hashes to
diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
index bcbec5162c..712687ea40 100644
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
@@ -3,7 +3,7 @@
  * project 2000.
  */
 /* ====================================================================
- * Copyright (c) 1999-2001 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2004 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -70,7 +70,7 @@
 #error ENGINE is disabled.
 #endif
 
-#include <openssl/ossl_typ.h>
+#ifndef OPENSSL_NO_DEPRECATED
 #include <openssl/bn.h>
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
@@ -90,8 +90,11 @@
 #include <openssl/rand.h>
 #include <openssl/store.h>
 #include <openssl/ui.h>
-#include <openssl/symhacks.h>
 #include <openssl/err.h>
+#endif
+
+#include <openssl/ossl_typ.h>
+#include <openssl/symhacks.h>
 
 #ifdef  __cplusplus
 extern "C" {
-- 
cgit v1.2.3