Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 316925

Browse Source 
Key export does not work on tokens with non-sensitive keys that can't wrap.
r=kaie
This commit is contained in:
relyea%netscape.com 2005-11-24 00:40:14 +00:00
parent 5239743f12
commit 77cb1d9d48
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
security/nss/lib/pk11wrap/pk11akey.c
View File

@ -1389,6 +1389,7 @@ PK11_ExportEncryptedPrivKeyInfo(
SECAlgorithmID *algid;
SECItem *pbe_param = NULL;
PK11SymKey *key = NULL;
SECKEYPrivateKey *tmpPK = NULL;
SECStatus rv = SECSuccess;
int encryptBufLen;
CK_RV crv;
@ -1480,13 +1481,19 @@ PK11_ExportEncryptedPrivKeyInfo(
PK11SymKey *newkey = pk11_CopyToSlot(pk->pkcs11Slot,
key->type, CKA_WRAP, key);
if (newkey == NULL) {
rv= SECFailure;
goto loser;
tmpPK = pk11_loadPrivKey(key->slot, pk, NULL, PR_FALSE, PR_TRUE);
if (tmpPK == NULL) {
/* couldn't import the wrapping key, couldn't export the
* private key, we are done */
rv = SECFailure;
goto loser;
}
pk = tmpPK;
} else {
/* free the old key and use the new key */
PK11_FreeSymKey(key);
key = newkey;
}
/* free the old key and use the new key */
PK11_FreeSymKey(key);
key = newkey;
}
/* we are extracting an encrypted privateKey structure.
@ -1531,6 +1538,9 @@ loser:
if(key != NULL) {
PK11_FreeSymKey(key);
}
if (tmpPK != NULL) {
SECKEY_DestroyPrivateKey(tmpPK);
}
SECOID_DestroyAlgorithmID(algid, PR_TRUE);
if(rv == SECFailure) {

5
security/nss/lib/pk11wrap/pk11kea.c
View File

@ -144,6 +144,11 @@ pk11_KeyExchange(PK11SlotInfo *slot,CK_MECHANISM_TYPE type,
if (rv == SECSuccess) {
newSymKey = PK11_PubUnwrapSymKeyWithFlagsPerm(privKey,
&wrapData,type,operation,symKeyLength,flags,isPerm);
/* make sure we wound up where we wanted to be! */
if (newSymKey && newSymKey->slot != slot) {
PK11_FreeSymKey(newSymKey);
newSymKey = NULL;
}
}
rsa_failed:
if (wrapData.data != NULL) PORT_Free(wrapData.data);