PR: 2161
authorDr. Stephen Henson <steve@openssl.org>
Tue, 2 Feb 2010 13:35:27 +0000 (13:35 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 2 Feb 2010 13:35:27 +0000 (13:35 +0000)
Submitted by: Doug Goldstein <cardoe@gentoo.org>, Steve.

Make no-dsa, no-ecdsa and no-rsa compile again.

apps/speed.c
crypto/evp/m_mdc2.c
ssl/s3_clnt.c

index 67a8167..e4389f8 100644 (file)
@@ -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
index 36c4e9b..b08d559 100644 (file)
@@ -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); }
index 44b698c..f84b9de 100644 (file)
@@ -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)
                {