PR: 2161
Submitted by: Doug Goldstein <cardoe@gentoo.org>, Steve. Make no-dsa, no-ecdsa and no-rsa compile again.
This commit is contained in:
parent
434745dc19
commit
17ebc10ffa
@ -226,8 +226,12 @@ static const char *names[ALGOR_NUM]={
|
|||||||
"aes-128 ige","aes-192 ige","aes-256 ige"};
|
"aes-128 ige","aes-192 ige","aes-256 ige"};
|
||||||
static double results[ALGOR_NUM][SIZE_NUM];
|
static double results[ALGOR_NUM][SIZE_NUM];
|
||||||
static int lengths[SIZE_NUM]={16,64,256,1024,8*1024};
|
static int lengths[SIZE_NUM]={16,64,256,1024,8*1024};
|
||||||
|
#ifndef OPENSSL_NO_RSA
|
||||||
static double rsa_results[RSA_NUM][2];
|
static double rsa_results[RSA_NUM][2];
|
||||||
|
#endif
|
||||||
|
#ifndef OPENSSL_NO_DSA
|
||||||
static double dsa_results[DSA_NUM][2];
|
static double dsa_results[DSA_NUM][2];
|
||||||
|
#endif
|
||||||
#ifndef OPENSSL_NO_ECDSA
|
#ifndef OPENSSL_NO_ECDSA
|
||||||
static double ecdsa_results[EC_NUM][2];
|
static double ecdsa_results[EC_NUM][2];
|
||||||
#endif
|
#endif
|
||||||
|
@ -65,7 +65,9 @@
|
|||||||
#include <openssl/objects.h>
|
#include <openssl/objects.h>
|
||||||
#include <openssl/x509.h>
|
#include <openssl/x509.h>
|
||||||
#include <openssl/mdc2.h>
|
#include <openssl/mdc2.h>
|
||||||
|
#ifndef OPENSSL_NO_RSA
|
||||||
#include <openssl/rsa.h>
|
#include <openssl/rsa.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
static int init(EVP_MD_CTX *ctx)
|
static int init(EVP_MD_CTX *ctx)
|
||||||
{ return MDC2_Init(ctx->md_data); }
|
{ return MDC2_Init(ctx->md_data); }
|
||||||
|
@ -2668,9 +2668,7 @@ int ssl3_send_client_verify(SSL *s)
|
|||||||
unsigned u=0;
|
unsigned u=0;
|
||||||
#endif
|
#endif
|
||||||
unsigned long n;
|
unsigned long n;
|
||||||
#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA)
|
|
||||||
int j;
|
int j;
|
||||||
#endif
|
|
||||||
|
|
||||||
if (s->state == SSL3_ST_CW_CERT_VRFY_A)
|
if (s->state == SSL3_ST_CW_CERT_VRFY_A)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user