Security-58286.260.20.tar.gz

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

diff --git a/OSX/libsecurity_smime/lib/cmsencdata.c b/OSX/libsecurity_smime/lib/cmsencdata.c
index 0bdf3fee7da817a67ea40f76f61a984bb8f51035..7dea92a2cc70299bf351a3c52ec479dd53dc2b57 100644 (file)
--- a/OSX/libsecurity_smime/lib/cmsencdata.c
+++ b/OSX/libsecurity_smime/lib/cmsencdata.c
@@ -61,7 +61,9 @@ SecCmsEncryptedDataCreate(SecCmsMessageRef cmsg, SECOidTag algorithm, int keysiz
     void *mark;
     SecCmsEncryptedDataRef encd;
     PLArenaPool *poolp;
     void *mark;
     SecCmsEncryptedDataRef encd;
     PLArenaPool *poolp;

+#if 0

     SECAlgorithmID *pbe_algid;
     SECAlgorithmID *pbe_algid;

+#endif

     OSStatus rv;
 
     poolp = cmsg->poolp;
     OSStatus rv;
 
     poolp = cmsg->poolp;


@@ -87,10 +89,11 @@ SecCmsEncryptedDataCreate(SecCmsMessageRef cmsg, SECOidTag algorithm, int keysiz
        /* Assume password-based-encryption.  At least, try that. */
 #if 1
        // @@@ Fix me
        /* Assume password-based-encryption.  At least, try that. */
 #if 1
        // @@@ Fix me

-       pbe_algid = NULL;
+        rv = SECFailure;
+        break;

 #else
        pbe_algid = PK11_CreatePBEAlgorithmID(algorithm, 1, NULL);
 #else
        pbe_algid = PK11_CreatePBEAlgorithmID(algorithm, 1, NULL);

-#endif
+

        if (pbe_algid == NULL) {
            rv = SECFailure;
            break;
        if (pbe_algid == NULL) {
            rv = SECFailure;
            break;


@@ -98,6 +101,7 @@ SecCmsEncryptedDataCreate(SecCmsMessageRef cmsg, SECOidTag algorithm, int keysiz
        rv = SecCmsContentInfoSetContentEncAlgID((SecArenaPoolRef)poolp, &(encd->contentInfo), pbe_algid, keysize);
        SECOID_DestroyAlgorithmID (pbe_algid, PR_TRUE);
        break;
        rv = SecCmsContentInfoSetContentEncAlgID((SecArenaPoolRef)poolp, &(encd->contentInfo), pbe_algid, keysize);
        SECOID_DestroyAlgorithmID (pbe_algid, PR_TRUE);
        break;

+#endif

     }
     if (rv != SECSuccess)
        goto loser;
     }
     if (rv != SECSuccess)
        goto loser;