Remove some unnecessary recursive includes from the internal apps.h header,

and include bn.h in those C files that need bignum functionality.

diff --git a/apps/apps.c b/apps/apps.c
index 6925ab4cdd84c6ce80b459b151c47f7ec95ab06b..3c3a11ce4de8e7e317bfd5e07f53e7e47fd15c48 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -126,6 +126,7 @@
 #include <openssl/engine.h>
 #endif
 #include <openssl/rsa.h>
+#include <openssl/bn.h>
 
 #define NON_MAIN
 #include "apps.h"

diff --git a/apps/apps.h b/apps/apps.h
index 6072a10bd3371d8df38b0a34169e7967a7a26f0d..e653bf1b46572bffa1245c0f2418a102b37fbc37 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -114,9 +114,7 @@
 
 #include "e_os.h"
 
-#include <openssl/buffer.h>
 #include <openssl/bio.h>
-#include <openssl/crypto.h>
 #include <openssl/x509.h>
 #include <openssl/lhash.h>
 #include <openssl/conf.h>

diff --git a/apps/dsa.c b/apps/dsa.c
index e9de3a3bdfb6f55aa6c7de6dbb609d764b35d4b7..b6f0ed3d024196a44a4656384afd0dcd5b984747 100644 (file)
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -68,6 +68,7 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
+#include <openssl/bn.h>
 
 #undef PROG
 #define PROG   dsa_main

diff --git a/apps/ocsp.c b/apps/ocsp.c
index 9c8e20d35ab967708172dbd3e4555c84ebd16aef..52af592a4a6174f3336d63f3d5aa240f238837f4 100644 (file)
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -64,6 +64,7 @@
 #include <openssl/ocsp.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
+#include <openssl/bn.h>
 
 /* Maximum leeway in validity period: default 5 minutes */
 #define MAX_VALIDITY_PERIOD    (5 * 60)

diff --git a/apps/rsa.c b/apps/rsa.c
index 0acdb08b24c35757b2ba3d659b2eff677f80c991..afbe0b4eb0181c6cc2438150ef10cbcdb5609e01 100644 (file)
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -68,6 +68,7 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
+#include <openssl/bn.h>
 
 #undef PROG
 #define PROG   rsa_main

diff --git a/apps/speed.c b/apps/speed.c
index ccc074f36029385afe879208bfebc54c19911322..4008930454ace278ed4fb058a9b0f236eb40c590 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -157,6 +157,7 @@
 #include <sys/param.h>
 #endif
 
+#include <openssl/bn.h>
 #ifndef OPENSSL_NO_DES
 #include <openssl/des.h>
 #endif

diff --git a/apps/version.c b/apps/version.c
index 041da37e99afb4f3300849434297a13eecf0ba11..69ef3e1bad077ac866b8bb63bc4937edd66da8da 100644 (file)
--- a/apps/version.c
+++ b/apps/version.c
@@ -115,6 +115,7 @@
 #include "apps.h"
 #include <openssl/evp.h>
 #include <openssl/crypto.h>
+#include <openssl/bn.h>
 #ifndef OPENSSL_NO_MD2
 # include <openssl/md2.h>
 #endif