Security-58286.1.32.tar.gz

[apple/security.git] / libsecurity_smime / lib / smimeutil.c

diff --git a/libsecurity_smime/lib/smimeutil.c b/libsecurity_smime/lib/smimeutil.c
index e5d89bbc1583d956ea0435465104278857b10a2d..22694be932cf44ebe0b25d34307ac85db4c84b58 100644 (file)
--- a/libsecurity_smime/lib/smimeutil.c
+++ b/libsecurity_smime/lib/smimeutil.c
@@ -46,6 +46,7 @@
 #include <security_asn1/secerr.h>
 #include <Security/SecSMIME.h>
 #include <Security/SecKeyPriv.h>
 #include <security_asn1/secerr.h>
 #include <Security/SecSMIME.h>
 #include <Security/SecKeyPriv.h>

+#include <Security/SecCertificatePriv.h>

 
 SEC_ASN1_MKSUB(CERT_IssuerAndSNTemplate)
 SEC_ASN1_MKSUB(SEC_OctetStringTemplate)
 
 SEC_ASN1_MKSUB(CERT_IssuerAndSNTemplate)
 SEC_ASN1_MKSUB(SEC_OctetStringTemplate)


@@ -241,7 +242,12 @@ nss_smime_get_cipher_for_alg_and_key(SECAlgorithmID *algid, SecSymmetricKeyRef k
     algtag = SECOID_GetAlgorithmTag(algid);
     switch (algtag) {
     case SEC_OID_RC2_CBC:
     algtag = SECOID_GetAlgorithmTag(algid);
     switch (algtag) {
     case SEC_OID_RC2_CBC:

+#if USE_CDSA_CRYPTO
+       if (SecKeyGetStrengthInBits(key, algid, &keylen_bits))
+           return SECFailure;
+#else

        keylen_bits = CFDataGetLength((CFDataRef)key) * 8;
        keylen_bits = CFDataGetLength((CFDataRef)key) * 8;

+#endif

        switch (keylen_bits) {
        case 40:
            c = SMIME_RC2_CBC_40;
        switch (keylen_bits) {
        case 40:
            c = SMIME_RC2_CBC_40;


@@ -471,7 +477,11 @@ smime_choose_cipher(SecCertificateRef scert, SecCertificateRef *rcerts)
            key = CERT_ExtractPublicKey(rcerts[rcount]);
            pklen_bits = 0;
            if (key != NULL) {
            key = CERT_ExtractPublicKey(rcerts[rcount]);
            pklen_bits = 0;
            if (key != NULL) {

+#if USE_CDSA_CRYPTO
+               SecKeyGetStrengthInBits(key, NULL, &pklen_bits);
+#else

                 pklen_bits = SecKeyGetSize(key, kSecKeyKeySizeInBits);
                 pklen_bits = SecKeyGetSize(key, kSecKeyKeySizeInBits);

+#endif

                SECKEY_DestroyPublicKey (key);
            }
 
                SECKEY_DestroyPublicKey (key);
            }
 


@@ -738,7 +748,28 @@ loser:
     return (dummy == NULL) ? SECFailure : SECSuccess;
 }
 
     return (dummy == NULL) ? SECFailure : SECSuccess;
 }
 

-#if 0
+static CFArrayRef CF_RETURNS_RETAINED copyCertsFromRawCerts(SecAsn1Item **rawCerts) {
+    CFMutableArrayRef certs = NULL;
+    SecCertificateRef certificate = NULL;
+    int numRawCerts = SecCmsArrayCount((void **)rawCerts);
+    int dex;
+
+    certs = CFArrayCreateMutable(NULL, numRawCerts, &kCFTypeArrayCallBacks);
+
+    for(dex=0; dex<numRawCerts; dex++) {
+        certificate = SecCertificateCreateWithBytes(NULL, rawCerts[dex]->Data, rawCerts[dex]->Length);
+        CFArrayAppendValue(certs, certificate);
+        CFRelease(certificate);
+        certificate = NULL;
+    }
+
+    if (CFArrayGetCount(certs) == 0) {
+        CFRelease(certs);
+        return NULL;
+    }
+    return certs;
+}
+

 /*
  * SecSMIMEGetCertFromEncryptionKeyPreference -
  *                             find cert marked by EncryptionKeyPreference attribute
 /*
  * SecSMIMEGetCertFromEncryptionKeyPreference -
  *                             find cert marked by EncryptionKeyPreference attribute


@@ -750,11 +781,12 @@ loser:
  * they are assumed to have been imported already.
  */
 SecCertificateRef
  * they are assumed to have been imported already.
  */
 SecCertificateRef

-SecSMIMEGetCertFromEncryptionKeyPreference(SecKeychainRef keychainOrArray, SecAsn1Item *DERekp)
+SecSMIMEGetCertFromEncryptionKeyPreference(SecAsn1Item **rawCerts, SecAsn1Item *DERekp)

 {
     PLArenaPool *tmppoolp = NULL;
     SecCertificateRef cert = NULL;
     NSSSMIMEEncryptionKeyPreference ekp;
 {
     PLArenaPool *tmppoolp = NULL;
     SecCertificateRef cert = NULL;
     NSSSMIMEEncryptionKeyPreference ekp;

+    CFArrayRef certs = NULL;

 
     tmppoolp = PORT_NewArena(1024);
     if (tmppoolp == NULL)
 
     tmppoolp = PORT_NewArena(1024);
     if (tmppoolp == NULL)


@@ -764,24 +796,25 @@ SecSMIMEGetCertFromEncryptionKeyPreference(SecKeychainRef keychainOrArray, SecAs
     if (SEC_ASN1DecodeItem(tmppoolp, &ekp, smime_encryptionkeypref_template, DERekp) != SECSuccess)
        goto loser;
 
     if (SEC_ASN1DecodeItem(tmppoolp, &ekp, smime_encryptionkeypref_template, DERekp) != SECSuccess)
        goto loser;
 

+    certs = copyCertsFromRawCerts(rawCerts);
+

     /* find cert */
     switch (ekp.selector) {
     case NSSSMIMEEncryptionKeyPref_IssuerSN:
     /* find cert */
     switch (ekp.selector) {
     case NSSSMIMEEncryptionKeyPref_IssuerSN:

-       cert = CERT_FindCertByIssuerAndSN(keychainOrArray, ekp.id.issuerAndSN);
+       cert = CERT_FindCertificateByIssuerAndSN(certs, ekp.id.issuerAndSN);

        break;
     case NSSSMIMEEncryptionKeyPref_RKeyID:
     case NSSSMIMEEncryptionKeyPref_SubjectKeyID:
        break;
     case NSSSMIMEEncryptionKeyPref_RKeyID:
     case NSSSMIMEEncryptionKeyPref_SubjectKeyID:

-       /* XXX not supported yet - we need to be able to look up certs by SubjectKeyID */
+            cert = CERT_FindCertificateBySubjectKeyID(certs, ekp.id.subjectKeyID);

        break;
     default:
        PORT_Assert(0);
     }
 loser:
     if (tmppoolp) PORT_FreeArena(tmppoolp, PR_FALSE);
        break;
     default:
        PORT_Assert(0);
     }
 loser:
     if (tmppoolp) PORT_FreeArena(tmppoolp, PR_FALSE);

-
+    CFRelease(certs);

     return cert;
 }
     return cert;
 }

-#endif

 
 #if 0
 extern const char __nss_smime_rcsid[];
 
 #if 0
 extern const char __nss_smime_rcsid[];