Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set the CKA_VALUE attribute in pk11_ImportSymKeyWithTempl().

Browse Source 
This is a better solution to bug 52306, because it fixes the behavior of
all the functions that unwrap and/or import sym keys.
This commit is contained in:
nelsonb%netscape.com 2000-09-12 19:44:56 +00:00
parent ba1429cb0b
commit 71f913281c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
security/nss/lib/pk11wrap/pk11skey.c
View File

@ -58,6 +58,8 @@ static PK11SymKey *pk11_DeriveWithTemplate(PK11SymKey *baseKey,
CK_MECHANISM_TYPE derive, SECItem *param, CK_MECHANISM_TYPE target,
CK_ATTRIBUTE_TYPE operation, int keySize, CK_ATTRIBUTE *userAttr,
unsigned int numAttrs);
static PRBool pk11_FindAttrInTemplate(CK_ATTRIBUTE * attr,
unsigned int numAttrs, CK_ATTRIBUTE_TYPE target);
/*
@ -388,6 +390,11 @@ pk11_ImportSymKeyWithTempl(PK11SlotInfo *slot, CK_MECHANISM_TYPE type,
}
symKey->size = key->len;
if (!pk11_FindAttrInTemplate(keyTemplate, templateCount, CKA_VALUE)) {
CK_ATTRIBUTE *attrs = keyTemplate + templateCount;
PK11_SETATTRS(attrs, CKA_VALUE, key->data, key->len);
templateCount++;
}
if (SECITEM_CopyItem(NULL,&symKey->data,key) != SECSuccess) {
PK11_FreeSymKey(symKey);
@ -2664,12 +2671,6 @@ pk11_HandUnwrap(PK11SlotInfo *slot, CK_OBJECT_HANDLE wrappingKey,
}
outKey.len = (key_size == 0) ? len : key_size;
if (outKey.len > 0 &&
!pk11_FindAttrInTemplate(keyTemplate, templateCount, CKA_VALUE)) {
CK_ATTRIBUTE *attrs = keyTemplate + templateCount;
PK11_SETATTRS(attrs, CKA_VALUE, outKey.data, outKey.len);
templateCount++;
}
if (PK11_DoesMechanism(slot,target)) {
symKey = pk11_ImportSymKeyWithTempl(slot, target, PK11_OriginUnwrap,