Reduce the header dependencies on engine.h in apps/.

diff --git a/apps/apps.c b/apps/apps.c
index 4d04ea21d1c65ee6410e3ace480e08e30f6297fc..628405ef1bf0112e32134e69a57cc94a606eaeba 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -71,6 +71,7 @@
 #include <openssl/pkcs12.h>
 #include <openssl/ui.h>
 #include <openssl/safestack.h>
 #include <openssl/pkcs12.h>
 #include <openssl/ui.h>
 #include <openssl/safestack.h>

+#include <openssl/engine.h>

 
 #ifdef OPENSSL_SYS_WINDOWS
 #define strcasecmp _stricmp
 
 #ifdef OPENSSL_SYS_WINDOWS
 #define strcasecmp _stricmp

diff --git a/apps/apps.h b/apps/apps.h
index 191097ffa7c18e208044590c83121404a160d603..634775d35d184f145cb04194711e9ae8d613c5a6 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -67,8 +67,8 @@
 #include <openssl/x509.h>
 #include <openssl/lhash.h>
 #include <openssl/conf.h>
 #include <openssl/x509.h>
 #include <openssl/lhash.h>
 #include <openssl/conf.h>

-#include <openssl/engine.h>

 #include <openssl/txt_db.h>
 #include <openssl/txt_db.h>

+#include <openssl/types.h>

 
 int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn);
 int app_RAND_write_file(const char *file, BIO *bio_e);
 
 int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn);
 int app_RAND_write_file(const char *file, BIO *bio_e);

diff --git a/apps/ca.c b/apps/ca.c
index d41a9d5fc64ea3db7b22934d5b699c0b46454351..481bfc77d758412c543b41ef79ef886d29ed31d1 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -76,7 +76,6 @@
 #include <openssl/objects.h>
 #include <openssl/ocsp.h>
 #include <openssl/pem.h>
 #include <openssl/objects.h>
 #include <openssl/ocsp.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>

 
 #ifdef OPENSSL_SYS_WINDOWS
 #define strcasecmp _stricmp
 
 #ifdef OPENSSL_SYS_WINDOWS
 #define strcasecmp _stricmp

diff --git a/apps/dgst.c b/apps/dgst.c
index e3edf302c3ac9c953e61a02ca3bfb6ae64896884..7989a1dcd38604c16864f5c1d420a5c1b733c6ea 100644 (file)
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -66,7 +66,6 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>

 
 #undef BUFSIZE
 #define BUFSIZE        1024*8
 
 #undef BUFSIZE
 #define BUFSIZE        1024*8

diff --git a/apps/dh.c b/apps/dh.c
index 603ea5b496d8f4e315db317cff4308b4eeafd8c7..dc854264f0bddcb40e012373ef0e0480485521e9 100644 (file)
--- a/apps/dh.c
+++ b/apps/dh.c
@@ -69,7 +69,6 @@
 #include <openssl/dh.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/dh.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>

 
 #undef PROG
 #define PROG   dh_main
 
 #undef PROG
 #define PROG   dh_main

diff --git a/apps/dhparam.c b/apps/dhparam.c
index 00cf87bf6d47ff9a14687b6210f4ef889a22d6f0..e55d0ce0cbbcc8a268c2f9bb86e24b2d0a5db8e4 100644 (file)
--- a/apps/dhparam.c
+++ b/apps/dhparam.c
@@ -121,7 +121,6 @@
 #include <openssl/dh.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/dh.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>

 
 #ifndef OPENSSL_NO_DSA
 #include <openssl/dsa.h>
 
 #ifndef OPENSSL_NO_DSA
 #include <openssl/dsa.h>

diff --git a/apps/dsa.c b/apps/dsa.c
index 09ddb23996eb0cc4fb732ff14ed209f5c629c620..59aa0ea106e6086c45b95a589a5774d352d0566f 100644 (file)
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -68,7 +68,6 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>

 
 #undef PROG
 #define PROG   dsa_main
 
 #undef PROG
 #define PROG   dsa_main

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 4196413217f0e4499528589e06ecdcff23c71265..84a5ac6286ac129ca99f51e91c5db66c9a130c67 100644 (file)
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -69,7 +69,6 @@
 #include <openssl/dsa.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/dsa.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>

 
 #undef PROG
 #define PROG   dsaparam_main
 
 #undef PROG
 #define PROG   dsaparam_main

