Fix some warnings caused by __owur. Temporarily (I hope) remove the more

aspirational __owur annotations.
This commit is contained in:
Ben Laurie
2011-11-14 00:36:10 +00:00
parent fe06864836
commit ae55176091
12 changed files with 66 additions and 51 deletions

View File

@@ -1059,10 +1059,12 @@ static int request_certificate(SSL *s)
EVP_PKEY *pkey=NULL;
EVP_MD_CTX_init(&ctx);
EVP_VerifyInit_ex(&ctx,s->ctx->rsa_md5, NULL);
EVP_VerifyUpdate(&ctx,s->s2->key_material,
s->s2->key_material_length);
EVP_VerifyUpdate(&ctx,ccd,SSL2_MIN_CERT_CHALLENGE_LENGTH);
if (!EVP_VerifyInit_ex(&ctx,s->ctx->rsa_md5, NULL)
|| !EVP_VerifyUpdate(&ctx,s->s2->key_material,
s->s2->key_material_length)
|| !EVP_VerifyUpdate(&ctx,ccd,
SSL2_MIN_CERT_CHALLENGE_LENGTH))
goto msg_end;
i=i2d_X509(s->cert->pkeys[SSL_PKEY_RSA_ENC].x509,NULL);
buf2=OPENSSL_malloc((unsigned int)i);
@@ -1073,7 +1075,11 @@ static int request_certificate(SSL *s)
}
p2=buf2;
i=i2d_X509(s->cert->pkeys[SSL_PKEY_RSA_ENC].x509,&p2);
EVP_VerifyUpdate(&ctx,buf2,(unsigned int)i);
if (!EVP_VerifyUpdate(&ctx,buf2,(unsigned int)i))
{
OPENSSL_free(buf2);
goto msg_end;
}
OPENSSL_free(buf2);
pkey=X509_get_pubkey(x509);