(oops) Apologies all, that last header-cleanup commit was from the wrong

tree. This further reduces header interdependencies, and makes some
associated cleanups.

diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c
index 7088486a91a413ca08b2c5e5dcdb16a71ff472cf..32eef7e78f66788681eb346e09e1e1dae2438667 100644 (file)
--- a/crypto/asn1/t_req.c
+++ b/crypto/asn1/t_req.c
@@ -63,6 +63,8 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
 
 #ifndef OPENSSL_NO_FP_API
 int X509_REQ_print_fp(FILE *fp, X509_REQ *x)

diff --git a/crypto/asn1/t_spki.c b/crypto/asn1/t_spki.c
index 499e12834a752ed9b4babb45bf248c617a857cca..67b0cc9f00e56479a7605fbcaea4299d27deec0f 100644 (file)
--- a/crypto/asn1/t_spki.c
+++ b/crypto/asn1/t_spki.c
@@ -60,6 +60,8 @@
 #include "cryptlib.h"
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
 
 /* Print out an SPKI */
 

diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c
index 83ead744f055144ae7dcbb06ecd6a01bc8ed1c28..10b87def32aea6c7f8325fafc38911132597fd69 100644 (file)
--- a/crypto/asn1/x_pubkey.c
+++ b/crypto/asn1/x_pubkey.c
@@ -60,6 +60,8 @@
 #include "cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
 
 /* Minor tweak to operation: free up EVP_PKEY */
 static int pubkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it)

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 009c3be4c0ac4a3546874399ec7b26782964e4a8..b180aebce92fc9af0333cf6186d6180c2d7d1a8a 100644 (file)
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -114,10 +114,7 @@
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
-#include <stdio.h>
-#include <string.h>
 #include "cryptlib.h"
-#include <openssl/crypto.h>
 #include <openssl/safestack.h>
 
 #if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)

diff --git a/crypto/cversion.c b/crypto/cversion.c
index beeeb14013e7347a119d72f7a9c3a9817dcb272d..ea9f25fd16663dc93d9290ea19358db066c4861d 100644 (file)
--- a/crypto/cversion.c
+++ b/crypto/cversion.c
@@ -56,10 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#include <stdio.h>
-#include <string.h>
 #include "cryptlib.h"
-#include <openssl/crypto.h>
 
 #ifndef NO_WINDOWS_BRAINDEATH
 #include "buildinf.h"

diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h
index d54c5d59bc1040b76a1095bcacb8bb28527b78a6..cdb19457fb52bf3b85adaa7ae595a037d92e141c 100644 (file)
--- a/crypto/dsa/dsa.h
+++ b/crypto/dsa/dsa.h
@@ -77,9 +77,12 @@
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
 #include <openssl/ossl_typ.h>
+
+#ifndef OPENSSL_NO_DEPRECATED
 #ifndef OPENSSL_NO_DH
 # include <openssl/dh.h>
 #endif
+#endif
 
 #define DSA_FLAG_CACHE_MONT_P  0x01
 

diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index 4171af24c6cdf83b99acf9f0ecd594c7d8a3475e..3a78082c010afe782a9eae18300cb6c9fb1ca6f0 100644 (file)
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -66,6 +66,7 @@
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
+#include <openssl/dh.h>
 
 const char *DSA_version="DSA" OPENSSL_VERSION_PTEXT;
 

diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c
index 9b32f55be80856b96d4dc5ae1ea0278a4bc6737b..9944d632c9d0bee9defd362f2b495c473252175e 100644 (file)
--- a/crypto/ec/ectest.c
+++ b/crypto/ec/ectest.c
@@ -92,6 +92,7 @@ int main(int argc, char * argv[]) { puts("Elliptic curves are disabled."); retur
 #include <openssl/err.h>
 #include <openssl/obj_mac.h>
 #include <openssl/objects.h>
+#include <openssl/rand.h>
 
 #define ABORT do { \
        fflush(stdout); \

diff --git a/crypto/ecdh/ech_lib.c b/crypto/ecdh/ech_lib.c
index 8b3e5f1ddc071aa47fc8e9600908c850512605dc..a0e4ef45f0d5ddd5fc776582acf9e6be2a83acd6 100644 (file)
--- a/crypto/ecdh/ech_lib.c
+++ b/crypto/ecdh/ech_lib.c
@@ -70,6 +70,7 @@
 #include "ecdh.h"
 #include <string.h>
 #include <openssl/engine.h>
+#include <openssl/err.h>
 
 const char *ECDH_version="ECDH" OPENSSL_VERSION_PTEXT;
 

diff --git a/crypto/ecdsa/ecs_lib.c b/crypto/ecdsa/ecs_lib.c
index 9465dee625d8940211da46bc0f7422d174e4211d..6ce5d927caa754b47f2a4a975cc0a72f4f881947 100644 (file)
--- a/crypto/ecdsa/ecs_lib.c
+++ b/crypto/ecdsa/ecs_lib.c
@@ -56,6 +56,7 @@
 #include <string.h>
 #include "ecdsa.h"
 #include <openssl/engine.h>
+#include <openssl/err.h>
 
 const char *ECDSA_version="ECDSA" OPENSSL_VERSION_PTEXT;
 

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 64ec2db901fceafde436937d61e885ce427cb805..1f28b4078b1a3bbf5d5b69d09ce3cad39d255ed0 100644 (file)
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -56,8 +56,7 @@
  *
  */
 
-#include <openssl/err.h>
-#include <openssl/engine.h>
+#include "cryptlib.h"
 #include "eng_int.h"
 
 void ENGINE_load_builtin_engines(void)

diff --git a/crypto/engine/eng_cnf.c b/crypto/engine/eng_cnf.c
index cdf670901adc9011b0f028da7ace4ce34cb5734c..8567f266759eea6722ebabfbb3f54fe4ea34fcaa 100644 (file)
--- a/crypto/engine/eng_cnf.c
+++ b/crypto/engine/eng_cnf.c
@@ -56,11 +56,8 @@
  *
  */
 
-#include <stdio.h>
-#include <openssl/crypto.h>
-#include "cryptlib.h"
+#include "eng_int.h"
 #include <openssl/conf.h>
-#include <openssl/engine.h>
 
 /* #define ENGINE_CONF_DEBUG */
 

diff --git a/crypto/engine/eng_ctrl.c b/crypto/engine/eng_ctrl.c
index 1a808bec4177540572dd45720ee71507fc882726..18527484ce4668cb4ecbda6e1d19e81dd80fed01 100644 (file)
--- a/crypto/engine/eng_ctrl.c
+++ b/crypto/engine/eng_ctrl.c
@@ -53,10 +53,7 @@
  *
  */
 
-#include <openssl/crypto.h>
-#include "cryptlib.h"
 #include "eng_int.h"
-#include <openssl/engine.h>
 
 /* When querying a ENGINE-specific control command's 'description', this string
  * is used if the ENGINE_CMD_DEFN has cmd_desc set to NULL. */

diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c
index 3cb46856cc10d2b848c92ca2aa0dc85da8dc1e91..290b8bd39506dd22abf40c23f31d733bf4f081f2 100644 (file)
--- a/crypto/engine/eng_dyn.c
+++ b/crypto/engine/eng_dyn.c
@@ -57,11 +57,7 @@
  */
 
 
-#include <stdio.h>
-#include <openssl/crypto.h>
-#include "cryptlib.h"
 #include "eng_int.h"
-#include <openssl/engine.h>
 #include <openssl/dso.h>
 
 /* Shared libraries implementing ENGINEs for use by the "dynamic" ENGINE loader

diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c
index 1539ea039f741ef7c420a639e30b6bc66febe7f6..27c1662f6254d96986b25da8079b45db1341059d 100644 (file)
--- a/crypto/engine/eng_fat.c
+++ b/crypto/engine/eng_fat.c
@@ -58,10 +58,7 @@
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
-#include <openssl/crypto.h>
-#include "cryptlib.h"
 #include "eng_int.h"
-#include <openssl/engine.h>
 #include <openssl/conf.h>
 
 int ENGINE_set_default(ENGINE *e, unsigned int flags)

diff --git a/crypto/engine/eng_init.c b/crypto/engine/eng_init.c
index 170c1791b30537766f764dceae13d6c163912b45..2843e4f0e4ea5a17fc4655b98adffa4658e3695b 100644 (file)
--- a/crypto/engine/eng_init.c
+++ b/crypto/engine/eng_init.c
@@ -53,10 +53,7 @@
  *
  */
 
-#include <openssl/crypto.h>
-#include "cryptlib.h"
 #include "eng_int.h"
-#include <openssl/engine.h>
 
 /* Initialise a engine type for use (or up its functional reference count
  * if it's already in use). This version is only used internally. */

diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h
index 395c7fff1a5fc39e286447a63b700de3b48ccb3f..a5b1edebf4b9be6789cc5f7023eecf07f6d7ea09 100644 (file)
--- a/crypto/engine/eng_int.h
+++ b/crypto/engine/eng_int.h
@@ -64,6 +64,7 @@
 #ifndef HEADER_ENGINE_INT_H
 #define HEADER_ENGINE_INT_H
 
+#include "cryptlib.h"
 /* Take public definitions from engine.h */
 #include <openssl/engine.h>
 

diff --git a/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c
index 66ab06de7450c33d2e20abca0b2f7283efb3030a..7b3686ddc0e42a47bd18fb8431cde3212c53327e 100644 (file)
--- a/crypto/engine/eng_lib.c
+++ b/crypto/engine/eng_lib.c
@@ -56,11 +56,8 @@
  *
  */
 
-#include <openssl/crypto.h>
-#include "cryptlib.h"
 #include "eng_int.h"
-#include <openssl/rand.h> /* FIXME: This shouldn't be needed */
-#include <openssl/engine.h>
+#include <openssl/rand.h>
 
 /* The "new"/"free" stuff first */
 

diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c
index f94d593b06a937c428df2441c4ee1e126e96b1da..67d67df3ce43d7da0c3d4697bd9045ce0cc195dc 100644 (file)
--- a/crypto/engine/eng_list.c
+++ b/crypto/engine/eng_list.c
@@ -61,10 +61,7 @@
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
-#include <openssl/crypto.h>
-#include "cryptlib.h"
 #include "eng_int.h"
-#include <openssl/engine.h>
 
 /* The linked-list of pointers to engine types. engine_list_head
  * incorporates an implicit structural reference but engine_list_tail

diff --git a/crypto/engine/eng_pkey.c b/crypto/engine/eng_pkey.c
index 8c69171511ec9c79e15c5dc585a0912db50f108d..bc8b21abec5a6225faeb7f9df1d2baa9edd6386a 100644 (file)
--- a/crypto/engine/eng_pkey.c
+++ b/crypto/engine/eng_pkey.c
@@ -53,10 +53,7 @@
  *
  */
 
-#include <openssl/crypto.h>
-#include "cryptlib.h"
 #include "eng_int.h"
-#include <openssl/engine.h>
 
 /* Basic get/set stuff */
 

diff --git a/crypto/engine/tb_cipher.c b/crypto/engine/tb_cipher.c
index 50b3cec1fa598cc1c62cc239266e98bbd5aa568a..177fc1fb739ae3d8481b1e490da7ebc210e60984 100644 (file)
--- a/crypto/engine/tb_cipher.c
+++ b/crypto/engine/tb_cipher.c
@@ -52,8 +52,6 @@
  *
  */
 
-#include <openssl/evp.h>
-#include <openssl/engine.h>
 #include "eng_int.h"
 
 /* If this symbol is defined then ENGINE_get_cipher_engine(), the function that

diff --git a/crypto/engine/tb_dh.c b/crypto/engine/tb_dh.c
index e290e1702b279eda73188970c090c5843848418a..6e9d4287610422e71735dd4bb84c81fea120d0d8 100644 (file)
--- a/crypto/engine/tb_dh.c
+++ b/crypto/engine/tb_dh.c
@@ -52,8 +52,6 @@
  *
  */
 
-#include <openssl/evp.h>
-#include <openssl/engine.h>
 #include "eng_int.h"
 
 /* If this symbol is defined then ENGINE_get_default_DH(), the function that is

diff --git a/crypto/engine/tb_digest.c b/crypto/engine/tb_digest.c
index e82d2a17c9c3cb33a3a212435fe0e981f489e9cb..d3f4bb2747537e97b5754630289eb50ff8eee427 100644 (file)
--- a/crypto/engine/tb_digest.c
+++ b/crypto/engine/tb_digest.c
@@ -52,8 +52,6 @@
  *
  */
 
-#include <openssl/evp.h>
-#include <openssl/engine.h>
 #include "eng_int.h"
 
 /* If this symbol is defined then ENGINE_get_digest_engine(), the function that

diff --git a/crypto/engine/tb_dsa.c b/crypto/engine/tb_dsa.c
index 80170591f201a0bf70f1728112bc21e0c827d5b1..d326a5f6da164ba4beda04400ff5f81fd2a94512 100644 (file)
--- a/crypto/engine/tb_dsa.c
+++ b/crypto/engine/tb_dsa.c
@@ -52,8 +52,6 @@
  *
  */
 
-#include <openssl/evp.h>
-#include <openssl/engine.h>
 #include "eng_int.h"
 
 /* If this symbol is defined then ENGINE_get_default_DSA(), the function that is

diff --git a/crypto/engine/tb_ecdh.c b/crypto/engine/tb_ecdh.c
index f40eb006eb1cbb826f18d6db362ac0296d714ec2..59977f7dd0a6228def9d365bb1a940589e8a4d63 100644 (file)
--- a/crypto/engine/tb_ecdh.c
+++ b/crypto/engine/tb_ecdh.c
@@ -67,8 +67,6 @@
  *
  */
 
-#include <openssl/evp.h>
-#include <openssl/engine.h>
 #include "eng_int.h"
 
 /* If this symbol is defined then ENGINE_get_default_ECDH(), the function that is

diff --git a/crypto/engine/tb_ecdsa.c b/crypto/engine/tb_ecdsa.c
index 76deefcdc50fbffd3789f4e66f646e43f80f593f..e30b02e8c59b53acd33a260c862a74bd7a936ce6 100644 (file)
--- a/crypto/engine/tb_ecdsa.c
+++ b/crypto/engine/tb_ecdsa.c
@@ -52,8 +52,6 @@
  *
  */
 
-#include <openssl/evp.h>
-#include <openssl/engine.h>
 #include "eng_int.h"
 
 /* If this symbol is defined then ENGINE_get_default_ECDSA(), the function that is

diff --git a/crypto/engine/tb_rand.c b/crypto/engine/tb_rand.c
index 69b67111bc64d12ebff16632763785993ceebc56..f36f67c0f6f40b72ff7790175565a3c91e6121bd 100644 (file)
--- a/crypto/engine/tb_rand.c
+++ b/crypto/engine/tb_rand.c
@@ -52,8 +52,6 @@
  *
  */
 
-#include <openssl/evp.h>
-#include <openssl/engine.h>
 #include "eng_int.h"
 
 /* If this symbol is defined then ENGINE_get_default_RAND(), the function that is

diff --git a/crypto/engine/tb_rsa.c b/crypto/engine/tb_rsa.c
index fee4867f5209e0f7f3be81804f038dce03b91148..fbc707fd26c9b6ec45a0aae41a408077b764d209 100644 (file)
--- a/crypto/engine/tb_rsa.c
+++ b/crypto/engine/tb_rsa.c
@@ -52,8 +52,6 @@
  *
  */
 
-#include <openssl/evp.h>
-#include <openssl/engine.h>
 #include "eng_int.h"
 
 /* If this symbol is defined then ENGINE_get_default_RSA(), the function that is

diff --git a/crypto/engine/tb_store.c b/crypto/engine/tb_store.c
index 6cc6d759d98ab76051bdccd86b75f91fa0152c07..8cc435c935f225e679bdb2c5a14ad0c404930516 100644 (file)
--- a/crypto/engine/tb_store.c
+++ b/crypto/engine/tb_store.c
@@ -52,8 +52,6 @@
  *
  */
 
-#include <openssl/evp.h>
-#include <openssl/engine.h>
 #include "eng_int.h"
 
 /* If this symbol is defined then ENGINE_get_default_STORE(), the function that is

diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c
index a82090ead2f97cc875831853adf6da599910a014..dd63e09e55ec7b75dd003b0042d623abdf1b065a 100644 (file)
--- a/crypto/evp/evp_pkey.c
+++ b/crypto/evp/evp_pkey.c
@@ -61,6 +61,8 @@
 #include "cryptlib.h"
 #include <openssl/x509.h>
 #include <openssl/rand.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
 
 #ifndef OPENSSL_NO_DSA
 static int dsa_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8inf, EVP_PKEY *pkey);

diff --git a/crypto/evp/m_dss.c b/crypto/evp/m_dss.c
index beb8d7fc5c934b36ac26062a789e544bd3b82a6b..c4c5f0bbe691f71fe9ff0d9b05489c5ebc68aa93 100644 (file)
--- a/crypto/evp/m_dss.c
+++ b/crypto/evp/m_dss.c
@@ -61,6 +61,7 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
+#include <openssl/dsa.h>
 
 #ifndef OPENSSL_NO_SHA
 static int init(EVP_MD_CTX *ctx)

diff --git a/crypto/evp/m_dss1.c b/crypto/evp/m_dss1.c
index 9a0ebe0a509b7a8920ccea9b7dc45c70cd6d8a45..6b65bfd54b88ec7ef15e430f70ff3008c7afdb21 100644 (file)
--- a/crypto/evp/m_dss1.c
+++ b/crypto/evp/m_dss1.c
@@ -64,6 +64,7 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
+#include <openssl/dsa.h>
 
 static int init(EVP_MD_CTX *ctx)
        { return SHA1_Init(ctx->md_data); }

diff --git a/crypto/evp/m_md2.c b/crypto/evp/m_md2.c
index 38ce7f8cd71f46feee2367d507f68633ed711bdb..e577d26411b6ddd6eb1430877c116e77de3d3949 100644 (file)
--- a/crypto/evp/m_md2.c
+++ b/crypto/evp/m_md2.c
@@ -65,6 +65,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/md2.h>
+#include <openssl/rsa.h>
 
 static int init(EVP_MD_CTX *ctx)
        { return MD2_Init(ctx->md_data); }

diff --git a/crypto/evp/m_md4.c b/crypto/evp/m_md4.c
index a3f6be4f3b72283de6a9c09d10ee8261aa7542d5..787d6554c1b7b7feb8cb965267c2b9ee1906d0c7 100644 (file)
--- a/crypto/evp/m_md4.c
+++ b/crypto/evp/m_md4.c
@@ -65,6 +65,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/md4.h>
+#include <openssl/rsa.h>
 
 static int init(EVP_MD_CTX *ctx)
        { return MD4_Init(ctx->md_data); }

diff --git a/crypto/evp/m_md5.c b/crypto/evp/m_md5.c
index cc4216a538610e99e082cb4aa9996109711d72de..a214315abe5c91cb14be55d48fcbc02ec69d56e2 100644 (file)
--- a/crypto/evp/m_md5.c
+++ b/crypto/evp/m_md5.c
@@ -65,6 +65,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/md5.h>
+#include <openssl/rsa.h>
 
 static int init(EVP_MD_CTX *ctx)
        { return MD5_Init(ctx->md_data); }

diff --git a/crypto/evp/m_mdc2.c b/crypto/evp/m_mdc2.c
index 58df547e0c2b2458cf61bc157d2f0930948358e4..14e8175790e9ff8b0018a6e5f6288c5739bb73d6 100644 (file)
--- a/crypto/evp/m_mdc2.c
+++ b/crypto/evp/m_mdc2.c
@@ -65,6 +65,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/mdc2.h>
+#include <openssl/rsa.h>
 
 static int init(EVP_MD_CTX *ctx)
        { return MDC2_Init(ctx->md_data); }

diff --git a/crypto/evp/m_ripemd.c b/crypto/evp/m_ripemd.c
index ca8ed75851dc5fb10524185fadc56618e72e6968..93910a44abf632591f68aebe4cda20070ccdcc40 100644 (file)
--- a/crypto/evp/m_ripemd.c
+++ b/crypto/evp/m_ripemd.c
@@ -65,6 +65,7 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
+#include <openssl/rsa.h>
 
 static int init(EVP_MD_CTX *ctx)
        { return RIPEMD160_Init(ctx->md_data); }

diff --git a/crypto/evp/m_sha.c b/crypto/evp/m_sha.c
index a3343bb2eb8e87847089b0417429278f15bd28e3..f3b96107578e3b0dcb437532143c064a99438477 100644 (file)
--- a/crypto/evp/m_sha.c
+++ b/crypto/evp/m_sha.c
@@ -64,6 +64,7 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
+#include <openssl/rsa.h>
 
 static int init(EVP_MD_CTX *ctx)
        { return SHA_Init(ctx->md_data); }

diff --git a/crypto/evp/m_sha1.c b/crypto/evp/m_sha1.c
index 838225bf842d2cda352495950c83ef817dd55d96..364b3688779fa11f502a71c570d9e2ead43cfa69 100644 (file)
--- a/crypto/evp/m_sha1.c
+++ b/crypto/evp/m_sha1.c
@@ -64,6 +64,7 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
+#include <openssl/rsa.h>
 
 static int init(EVP_MD_CTX *ctx)
        { return SHA1_Init(ctx->md_data); }

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index d6d7234cd5d41b6c57d690692e63c68dc9155083..934f8ff8be3ef23ada717531b36264b3f130ca74 100644 (file)
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -64,6 +64,9 @@
 #include <openssl/evp.h>
 #include <openssl/asn1_mac.h>
 #include <openssl/x509.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/dh.h>
 
 static void EVP_PKEY_free_it(EVP_PKEY *x);
 

diff --git a/crypto/evp/p_open.c b/crypto/evp/p_open.c
index 8ec6c75a1399ec1709956623c0e3dc8a8e926859..9935206d0f3d0fe55641993fd353e5a85fea1441 100644 (file)
--- a/crypto/evp/p_open.c
+++ b/crypto/evp/p_open.c
@@ -64,6 +64,7 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
+#include <openssl/rsa.h>
 
 int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
        const unsigned char *ek, int ekl, const unsigned char *iv,

diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index f68cf84525951e44097e88a8a1d56710972771c3..8914218fe8f9c00430d9ab66af4be84e11c376d0 100644 (file)
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -138,12 +138,8 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/buffer.h>
-#include <openssl/bio.h>
-#include <openssl/lhash.h>
 #include "cryptlib.h"
+#include <openssl/lhash.h>
 
 /* What an "implementation of ex_data functionality" looks like */
 struct st_CRYPTO_EX_DATA_IMPL

diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c
index 60f5188f309e5af482ca9f2a7788b0bfaabb7909..a4357d591cb30564e3a76695de1865d9002755d6 100644 (file)
--- a/crypto/pem/pem_all.c
+++ b/crypto/pem/pem_all.c
@@ -117,6 +117,9 @@
 #include <openssl/x509.h>
 #include <openssl/pkcs7.h>
 #include <openssl/pem.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/dh.h>
 
 #ifndef OPENSSL_NO_RSA
 static RSA *pkey_get_rsa(EVP_PKEY *key, RSA **rsa);

diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c
index 17ea85e4d79c260052ebde437fa61d4e7b816eb6..7eba3b26c1dd00ccfe53abe3badfdec6faa856aa 100644 (file)
--- a/crypto/pem/pem_info.c
+++ b/crypto/pem/pem_info.c
@@ -63,6 +63,8 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
 
 #ifndef OPENSSL_NO_FP_API
 STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u)

