Security-58286.260.20.tar.gz

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

diff --git a/OSX/libsecurity_smime/lib/smimeutil.c b/OSX/libsecurity_smime/lib/smimeutil.c
index 61bd6f0568b920bd00c9769750ce4662eaab22e4..569c7f65b7b1a5bb5f6b929619017583756b064f 100644 (file)
--- a/OSX/libsecurity_smime/lib/smimeutil.c
+++ b/OSX/libsecurity_smime/lib/smimeutil.c
@@ -117,8 +117,8 @@ static const SecAsn1Template smime_encryptionkeypref_template[] = {
          NSSSMIMEEncryptionKeyPref_IssuerSN },
     { SEC_ASN1_POINTER | SEC_ASN1_CONTEXT_SPECIFIC | 1,
          offsetof(NSSSMIMEEncryptionKeyPreference,id.recipientKeyID),
-         SecCmsRecipientKeyIdentifierTemplate,
-         NSSSMIMEEncryptionKeyPref_IssuerSN },
+         SEC_ASN1_SUB(SecCmsRecipientKeyIdentifierTemplate),
+         NSSSMIMEEncryptionKeyPref_RKeyID },
     { SEC_ASN1_POINTER | SEC_ASN1_CONTEXT_SPECIFIC | SEC_ASN1_XTRN | 2,
          offsetof(NSSSMIMEEncryptionKeyPreference,id.subjectKeyID),
          SEC_ASN1_SUB(kSecAsn1OctetStringTemplate),
@@ -733,8 +733,10 @@ SecSMIMEGetCertFromEncryptionKeyPreference(SecKeychainRef keychainOrArray, CSSM_
        cert = CERT_FindCertByIssuerAndSN(keychainOrArray, rawCerts, NULL, tmppoolp, ekp.id.issuerAndSN);
        break;
     case NSSSMIMEEncryptionKeyPref_RKeyID:
+        cert = CERT_FindCertBySubjectKeyID(keychainOrArray, rawCerts, NULL, &ekp.id.recipientKeyID->subjectKeyIdentifier);
+        break;
     case NSSSMIMEEncryptionKeyPref_SubjectKeyID:
-            cert = CERT_FindCertBySubjectKeyID(keychainOrArray, rawCerts, NULL, ekp.id.subjectKeyID);
+        cert = CERT_FindCertBySubjectKeyID(keychainOrArray, rawCerts, NULL, ekp.id.subjectKeyID);
        break;
     default:
        PORT_Assert(0);