make no-rsa no-dsa compile again

diff --git a/apps/dsa.c b/apps/dsa.c
index cbc1fe3f81972715941d45233a13a6cb44533d8d..5e68a56cfdfb9f9ce68cee53a51f0f27c3030100 100644 (file)
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -65,11 +65,11 @@
 #include "apps.h"
 #include <openssl/bio.h>
 #include <openssl/err.h>
-#include <openssl/dsa.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/bn.h>
+#include <openssl/dsa.h>
 
 #undef PROG
 #define PROG   dsa_main

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index c301e81af18ca3f3f3977d76dfc3bf9a44c9f003..4305a739b33132645c41f8d644c9f962a784f83a 100644 (file)
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -475,4 +475,10 @@ static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb)
 #endif
        return 1;
        }
+#else /* !OPENSSL_NO_DSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif

diff --git a/apps/gendsa.c b/apps/gendsa.c
index 8a296c66e570ca2f9ccd20820aa6a076cb644396..22c39629e5c4adfa0dca27eafc6568c0b60bcf33 100644 (file)
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -279,4 +279,10 @@ end:
        apps_shutdown();
        OPENSSL_EXIT(ret);
        }
+#else /* !OPENSSL_NO_DSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif

diff --git a/apps/speed.c b/apps/speed.c
index 078e6faae69835159fbdeb0ee119866f81de2312..07f0ae04a614b7aeba5d4821c244a0d9073bbf35 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -297,8 +297,12 @@ static const char *names[ALGOR_NUM]={
   "aes-128 ige","aes-192 ige","aes-256 ige"};
 static double results[ALGOR_NUM][SIZE_NUM];
 static int lengths[SIZE_NUM]={16,64,256,1024,8*1024};
+#ifndef OPENSSL_NO_RSA
 static double rsa_results[RSA_NUM][2];
+#endif
+#ifndef OPENSSL_NO_DSA
 static double dsa_results[DSA_NUM][2];
+#endif
 #ifndef OPENSSL_NO_ECDSA
 static double ecdsa_results[EC_NUM][2];
 #endif

diff --git a/fips/dsa/fips_dsatest.c b/fips/dsa/fips_dsatest.c
index c7e0f5164f2bf9eaaf64162b180b678feb81ea13..1aec089ae1446afc5f3778c2799449753a1dac72 100644 (file)
--- a/fips/dsa/fips_dsatest.c
+++ b/fips/dsa/fips_dsatest.c
@@ -69,7 +69,6 @@
 #include <openssl/rand.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
-#include <openssl/dsa.h>
 #include <openssl/bn.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
@@ -83,6 +82,7 @@ int main(int argc, char *argv[])
     return(0);
 }
 #else
+#include <openssl/dsa.h>
 #include <openssl/fips.h>
 #include <openssl/fips_rand.h>
 #include <openssl/dsa.h>

diff --git a/fips/fips_test_suite.c b/fips/fips_test_suite.c
index 41c9344bd60a20452a5f53f3afaee94d028a62b6..2bc0ba9080fb14cab2dd2be48158521efd5495fe 100644 (file)
--- a/fips/fips_test_suite.c
+++ b/fips/fips_test_suite.c
@@ -18,9 +18,6 @@
 #include <stdlib.h>
 #include <openssl/aes.h>
 #include <openssl/des.h>
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
-#include <openssl/dh.h>
 #include <openssl/hmac.h>
 #include <openssl/err.h>
 
@@ -37,6 +34,10 @@ int main(int argc, char *argv[])
     }
 #else
 
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/dh.h>
+
 #include <openssl/fips.h>
 #include "fips_utl.h"
 

diff --git a/fips/rsa/fips_rsagtest.c b/fips/rsa/fips_rsagtest.c
index 33a3d7a48cd4ebccb9c49a532b5f4a8223d39b39..657e1b697555dba4eadd5fe4c4d9194a84168234 100644 (file)
--- a/fips/rsa/fips_rsagtest.c
+++ b/fips/rsa/fips_rsagtest.c
@@ -63,7 +63,6 @@
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/err.h>
-#include <openssl/rsa.h>
 #include <openssl/bn.h>
 #include <openssl/x509v3.h>
 
@@ -77,6 +76,7 @@ int main(int argc, char *argv[])
 
 #else
 
+#include <openssl/rsa.h>
 #include "fips_utl.h"
 
 int rsa_test(FILE *out, FILE *in);

diff --git a/fips/rsa/fips_rsastest.c b/fips/rsa/fips_rsastest.c
index 16c174a2f81d8b601b3e2c83daebe8da1fe03f61..452084ff9fca01ed2a384949d974bb614bdb2141 100644 (file)
--- a/fips/rsa/fips_rsastest.c
+++ b/fips/rsa/fips_rsastest.c
@@ -63,7 +63,6 @@
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/err.h>
-#include <openssl/rsa.h>
 #include <openssl/bn.h>
 #include <openssl/x509v3.h>
 
@@ -77,6 +76,7 @@ int main(int argc, char *argv[])
 
 #else
 
+#include <openssl/rsa.h>
 #include "fips_utl.h"
 
 static int rsa_stest(FILE *out, FILE *in, int Saltlen);

diff --git a/fips/rsa/fips_rsavtest.c b/fips/rsa/fips_rsavtest.c
index 6340f190a3f9d0018e882647545b216d0370d0ea..aadab275363b266595d10c8cd13e3222cc2fc720 100644 (file)
--- a/fips/rsa/fips_rsavtest.c
+++ b/fips/rsa/fips_rsavtest.c
@@ -65,7 +65,6 @@
 #include <openssl/err.h>
 #include <openssl/x509v3.h>
 #include <openssl/bn.h>
-#include <openssl/rsa.h>
 
 #ifndef OPENSSL_FIPS
 
@@ -77,6 +76,8 @@ int main(int argc, char *argv[])
 
 #else
 
+#include <openssl/rsa.h>
+
 #include "fips_utl.h"
 
 int rsa_test(FILE *out, FILE *in, int saltlen);