From 1372965e2ebed49c810978e00be50006f1d7219a Mon Sep 17 00:00:00 2001 From: Geoff Thorpe Date: Wed, 12 Sep 2001 02:39:06 +0000 Subject: Reduce the header dependencies on engine.h in apps/. --- apps/apps.c | 1 + apps/apps.h | 2 +- apps/ca.c | 1 - apps/dgst.c | 1 - apps/dh.c | 1 - apps/dhparam.c | 1 - apps/dsa.c | 1 - apps/dsaparam.c | 1 - apps/enc.c | 1 - apps/gendh.c | 1 - apps/gendsa.c | 1 - apps/genrsa.c | 2 +- apps/openssl.c | 1 + apps/pkcs12.c | 1 - apps/pkcs7.c | 1 - apps/pkcs8.c | 1 - apps/rand.c | 1 - apps/req.c | 1 - apps/rsa.c | 1 - apps/rsautl.c | 1 - apps/s_client.c | 2 +- apps/s_server.c | 2 +- apps/smime.c | 1 - apps/speed.c | 1 - apps/spkac.c | 1 - apps/verify.c | 1 - apps/x509.c | 1 - 27 files changed, 6 insertions(+), 25 deletions(-) (limited to 'apps') diff --git a/apps/apps.c b/apps/apps.c index 4d04ea21d1..628405ef1b 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -71,6 +71,7 @@ #include #include #include +#include #ifdef OPENSSL_SYS_WINDOWS #define strcasecmp _stricmp diff --git a/apps/apps.h b/apps/apps.h index 191097ffa7..634775d35d 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -67,8 +67,8 @@ #include #include #include -#include #include +#include 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 d41a9d5fc6..481bfc77d7 100644 --- a/apps/ca.c +++ b/apps/ca.c @@ -76,7 +76,6 @@ #include #include #include -#include #ifdef OPENSSL_SYS_WINDOWS #define strcasecmp _stricmp diff --git a/apps/dgst.c b/apps/dgst.c index e3edf302c3..7989a1dcd3 100644 --- a/apps/dgst.c +++ b/apps/dgst.c @@ -66,7 +66,6 @@ #include #include #include -#include #undef BUFSIZE #define BUFSIZE 1024*8 diff --git a/apps/dh.c b/apps/dh.c index 603ea5b496..dc854264f0 100644 --- a/apps/dh.c +++ b/apps/dh.c @@ -69,7 +69,6 @@ #include #include #include -#include #undef PROG #define PROG dh_main diff --git a/apps/dhparam.c b/apps/dhparam.c index 00cf87bf6d..e55d0ce0cb 100644 --- a/apps/dhparam.c +++ b/apps/dhparam.c @@ -121,7 +121,6 @@ #include #include #include -#include #ifndef OPENSSL_NO_DSA #include diff --git a/apps/dsa.c b/apps/dsa.c index 09ddb23996..59aa0ea106 100644 --- a/apps/dsa.c +++ b/apps/dsa.c @@ -68,7 +68,6 @@ #include #include #include -#include #undef PROG #define PROG dsa_main diff --git a/apps/dsaparam.c b/apps/dsaparam.c index 4196413217..84a5ac6286 100644 --- a/apps/dsaparam.c +++ b/apps/dsaparam.c @@ -69,7 +69,6 @@ #include #include #include -#include #undef PROG #define PROG dsaparam_main diff --git a/apps/enc.c b/apps/enc.c index 3c72d05c6c..a8b33874b0 100644 --- a/apps/enc.c +++ b/apps/enc.c @@ -67,7 +67,6 @@ #include #include #include -#include #include int set_hex(char *in,unsigned char *out,int size); diff --git a/apps/gendh.c b/apps/gendh.c index e8f8493c5f..83cbff9120 100644 --- a/apps/gendh.c +++ b/apps/gendh.c @@ -70,7 +70,6 @@ #include #include #include -#include #define DEFBITS 512 #undef PROG diff --git a/apps/gendsa.c b/apps/gendsa.c index b990eecbd2..6b74142991 100644 --- a/apps/gendsa.c +++ b/apps/gendsa.c @@ -68,7 +68,6 @@ #include #include #include -#include #define DEFBITS 512 #undef PROG diff --git a/apps/genrsa.c b/apps/genrsa.c index a5669de7ce..b5ae1beacf 100644 --- a/apps/genrsa.c +++ b/apps/genrsa.c @@ -69,7 +69,7 @@ #include #include #include -#include +#include #define DEFBITS 512 #undef PROG diff --git a/apps/openssl.c b/apps/openssl.c index 0e179d9c33..1b3ffe4041 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -121,6 +121,7 @@ #include #include #include +#include #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 d90cf59df7..cd9c02808a 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -66,7 +66,6 @@ #include #include #include -#include #define PROG pkcs12_main diff --git a/apps/pkcs7.c b/apps/pkcs7.c index a0b21341f5..1cc91509a2 100644 --- a/apps/pkcs7.c +++ b/apps/pkcs7.c @@ -67,7 +67,6 @@ #include #include #include -#include #undef PROG #define PROG pkcs7_main diff --git a/apps/pkcs8.c b/apps/pkcs8.c index cfc4851e00..c0becce903 100644 --- a/apps/pkcs8.c +++ b/apps/pkcs8.c @@ -62,7 +62,6 @@ #include #include #include -#include #include "apps.h" #define PROG pkcs8_main diff --git a/apps/rand.c b/apps/rand.c index faba057b77..04eee81b17 100644 --- a/apps/rand.c +++ b/apps/rand.c @@ -9,7 +9,6 @@ #include #include #include -#include #undef PROG #define PROG rand_main diff --git a/apps/req.c b/apps/req.c index 60f09551e5..6fac16f97a 100644 --- a/apps/req.c +++ b/apps/req.c @@ -73,7 +73,6 @@ #include #include #include -#include #define SECTION "req" diff --git a/apps/rsa.c b/apps/rsa.c index 18964fedd2..8ae67bbac5 100644 --- a/apps/rsa.c +++ b/apps/rsa.c @@ -68,7 +68,6 @@ #include #include #include -#include #undef PROG #define PROG rsa_main diff --git a/apps/rsautl.c b/apps/rsautl.c index 56025c5f0c..c04a2fcb9b 100644 --- a/apps/rsautl.c +++ b/apps/rsautl.c @@ -62,7 +62,6 @@ #include #include #include -#include #define RSA_SIGN 1 #define RSA_VERIFY 2 diff --git a/apps/s_client.c b/apps/s_client.c index ac5d2f10c2..7429a9b641 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -80,7 +80,7 @@ typedef unsigned int u_int; #include #include #include -#include +#include #include "s_apps.h" #ifdef OPENSSL_SYS_WINDOWS diff --git a/apps/s_server.c b/apps/s_server.c index d3685acfeb..cd1e8b4ee0 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -84,7 +84,7 @@ typedef unsigned int u_int; #include #include #include -#include +#include #include "s_apps.h" #ifdef OPENSSL_SYS_WINDOWS diff --git a/apps/smime.c b/apps/smime.c index 1ff4ed02fe..7c4aac1ef2 100644 --- a/apps/smime.c +++ b/apps/smime.c @@ -64,7 +64,6 @@ #include #include #include -#include #undef PROG #define PROG smime_main diff --git a/apps/speed.c b/apps/speed.c index 5c05e11d67..1dd4e46b36 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -81,7 +81,6 @@ #include #include #include -#include #include #include diff --git a/apps/spkac.c b/apps/spkac.c index d43dc9f3b9..fa5dc248c8 100644 --- a/apps/spkac.c +++ b/apps/spkac.c @@ -69,7 +69,6 @@ #include #include #include -#include #undef PROG #define PROG spkac_main diff --git a/apps/verify.c b/apps/verify.c index b1a4dacb8b..d4bf0693c8 100644 --- a/apps/verify.c +++ b/apps/verify.c @@ -65,7 +65,6 @@ #include #include #include -#include #undef PROG #define PROG verify_main diff --git a/apps/x509.c b/apps/x509.c index 65b072cc9a..b2ea09d52f 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -73,7 +73,6 @@ #include #include #include -#include #undef PROG #define PROG x509_main -- cgit v1.2.3