Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-28 12:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes for 95135 and 95150, find DSA keys that start with a leading 0

Browse Source
This commit is contained in:
mcgreer%netscape.com 2001-08-14 18:53:27 +00:00
parent c2bf0b573d
commit c64ee802b4
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
security/nss/lib/softoken/pkcs11.c
View File

@ -2111,6 +2111,18 @@ pk11_GetPrivKey(PK11Object *object,CK_KEY_TYPE key_type)
priv=SECKEY_FindKeyByPublicKey(SECKEY_GetDefaultKeyDB(),&pubKey,
(SECKEYGetPasswordKey) pk11_givePass,
object->slot);
if (!priv && pubKey.data[0] == 0) {
/* Because of legacy code issues, sometimes the public key has
* a '0' prepended to it, forcing it to be unsigned. The database
* does not store that '0', so catch that failure here.
*/
SECItem tmpPubKey;
tmpPubKey.data = pubKey.data + 1;
tmpPubKey.len = pubKey.len - 1;
priv=SECKEY_FindKeyByPublicKey(SECKEY_GetDefaultKeyDB(),&tmpPubKey,
(SECKEYGetPasswordKey) pk11_givePass,
object->slot);
}
if (pubKey.data) PORT_Free(pubKey.data);
/* don't 'cache' DB private keys */

11
security/nss/lib/softoken/pkcs11u.c
View File

@ -749,6 +749,17 @@ pk11_DestroyObject(PK11Object *object)
crv=pk11_Attribute2SecItem(NULL,&pubKey,object,CKA_NETSCAPE_DB);
if (crv != CKR_OK) break;
rv = SECKEY_DeleteKey(SECKEY_GetDefaultKeyDB(), &pubKey);
if (rv != SECSuccess && pubKey.data[0] == 0) {
/* Because of legacy code issues, sometimes the public key
* has a '0' prepended to it, forcing it to be unsigned.
* The database does not store that '0', so catch that
* failure here.
*/
SECItem tmpPubKey;
tmpPubKey.data = pubKey.data + 1;
tmpPubKey.len = pubKey.len - 1;
rv = SECKEY_DeleteKey(SECKEY_GetDefaultKeyDB(), &tmpPubKey);
}
if (rv != SECSuccess) crv= CKR_DEVICE_ERROR;
break;
case PK11_TOKEN_TYPE_CERT: