diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-02-02 13:35:27 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-02-02 13:35:27 +0000 |
| commit | 17ebc10ffa3515bb4d67b28a8164d0f48b686f10 (patch) | |
| tree | 12a05b78f48c4413192669ef6e4dadd9aa964ddf | |
| parent | 434745dc193a7bbbc31f555ae36be95d48140d6e (diff) | |
PR: 2161
Submitted by: Doug Goldstein <cardoe@gentoo.org>, Steve.
Make no-dsa, no-ecdsa and no-rsa compile again.
| -rw-r--r-- | apps/speed.c | 4 | ||||
| -rw-r--r-- | crypto/evp/m_mdc2.c | 2 | ||||
| -rw-r--r-- | ssl/s3_clnt.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/apps/speed.c b/apps/speed.c index 67a816743e..e4389f8a5a 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -226,8 +226,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/crypto/evp/m_mdc2.c b/crypto/evp/m_mdc2.c index 36c4e9b134..b08d559803 100644 --- a/crypto/evp/m_mdc2.c +++ b/crypto/evp/m_mdc2.c @@ -65,7 +65,9 @@ #include <openssl/objects.h> #include <openssl/x509.h> #include <openssl/mdc2.h> +#ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> +#endif static int init(EVP_MD_CTX *ctx) { return MDC2_Init(ctx->md_data); } diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 44b698cc5f..f84b9de055 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -2668,9 +2668,7 @@ int ssl3_send_client_verify(SSL *s) unsigned u=0; #endif unsigned long n; -#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA) int j; -#endif if (s->state == SSL3_ST_CW_CERT_VRFY_A) { |