Security-57740.1.18.tar.gz

[apple/security.git] / OSX / libsecurity_smime / lib / cmssiginfo.c

diff --git a/OSX/libsecurity_smime/lib/cmssiginfo.c b/OSX/libsecurity_smime/lib/cmssiginfo.c
index c211139556e728d6132681c385e6e29a22f616bc..1bc932dca1afa1653fe747f051df87a09a2ca9ca 100644 (file)
--- a/OSX/libsecurity_smime/lib/cmssiginfo.c
+++ b/OSX/libsecurity_smime/lib/cmssiginfo.c
@@ -501,11 +501,6 @@ loser:
        SECITEM_FreeItem (&signature, PR_FALSE);
     if (privkey)
        SECKEY_DestroyPrivateKey(privkey);
        SECITEM_FreeItem (&signature, PR_FALSE);
     if (privkey)
        SECKEY_DestroyPrivateKey(privkey);

-    if((algID != NULL) & (algID != &freeAlgID)) {
-       /* this is dicey - this was actually mallocd by either SecCertificate or 
-        * by SecKey...it all boils down to a free() in the end though. */
-       SECOID_DestroyAlgorithmID((SECAlgorithmID *)algID, PR_FALSE);
-    }

     if (tmppoolp)
        PORT_FreeArena(tmppoolp, PR_FALSE);
     return SECFailure;
     if (tmppoolp)
        PORT_FreeArena(tmppoolp, PR_FALSE);
     return SECFailure;


@@ -671,7 +666,6 @@ SecCmsSignerInfoVerifyWithPolicy(SecCmsSignerInfoRef signerinfo,CFTypeRef timeSt
        }
 
        if ((poolp = PORT_NewArena (1024)) == NULL) {
        }
 
        if ((poolp = PORT_NewArena (1024)) == NULL) {

-            syslog(LOG_ERR, "SecCmsSignerInfoVerifyWithPolicy: failed to make new Arena %d", PORT_GetError());

            vs = SecCmsVSProcessingError;
            goto loser;
        }
            vs = SecCmsVSProcessingError;
            goto loser;
        }


@@ -689,7 +683,6 @@ SecCmsSignerInfoVerifyWithPolicy(SecCmsSignerInfoRef signerinfo,CFTypeRef timeSt
        if (SecCmsAttributeArrayEncode(poolp, &(signerinfo->authAttr), &encoded_attrs) == NULL ||
                encoded_attrs.Data == NULL || encoded_attrs.Length == 0)
        {
        if (SecCmsAttributeArrayEncode(poolp, &(signerinfo->authAttr), &encoded_attrs) == NULL ||
                encoded_attrs.Data == NULL || encoded_attrs.Length == 0)
        {

-            syslog(LOG_ERR, "SecCmsSignerInfoVerifyWithPolicy: failed to encode attributes");

            vs = SecCmsVSProcessingError;
            goto loser;
        }
            vs = SecCmsVSProcessingError;
            goto loser;
        }