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 /apps | |
| parent | 0484ff5ec1356b66cb2680d62bca552511958912 (diff) | |
make no-rsa no-dsa compile again
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dsa.c | 2 | ||||
| -rw-r--r-- | apps/dsaparam.c | 6 | ||||
| -rw-r--r-- | apps/gendsa.c | 6 | ||||
| -rw-r--r-- | apps/speed.c | 4 |
4 files changed, 17 insertions, 1 deletions
diff --git a/apps/dsa.c b/apps/dsa.c index cbc1fe3f81..5e68a56cfd 100644 --- 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 c301e81af1..4305a739b3 100644 --- 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 8a296c66e5..22c39629e5 100644 --- 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 078e6faae6..07f0ae04a6 100644 --- 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 |