提交 752d706a 编写于 作者: B Ben Laurie

Make NO_RSA compile with pedantic.

上级 c3ed3b6e
......@@ -216,4 +216,10 @@ static void MS_CALLBACK genrsa_cb(int p, int n, void *arg)
p=n;
#endif
}
#else /* !NO_RSA */
# if PEDANTIC
static void *dummy=&dummy;
# endif
#endif
......@@ -120,7 +120,9 @@ static int add_attribute_object(STACK_OF(X509_ATTRIBUTE) *n, char *text,
int max);
static int add_DN_object(X509_NAME *n, char *text, char *def, char *value,
int nid,int min,int max);
#ifndef NO_RSA
static void MS_CALLBACK req_cb(int p,int n,void *arg);
#endif
static int req_fix_data(int nid,int *type,int len,int min,int max);
static int check_end(char *str, char *end);
static int add_oid_section(LHASH *conf);
......@@ -1403,6 +1405,7 @@ err:
return(0);
}
#ifndef NO_RSA
static void MS_CALLBACK req_cb(int p, int n, void *arg)
{
char c='*';
......@@ -1417,6 +1420,7 @@ static void MS_CALLBACK req_cb(int p, int n, void *arg)
p=n;
#endif
}
#endif
static int req_fix_data(int nid, int *type, int len, int min, int max)
{
......
......@@ -395,4 +395,10 @@ end:
if (rsa != NULL) RSA_free(rsa);
EXIT(ret);
}
#else /* !NO_RSA */
# if PEDANTIC
static void *dummy=&dummy;
# endif
#endif
......@@ -119,4 +119,10 @@ err:
return(NULL);
}
#else /* !NO_RSA */
# if PEDANTIC
static void *dummy=&dummy;
# endif
#endif
......@@ -94,4 +94,10 @@ err:
if (bs != NULL) M_ASN1_INTEGER_free(bs);
return(NULL);
}
#else /* !NO_RSA */
# if PEDANTIC
static void *dummy=&dummy;
# endif
#endif
......@@ -123,5 +123,11 @@ int i2d_RSAPrivateKey(RSA *a, unsigned char **pp)
*pp=p;
return(t);
}
#else /* !NO_RSA */
# if PEDANTIC
static void *dummy=&dummy;
# endif
#endif
......@@ -109,4 +109,10 @@ int i2d_RSAPublicKey(RSA *a, unsigned char **pp)
*pp=p;
return(t);
}
#else /* !NO_RSA */
# if PEDANTIC
static void *dummy=&dummy;
# endif
#endif
......@@ -338,4 +338,11 @@ static void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a)
}
#endif /* NO_RC4 */
#else /* !NO_RSA */
# if PEDANTIC
static void *dummy=&dummy;
# endif
#endif
......@@ -110,4 +110,10 @@ int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
EVP_DecryptInit(ctx,NULL,NULL,NULL);
return(i);
}
#else /* !NO_RSA */
# ifdef PEDANTIC
static void *dummy=&dummy;
# endif
#endif
......@@ -175,4 +175,10 @@ err:
if (s != NULL) Free(s);
return(ret);
}
#else /* !NO_RSA */
# if PEDANTIC
static void *dummy=&dummy;
# endif
#endif
......@@ -298,4 +298,10 @@ err:
memset(&rnd,0,sizeof(rnd));
return(outlen);
}
#else /* !NO_RSA */
# if PEDANTIC
static void *dummy=&dummy;
# endif
#endif
......@@ -974,4 +974,10 @@ end:
EVP_PKEY_free(pkey);
return(i);
}
#else /* !NO_RSA */
# if PEDANTIC
static void *dummy=&dummy;
# endif
#endif
......@@ -421,4 +421,10 @@ int ssl2_shutdown(SSL *s)
s->shutdown=(SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN);
return(1);
}
#else /* !NO_RSA */
# if PEDANTIC
static void *dummy=&dummy;
# endif
#endif
......@@ -86,4 +86,10 @@ SSL_METHOD *SSLv2_method(void)
}
return(&SSLv2_data);
}
#else /* !NO_RSA */
# if PEDANTIC
static void *dummy=&dummy;
# endif
#endif
......@@ -966,4 +966,10 @@ static int ssl_rsa_private_decrypt(CERT *c, int len, unsigned char *from,
SSLerr(SSL_F_SSL_RSA_PRIVATE_DECRYPT,ERR_R_RSA_LIB);
return(i);
}
#else /* !NO_RSA */
# if PEDANTIC
static void *dummy=&dummy;
# endif
#endif
......@@ -900,6 +900,7 @@ static int ssl3_send_server_key_exchange(SSL *s)
int j,num;
RSA *rsa;
unsigned char md_buf[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
unsigned int u;
#endif
#ifndef NO_DH
DH *dh,*dhp;
......@@ -907,7 +908,6 @@ static int ssl3_send_server_key_exchange(SSL *s)
EVP_PKEY *pkey;
unsigned char *p,*d;
int al,i;
unsigned int u;
unsigned long type;
int n;
CERT *cert;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册