Merge in code from main trunk to BRANCH_engine.
This commit is contained in:
@@ -898,7 +898,7 @@ static int request_certificate(SSL *s)
|
||||
EVP_VerifyUpdate(&ctx,ccd,SSL2_MIN_CERT_CHALLENGE_LENGTH);
|
||||
|
||||
i=i2d_X509(s->cert->pkeys[SSL_PKEY_RSA_ENC].x509,NULL);
|
||||
buf2=Malloc((unsigned int)i);
|
||||
buf2=OPENSSL_malloc((unsigned int)i);
|
||||
if (buf2 == NULL)
|
||||
{
|
||||
SSLerr(SSL_F_REQUEST_CERTIFICATE,ERR_R_MALLOC_FAILURE);
|
||||
@@ -907,7 +907,7 @@ 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);
|
||||
Free(buf2);
|
||||
OPENSSL_free(buf2);
|
||||
|
||||
pkey=X509_get_pubkey(x509);
|
||||
if (pkey == NULL) goto end;
|
||||
|
Reference in New Issue
Block a user