diff --git a/crypto/pem/pem_seal.c b/crypto/pem/pem_seal.c
index 56e08abd705373541cb0e031a8f500ea0f68c13c..0458093353a4bb8b71855bc38ea4a1fe0ea05df4 100644 (file)
--- a/crypto/pem/pem_seal.c
+++ b/crypto/pem/pem_seal.c
@@ -64,6 +64,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
+#include <openssl/rsa.h>
 
 int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, EVP_MD *md_type,
             unsigned char **ek, int *ekl, unsigned char *iv, EVP_PKEY **pubk,

diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index b73a699598fe68370b9751cf91782fd3a36f50df..edf1cd49395b5d581c054cc8ce17d1bb06cc0047 100644 (file)
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -79,14 +79,6 @@
 #include <openssl/asn1.h>
 #include <openssl/safestack.h>
 
-#ifndef OPENSSL_NO_RSA
-#include <openssl/rsa.h>
-#endif
-
-#ifndef OPENSSL_NO_DSA
-#include <openssl/dsa.h>
-#endif
-
 #ifndef OPENSSL_NO_EC
 #include <openssl/ec.h>
 #endif
@@ -99,9 +91,18 @@
 #include <openssl/ecdh.h>
 #endif
 
+#ifndef OPENSSL_NO_DEPRECATED
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
+#endif
+#ifndef OPENSSL_NO_DSA
+#include <openssl/dsa.h>
+#endif
 #ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
 #endif
