Port from stable branch.

diff --git a/ChangeLog.0_9_7-stable_not-in-head b/ChangeLog.0_9_7-stable_not-in-head
index 297ddb4e43fb568ec9f5ac8d6a9713eba67bb355..bbb369bf30a52fc08a33eaaf7751e1efde0b97d2 100644 (file)
--- a/ChangeLog.0_9_7-stable_not-in-head
+++ b/ChangeLog.0_9_7-stable_not-in-head
@@ -766,13 +766,6 @@ be added to the end of this file.
        Remove VMS_strcasecmp() from apps.c, it's not used any more.  And
        besides, the implementation is bogus.
 
        Remove VMS_strcasecmp() from apps.c, it's not used any more.  And
        besides, the implementation is bogus.
 

-2005-01-31 02:40  steve
-
-       Changed:
-               crypto/asn1/a_verify.c (1.12.2.3), "Exp", lines: +7 -6
-
-       Avoid memory leak.
-

 2005-01-31 02:46  steve
 
        Changed:
 2005-01-31 02:46  steve
 
        Changed:

diff --git a/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c
index e7ba32f3f1623c05f267341ccdb82bd47d119846..05329277a2df0da4a39d5721cdd8029d38ed6454 100644 (file)
--- a/crypto/asn1/a_verify.c
+++ b/crypto/asn1/a_verify.c
@@ -142,6 +142,13 @@ int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a, ASN1_BIT_STRING *signat
                goto err;
                }
 
                goto err;
                }
 

+       if (!EVP_VerifyInit_ex(&ctx,type, NULL))
+               {
+               ASN1err(ASN1_F_ASN1_VERIFY,ERR_R_EVP_LIB);
+               ret=0;
+               goto err;
+               }
+

        inl = ASN1_item_i2d(asn, &buf_in, it);
        
        if (buf_in == NULL)
        inl = ASN1_item_i2d(asn, &buf_in, it);
        
        if (buf_in == NULL)


@@ -150,12 +157,6 @@ int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a, ASN1_BIT_STRING *signat
                goto err;
                }
 
                goto err;
                }
 

-       if (!EVP_VerifyInit_ex(&ctx,type, NULL))
-               {
-               ASN1err(ASN1_F_ASN1_VERIFY,ERR_R_EVP_LIB);
-               ret=0;
-               goto err;
-               }

        EVP_VerifyUpdate(&ctx,(unsigned char *)buf_in,inl);
 
        OPENSSL_cleanse(buf_in,(unsigned int)inl);
        EVP_VerifyUpdate(&ctx,(unsigned char *)buf_in,inl);
 
        OPENSSL_cleanse(buf_in,(unsigned int)inl);