Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Be sure not to ask NSS to use an invalid PKCS11 mechanism.

Browse Source 
Bugscape bug 53875.  r=relyea.


git-svn-id: svn://10.0.0.236/trunk@149571 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nelsonb%netscape.com 2003-11-20 02:00:04 +00:00
parent 79dd7b56ae
commit 2516b242fe
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/security/nss/lib/smime/cmsenvdata.c
View File

@ -34,7 +34,7 @@
/*
* CMS envelopedData methods.
*
* $Id: cmsenvdata.c,v 1.7 2002-01-25 19:08:18 relyea%netscape.com Exp $
* $Id: cmsenvdata.c,v 1.8 2003-11-20 02:00:04 nelsonb%netscape.com Exp $
*/
#include "cmslocal.h"
@ -360,7 +360,11 @@ NSS_CMSEnvelopedData_Decode_BeforeData(NSSCMSEnvelopedData *envd)
cinfo = &(envd->contentInfo);
bulkalgtag = NSS_CMSContentInfo_GetContentEncAlgTag(cinfo);
bulkkey = NSS_CMSRecipientInfo_UnwrapBulkKey(ri,recipient->subIndex,
if (bulkalgtag == SEC_OID_UNKNOWN) {
PORT_SetError(SEC_ERROR_INVALID_ALGORITHM);
} else
bulkkey =
NSS_CMSRecipientInfo_UnwrapBulkKey(ri,recipient->subIndex,
recipient->cert,
recipient->privkey,
bulkalgtag);

11
mozilla/security/nss/lib/smime/cmspubkey.c
View File

@ -34,7 +34,7 @@
/*
* CMS public key crypto
*
* $Id: cmspubkey.c,v 1.5 2002-12-17 01:39:46 wtc%netscape.com Exp $
* $Id: cmspubkey.c,v 1.6 2003-11-20 02:00:04 nelsonb%netscape.com Exp $
*/
#include "cmslocal.h"
@ -128,7 +128,14 @@ PK11SymKey *
NSS_CMSUtil_DecryptSymKey_RSA(SECKEYPrivateKey *privkey, SECItem *encKey, SECOidTag bulkalgtag)
{
/* that's easy */
return PK11_PubUnwrapSymKey(privkey, encKey, PK11_AlgtagToMechanism(bulkalgtag), CKA_DECRYPT, 0);
CK_MECHANISM_TYPE target;
PORT_Assert(bulkalgtag != SEC_OID_UNKNOWN);
target = PK11_AlgtagToMechanism(bulkalgtag);
if (bulkalgtag == SEC_OID_UNKNOWN || target == CKM_INVALID_MECHANISM) {
PORT_SetError(SEC_ERROR_INVALID_ALGORITHM);
return NULL;
}
return PK11_PubUnwrapSymKey(privkey, encKey, target, CKA_DECRYPT, 0);
}
/* ====== MISSI (Fortezza) ========================================================== */