diff --git a/apps/enc.c b/apps/enc.c
index 3c72d05c6ca43a77bc1dc8d42292e9ee96e72c05..a8b33874b0a068dccf535ebd3b77e74780319f45 100644 (file)
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -67,7 +67,6 @@
 #include <openssl/x509.h>
 #include <openssl/rand.h>
 #include <openssl/pem.h>
 #include <openssl/x509.h>
 #include <openssl/rand.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>

 #include <ctype.h>
 
 int set_hex(char *in,unsigned char *out,int size);
 #include <ctype.h>
 
 int set_hex(char *in,unsigned char *out,int size);

diff --git a/apps/gendh.c b/apps/gendh.c
index e8f8493c5f49ba9c42f2db522c8a7a7e55ec5861..83cbff912007705bc469a81b58c9f7f1766ca341 100644 (file)
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -70,7 +70,6 @@
 #include <openssl/dh.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/dh.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>

 
 #define DEFBITS        512
 #undef PROG
 
 #define DEFBITS        512
 #undef PROG

diff --git a/apps/gendsa.c b/apps/gendsa.c
index b990eecbd24b82f2b81e1d1f4d24e6479e9fa5b1..6b741429911c2b34ad1f3d3a6349eef6b9d44385 100644 (file)
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -68,7 +68,6 @@
 #include <openssl/dsa.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/dsa.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>

 
 #define DEFBITS        512
 #undef PROG
 
 #define DEFBITS        512
 #undef PROG

diff --git a/apps/genrsa.c b/apps/genrsa.c
index a5669de7ce38f6322fbb220a614ff5a6a4af06c6..b5ae1beacf1fee70fdeaf42b6460a51080656df2 100644 (file)
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -69,7 +69,7 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>
+#include <openssl/rand.h>

 
 #define DEFBITS        512
 #undef PROG
 
 #define DEFBITS        512
 #undef PROG

diff --git a/apps/openssl.c b/apps/openssl.c
index 0e179d9c339152a6eb669e9ce454360fe71d1c8a..1b3ffe4041061936fc339b981cdbf2b55468facf 100644 (file)
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -121,6 +121,7 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/ssl.h>

+#include <openssl/engine.h>

 #define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
 #include "apps.h"
 #include "progs.h"
 #define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
 #include "apps.h"
 #include "progs.h"

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index d90cf59df71fce49bbdff2e542fc8ff964d95203..cd9c02808ac292947d24f9b591501b2dced0e307 100644 (file)
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -66,7 +66,6 @@
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <openssl/pkcs12.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <openssl/pkcs12.h>

-#include <openssl/engine.h>

 
 #define PROG pkcs12_main
 
 
 #define PROG pkcs12_main
 

diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index a0b21341f5e028d4dff946f23781072815677547..1cc91509a2b017efce953a683dbe5949d2921c5f 100644 (file)
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -67,7 +67,6 @@
 #include <openssl/x509.h>
 #include <openssl/pkcs7.h>
 #include <openssl/pem.h>
 #include <openssl/x509.h>
 #include <openssl/pkcs7.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>

 
 #undef PROG
 #define PROG   pkcs7_main
 
 #undef PROG
 #define PROG   pkcs7_main

diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index cfc4851e00a6ddd3a8904cfc94bcdc40f3c6152c..c0becce9033776af57798a59529eb74cb8ba23ea 100644 (file)
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -62,7 +62,6 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/pkcs12.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/pkcs12.h>

-#include <openssl/engine.h>

 
 #include "apps.h"
 #define PROG pkcs8_main
 
 #include "apps.h"
 #define PROG pkcs8_main

diff --git a/apps/rand.c b/apps/rand.c
index faba057b772d9107f4396e4634990346fcfa6d3a..04eee81b179b679f4b3501e66e4d0a4807e55ec7 100644 (file)
--- a/apps/rand.c
+++ b/apps/rand.c
@@ -9,7 +9,6 @@
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>

-#include <openssl/engine.h>

 
 #undef PROG
 #define PROG rand_main
 
 #undef PROG
 #define PROG rand_main

diff --git a/apps/req.c b/apps/req.c
index 60f09551e5627aa8f0f5f1986762ad07191bf9d8..6fac16f97af3281af09850fdde661903d2d4ec75 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -73,7 +73,6 @@
 #include <openssl/x509v3.h>
 #include <openssl/objects.h>
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
 #include <openssl/objects.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>

 
 #define SECTION                "req"
 
 
 #define SECTION                "req"
 

