We seem to carry some rests of the 0.9.6 [engine] ENGINE framework in form

of unneeded includes of openssl/engine.h.

diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
index 28c20750bdf28734507e0d3156d085a82f6f9f6a..48e7be45c5cb7a08f500dae90ca9ca86a278a91c 100644 (file)
--- a/crypto/dh/dh_key.c
+++ b/crypto/dh/dh_key.c
@@ -61,9 +61,6 @@
 #include <openssl/bn.h>
 #include <openssl/rand.h>
 #include <openssl/dh.h>
 #include <openssl/bn.h>
 #include <openssl/rand.h>
 #include <openssl/dh.h>

-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif

 
 static int generate_key(DH *dh);
 static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh);
 
 static int generate_key(DH *dh);
 static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh);

diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c
index b6e08584a68758eb861dd1bf23051a88b11089b9..c3ad7a14abdf830f109d812171e28556497a9563 100644 (file)
--- a/crypto/dsa/dsa_ossl.c
+++ b/crypto/dsa/dsa_ossl.c
@@ -64,9 +64,6 @@
 #include <openssl/dsa.h>
 #include <openssl/rand.h>
 #include <openssl/asn1.h>
 #include <openssl/dsa.h>
 #include <openssl/rand.h>
 #include <openssl/asn1.h>

-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif

 
 static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa);
 static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp);
 
 static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa);
 static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp);

diff --git a/crypto/dsa/dsa_sign.c b/crypto/dsa/dsa_sign.c
index 5cdc8ed8511b32ab9fef3fea400d1a9230c09711..89205026f01b71d40a331013bee9ef897b72b6ac 100644 (file)
--- a/crypto/dsa/dsa_sign.c
+++ b/crypto/dsa/dsa_sign.c
@@ -64,9 +64,6 @@
 #include <openssl/dsa.h>
 #include <openssl/rand.h>
 #include <openssl/asn1.h>
 #include <openssl/dsa.h>
 #include <openssl/rand.h>
 #include <openssl/asn1.h>

-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif

 
 DSA_SIG * DSA_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
        {
 
 DSA_SIG * DSA_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
        {

diff --git a/crypto/dsa/dsa_vrf.c b/crypto/dsa/dsa_vrf.c
index fffb129f8f3b59515f6f92c45941abb7c65f3834..c4aeddd0560483686e504188226003b6f2266bfe 100644 (file)
--- a/crypto/dsa/dsa_vrf.c
+++ b/crypto/dsa/dsa_vrf.c
@@ -65,9 +65,6 @@
 #include <openssl/rand.h>
 #include <openssl/asn1.h>
 #include <openssl/asn1_mac.h>
 #include <openssl/rand.h>
 #include <openssl/asn1.h>
 #include <openssl/asn1_mac.h>

-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif

 
 int DSA_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
                  DSA *dsa)
 
 int DSA_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
                  DSA *dsa)

diff --git a/crypto/dsa/dsatest.c b/crypto/dsa/dsatest.c
index 53c73c5cc252c65aae0f738dd6b51aea2e2ed591..49c630b106d4bddba2333988aa831c5a60fe630e 100644 (file)
--- a/crypto/dsa/dsatest.c
+++ b/crypto/dsa/dsatest.c
@@ -74,10 +74,6 @@
 #include <openssl/rand.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>

-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#include <openssl/e_os2.h>
-#endif

 
 #ifdef OPENSSL_NO_DSA
 int main(int argc, char *argv[])
 
 #ifdef OPENSSL_NO_DSA
 int main(int argc, char *argv[])

diff --git a/crypto/evp/evp_acnf.c b/crypto/evp/evp_acnf.c
index 54c073ca444c2085799db6a87a546f12ee268098..ff3e311cc527567be283678fb95437cdc76bae2a 100644 (file)
--- a/crypto/evp/evp_acnf.c
+++ b/crypto/evp/evp_acnf.c
@@ -59,9 +59,6 @@
 #include "cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/conf.h>
 #include "cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/conf.h>

-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif

 
 
 /* Load all algorithms and configure OpenSSL.
 
 
 /* Load all algorithms and configure OpenSSL.

diff --git a/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c
index ad6ccf634d01f28cb5eb3b569a3ea94c612434fa..aff86343ccefcd54ad7e63af0b1ae842258da327 100644 (file)
--- a/crypto/rsa/rsa_eay.c
+++ b/crypto/rsa/rsa_eay.c
@@ -61,9 +61,6 @@
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
 #include <openssl/rand.h>
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
 #include <openssl/rand.h>

-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif

 
 #ifndef RSA_NULL
 
 
 #ifndef RSA_NULL
 

diff --git a/crypto/rsa/rsa_test.c b/crypto/rsa/rsa_test.c
index 99abb1fde782fc2748b6ac4cbd3bd6fae2a7b496..924e9ad1f6c0cf60d79228c644aad75de1e9be8b 100644 (file)
--- a/crypto/rsa/rsa_test.c
+++ b/crypto/rsa/rsa_test.c
@@ -16,9 +16,6 @@ int main(int argc, char *argv[])
 }
 #else
 #include <openssl/rsa.h>
 }
 #else
 #include <openssl/rsa.h>

-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif

 
 #define SetKey \
   key->n = BN_bin2bn(n, sizeof(n)-1, key->n); \
 
 #define SetKey \
   key->n = BN_bin2bn(n, sizeof(n)-1, key->n); \