diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-02-02 14:03:07 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-02-02 14:03:07 +0000 |
| commit | 162f1e08f8ed4828d5af072590e7c1aeb08783d5 (patch) | |
| tree | cab4d3676058de52a3283cdaae2b4a9fc6fa8298 /fips | |
| parent | 0484ff5ec1356b66cb2680d62bca552511958912 (diff) | |
make no-rsa no-dsa compile again
Diffstat (limited to 'fips')
| -rw-r--r-- | fips/dsa/fips_dsatest.c | 2 | ||||
| -rw-r--r-- | fips/fips_test_suite.c | 7 | ||||
| -rw-r--r-- | fips/rsa/fips_rsagtest.c | 2 | ||||
| -rw-r--r-- | fips/rsa/fips_rsastest.c | 2 | ||||
| -rw-r--r-- | fips/rsa/fips_rsavtest.c | 3 |
5 files changed, 9 insertions, 7 deletions
diff --git a/fips/dsa/fips_dsatest.c b/fips/dsa/fips_dsatest.c index c7e0f5164f..1aec089ae1 100644 --- 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 41c9344bd6..2bc0ba9080 100644 --- 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 33a3d7a48c..657e1b6975 100644 --- 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 16c174a2f8..452084ff9f 100644 --- 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 6340f190a3..aadab27536 100644 --- 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); |