diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2004-04-19 17:46:04 +0000 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2004-04-19 17:46:04 +0000 |
| commit | 3a87a9b9db07f8d3c6d9aa7f20e01f053007a703 (patch) | |
| tree | 543949ed3523920985fe649a5ebe3945c8112391 /engines | |
| parent | ae44fc1ec4c0d6c125c28f52dc06e9ae87c59c4c (diff) | |
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.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/e_4758_cca.c | 2 | ||||
| -rw-r--r-- | engines/e_aep.c | 5 | ||||
| -rw-r--r-- | engines/e_atalla.c | 3 | ||||
| -rw-r--r-- | engines/e_cswift.c | 4 | ||||
| -rw-r--r-- | engines/e_ncipher.c | 1 | ||||
| -rw-r--r-- | engines/e_nuron.c | 4 | ||||
| -rw-r--r-- | engines/e_sureware.c | 1 | ||||
| -rw-r--r-- | engines/e_ubsec.c | 3 |
8 files changed, 18 insertions, 5 deletions
diff --git a/engines/e_4758_cca.c b/engines/e_4758_cca.c index b006ed8763..3c8e5f6193 100644 --- a/engines/e_4758_cca.c +++ b/engines/e_4758_cca.c @@ -56,11 +56,11 @@ #include <stdio.h> #include <string.h> #include <openssl/crypto.h> -/* #include <openssl/pem.h> */ #include <openssl/dso.h> #include <openssl/x509.h> #include <openssl/objects.h> #include <openssl/engine.h> +#include <openssl/rand.h> #ifndef OPENSSL_NO_HW #ifndef OPENSSL_NO_HW_4758_CCA diff --git a/engines/e_aep.c b/engines/e_aep.c index aa4fe75704..5e66fb1f83 100644 --- a/engines/e_aep.c +++ b/engines/e_aep.c @@ -1,6 +1,3 @@ -/* crypto/engine/hw_aep.c */ -/* - */ /* ==================================================================== * Copyright (c) 1999 The OpenSSL Project. All rights reserved. * @@ -72,6 +69,8 @@ typedef int pid_t; #include <openssl/dso.h> #include <openssl/engine.h> #include <openssl/buffer.h> +#include <openssl/rsa.h> +#include <openssl/dsa.h> #ifndef OPENSSL_NO_HW #ifndef OPENSSL_NO_HW_AEP diff --git a/engines/e_atalla.c b/engines/e_atalla.c index cc6c9695f0..82dae45867 100644 --- a/engines/e_atalla.c +++ b/engines/e_atalla.c @@ -62,6 +62,9 @@ #include <openssl/buffer.h> #include <openssl/dso.h> #include <openssl/engine.h> +#include <openssl/rsa.h> +#include <openssl/dsa.h> +#include <openssl/dh.h> #ifndef OPENSSL_NO_HW #ifndef OPENSSL_NO_HW_ATALLA diff --git a/engines/e_cswift.c b/engines/e_cswift.c index cc39cd4947..b73126b037 100644 --- a/engines/e_cswift.c +++ b/engines/e_cswift.c @@ -62,6 +62,10 @@ #include <openssl/buffer.h> #include <openssl/dso.h> #include <openssl/engine.h> +#include <openssl/rsa.h> +#include <openssl/dsa.h> +#include <openssl/dh.h> +#include <openssl/rand.h> #ifndef OPENSSL_NO_HW #ifndef OPENSSL_NO_HW_CSWIFT diff --git a/engines/e_ncipher.c b/engines/e_ncipher.c index e075d1b459..481c9b0997 100644 --- a/engines/e_ncipher.c +++ b/engines/e_ncipher.c @@ -64,6 +64,7 @@ #include <openssl/dso.h> #include <openssl/engine.h> #include <openssl/ui.h> +#include <openssl/rand.h> #ifndef OPENSSL_NO_HW #ifndef OPENSSL_NO_HW_NCIPHER diff --git a/engines/e_nuron.c b/engines/e_nuron.c index 4df6f0495a..3ddbf594df 100644 --- a/engines/e_nuron.c +++ b/engines/e_nuron.c @@ -62,7 +62,9 @@ #include <openssl/buffer.h> #include <openssl/dso.h> #include <openssl/engine.h> - +#include <openssl/rsa.h> +#include <openssl/dsa.h> +#include <openssl/dh.h> #ifndef OPENSSL_NO_HW #ifndef OPENSSL_NO_HW_NURON diff --git a/engines/e_sureware.c b/engines/e_sureware.c index 8e77e5c282..654f41031a 100644 --- a/engines/e_sureware.c +++ b/engines/e_sureware.c @@ -56,6 +56,7 @@ #include <openssl/pem.h> #include <openssl/dso.h> #include <openssl/engine.h> +#include <openssl/rand.h> #ifndef OPENSSL_NO_HW #ifndef OPENSSL_NO_HW_SUREWARE diff --git a/engines/e_ubsec.c b/engines/e_ubsec.c index 5aa29f1c53..37c22638ff 100644 --- a/engines/e_ubsec.c +++ b/engines/e_ubsec.c @@ -64,6 +64,9 @@ #include <openssl/buffer.h> #include <openssl/dso.h> #include <openssl/engine.h> +#include <openssl/rsa.h> +#include <openssl/dsa.h> +#include <openssl/dh.h> #ifndef OPENSSL_NO_HW #ifndef OPENSSL_NO_HW_UBSEC |