diff options
author | Geoff Thorpe <geoff@openssl.org> | 2004-04-19 18:09:28 +0000 |
---|---|---|
committer | Geoff Thorpe <geoff@openssl.org> | 2004-04-19 18:09:28 +0000 |
commit | 60a938c6bca4c0890ed2d320e29fb43c970094d5 (patch) | |
tree | b4d6fa7ae1a0c24e30e9ef5edcec0d5a88fd9f5f /crypto/engine | |
parent | 3a87a9b9db07f8d3c6d9aa7f20e01f053007a703 (diff) |
(oops) Apologies all, that last header-cleanup commit was from the wrong
tree. This further reduces header interdependencies, and makes some
associated cleanups.
Diffstat (limited to 'crypto/engine')
-rw-r--r-- | crypto/engine/eng_all.c | 3 | ||||
-rw-r--r-- | crypto/engine/eng_cnf.c | 5 | ||||
-rw-r--r-- | crypto/engine/eng_ctrl.c | 3 | ||||
-rw-r--r-- | crypto/engine/eng_dyn.c | 4 | ||||
-rw-r--r-- | crypto/engine/eng_fat.c | 3 | ||||
-rw-r--r-- | crypto/engine/eng_init.c | 3 | ||||
-rw-r--r-- | crypto/engine/eng_int.h | 1 | ||||
-rw-r--r-- | crypto/engine/eng_lib.c | 5 | ||||
-rw-r--r-- | crypto/engine/eng_list.c | 3 | ||||
-rw-r--r-- | crypto/engine/eng_pkey.c | 3 | ||||
-rw-r--r-- | crypto/engine/tb_cipher.c | 2 | ||||
-rw-r--r-- | crypto/engine/tb_dh.c | 2 | ||||
-rw-r--r-- | crypto/engine/tb_digest.c | 2 | ||||
-rw-r--r-- | crypto/engine/tb_dsa.c | 2 | ||||
-rw-r--r-- | crypto/engine/tb_ecdh.c | 2 | ||||
-rw-r--r-- | crypto/engine/tb_ecdsa.c | 2 | ||||
-rw-r--r-- | crypto/engine/tb_rand.c | 2 | ||||
-rw-r--r-- | crypto/engine/tb_rsa.c | 2 | ||||
-rw-r--r-- | crypto/engine/tb_store.c | 2 |
19 files changed, 4 insertions, 47 deletions
diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c index 64ec2db901..1f28b4078b 100644 --- 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 cdf670901a..8567f26675 100644 --- 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 1a808bec41..18527484ce 100644 --- 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 3cb46856cc..290b8bd395 100644 --- 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 1539ea039f..27c1662f62 100644 --- 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 170c1791b3..2843e4f0e4 100644 --- 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 395c7fff1a..a5b1edebf4 100644 --- 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 66ab06de74..7b3686ddc0 100644 --- 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 f94d593b06..67d67df3ce 100644 --- 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 8c69171511..bc8b21abec 100644 --- 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 50b3cec1fa..177fc1fb73 100644 --- 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 e290e1702b..6e9d428761 100644 --- 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 e82d2a17c9..d3f4bb2747 100644 --- 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 80170591f2..d326a5f6da 100644 --- 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 f40eb006eb..59977f7dd0 100644 --- 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 76deefcdc5..e30b02e8c5 100644 --- 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 69b67111bc..f36f67c0f6 100644 --- 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 fee4867f52..fbc707fd26 100644 --- 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 6cc6d759d9..8cc435c935 100644 --- 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 |