diff --git a/apps/rsa.c b/apps/rsa.c
index 18964fedd2f00ed8428bcb30ea64acf549c06f77..8ae67bbac556ea2816afea0d2b03e4c20894e2eb 100644 (file)
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -68,7 +68,6 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>

 
 #undef PROG
 #define PROG   rsa_main
 
 #undef PROG
 #define PROG   rsa_main

diff --git a/apps/rsautl.c b/apps/rsautl.c
index 56025c5f0cc1719bcca6f5a36543139c85d31e42..c04a2fcb9b861614fde98157f9ded560d9f8581c 100644 (file)
--- a/apps/rsautl.c
+++ b/apps/rsautl.c
@@ -62,7 +62,6 @@
 #include <string.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <string.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>

 
 #define RSA_SIGN       1
 #define RSA_VERIFY     2
 
 #define RSA_SIGN       1
 #define RSA_VERIFY     2

diff --git a/apps/s_client.c b/apps/s_client.c
index ac5d2f10c20f597ba98f76386b15cf9ca03b9e31..7429a9b6410a64cd96b70678d7afbf8e7983bccf 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -80,7 +80,7 @@ typedef unsigned int u_int;
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>
+#include <openssl/rand.h>

 #include "s_apps.h"
 
 #ifdef OPENSSL_SYS_WINDOWS
 #include "s_apps.h"
 
 #ifdef OPENSSL_SYS_WINDOWS

diff --git a/apps/s_server.c b/apps/s_server.c
index d3685acfeb3900472bab946d4ec4b305ca6cbda4..cd1e8b4ee00ed9792be46bc28f375dc5e8413b35 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -84,7 +84,7 @@ typedef unsigned int u_int;
 #include <openssl/pem.h>
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
 #include <openssl/pem.h>
 #include <openssl/x509.h>
 #include <openssl/ssl.h>

-#include <openssl/engine.h>
+#include <openssl/rand.h>

 #include "s_apps.h"
 
 #ifdef OPENSSL_SYS_WINDOWS
 #include "s_apps.h"
 
 #ifdef OPENSSL_SYS_WINDOWS

diff --git a/apps/smime.c b/apps/smime.c
index 1ff4ed02fe8ee681639728d8758b655861f87d4e..7c4aac1ef2c5d16f8404ba5867c42eaaea0d3714 100644 (file)
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -64,7 +64,6 @@
 #include <openssl/crypto.h>
 #include <openssl/pem.h>
 #include <openssl/err.h>
 #include <openssl/crypto.h>
 #include <openssl/pem.h>
 #include <openssl/err.h>

-#include <openssl/engine.h>

 
 #undef PROG
 #define PROG smime_main
 
 #undef PROG
 #define PROG smime_main

diff --git a/apps/speed.c b/apps/speed.c
index 5c05e11d67028a81c8147a025bc158e962c26c70..1dd4e46b36791e4722fc1fc73a010d9fe8c462b2 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -81,7 +81,6 @@
 #include <openssl/crypto.h>
 #include <openssl/rand.h>
 #include <openssl/err.h>
 #include <openssl/crypto.h>
 #include <openssl/rand.h>
 #include <openssl/err.h>

-#include <openssl/engine.h>

 #include <openssl/evp.h>
 #include <openssl/objects.h>
 
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 

diff --git a/apps/spkac.c b/apps/spkac.c
index d43dc9f3b9b480b47f58e1209248a99d26a83ae6..fa5dc248c88734b2addc97d2a27421125cd072f5 100644 (file)
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -69,7 +69,6 @@
 #include <openssl/lhash.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/lhash.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>

 
 #undef PROG
 #define PROG   spkac_main
 
 #undef PROG
 #define PROG   spkac_main

diff --git a/apps/verify.c b/apps/verify.c
index b1a4dacb8b95d31bc0c0ff2b1c2863006293e4df..d4bf0693c837b6f07a5c6041aa39f1927d961816 100644 (file)
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -65,7 +65,6 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include <openssl/pem.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>

 
 #undef PROG
 #define PROG   verify_main
 
 #undef PROG
 #define PROG   verify_main

diff --git a/apps/x509.c b/apps/x509.c
index 65b072cc9aa9c6c804063ff7efa9b160cf0d1b18..b2ea09d52fbfb48f099d028cdb2f98fee7698583 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -73,7 +73,6 @@
 #include <openssl/x509v3.h>
 #include <openssl/objects.h>
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
 #include <openssl/objects.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>

 
 #undef PROG
 #define PROG x509_main
 
 #undef PROG
 #define PROG x509_main