+#endif
+
 #ifndef OPENSSL_NO_SHA
 #include <openssl/sha.h>
 #endif

diff --git a/crypto/x509/x_all.c b/crypto/x509/x_all.c
index 801df78f087b67b438a9c0bbee82c3a092aaa684..eb33e0f6e6710e13ea36ec3d065f6a8bac455d4d 100644 (file)
--- a/crypto/x509/x_all.c
+++ b/crypto/x509/x_all.c
@@ -64,6 +64,8 @@
 #include <openssl/asn1.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
 
 int X509_verify(X509 *a, EVP_PKEY *r)
        {

diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c
index 4a86ac2dd6a7152baf70240080685378d1cfe44d..075e49dc8379ffe92e5203dd68845770761c9d70 100644 (file)
--- a/ssl/s2_lib.c
+++ b/ssl/s2_lib.c
@@ -59,7 +59,6 @@
 #include "ssl_locl.h"
 #ifndef OPENSSL_NO_SSL2
 #include <stdio.h>
-#include <openssl/rsa.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/md5.h>

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 09f6c8d3ab02a0506cdfeb3d9bc490a67daf4b66..8feb24a1424500ff5cc5bf668e17061aae17087c 100644 (file)
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -130,6 +130,7 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/md5.h>
+#include <openssl/dh.h>
 
 static SSL_METHOD *ssl3_get_client_method(int ver);
 static int ssl3_client_hello(SSL *s);

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 1ff9e3093ba86aba6ecaeb4419f11d438ac8da40..adeb3418a93b4730a42f7002b39681462413a565 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -127,6 +127,7 @@
 #include "ssl_locl.h"
 #include "kssl_lcl.h"
 #include <openssl/md5.h>
+#include <openssl/dh.h>
 
 const char *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT;
 

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index be92932bb6b2cb65d9dad47f771cb4ce39ef8680..cd96d67db7319d673c350d2b5aeba4ae15b67bc9 100644 (file)
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -133,6 +133,7 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
+#include <openssl/dh.h>
 #ifndef OPENSSL_NO_KRB5
 #include <openssl/krb5_asn.h>
 #endif

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 9fa4e616337571d3d243ebf93a8e93506b509d9d..aa074e499db36df1610fa0d12a08cd3687b04c7d 100644 (file)
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -133,6 +133,7 @@
 #include <openssl/bio.h>
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
+#include <openssl/dh.h>
 #include "ssl_locl.h"
 
 int SSL_get_ex_data_X509_STORE_CTX_idx(void)

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index b7b2e4086a250fc65da73476600035d14c92e6a0..7da3dda900a40ffdc11ce2bb021b2eb0ec1e6207 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -125,6 +125,7 @@
 #include <openssl/objects.h>
 #include <openssl/lhash.h>
 #include <openssl/x509v3.h>
+#include <openssl/dh.h>
 
 const char *SSL_version_str=OPENSSL_VERSION_TEXT;
 

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 26e518ade72e46bc460ee0ef33518ec9f846ac40..9b03123ab1154b4aa82d3d5c0d556497a08fa4d3 100644 (file)
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -130,6 +130,8 @@
 #include <openssl/evp.h>
 #include <openssl/stack.h>
 #include <openssl/x509.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 #include <openssl/symhacks.h>

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 68eb6545725e25e576fe1761684c432242585621..9e95bf6a6e67cc5c3c1760a29cc7283b7da0bedd 100644 (file)
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -138,6 +138,9 @@
 #endif
 #include <openssl/err.h>
 #include <openssl/rand.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/dh.h>
 
 #define _XOPEN_SOURCE_EXTENDED 1 /* Or gethostname won't be declared properly
                                     on Compaq platforms (at least with DEC C).