Replace NSS with Pale Moon's

This commit is contained in:
wuggy 2026-06-29 21:29:25 +01:00
commit 8c2e376f94
2870 changed files with 1762232 additions and 1374220 deletions

View file

@ -222,13 +222,14 @@ NSSCKFWC_Finalize(
loser:
switch (error) {
PRInt32 remainingInstances;
case CKR_OK:
case CKR_OK: {
PRInt32 remainingInstances;
remainingInstances = PR_ATOMIC_DECREMENT(&liveInstances);
if (!remainingInstances) {
nssArena_Shutdown();
}
break;
}
case CKR_CRYPTOKI_NOT_INITIALIZED:
case CKR_FUNCTION_FAILED:
case CKR_GENERAL_ERROR:
@ -2570,11 +2571,17 @@ NSSCKFWC_FindObjects(
phObject[i] = nssCKFWInstance_FindObjectHandle(fwInstance, fwObject);
if ((CK_OBJECT_HANDLE)0 == phObject[i]) {
phObject[i] = nssCKFWInstance_CreateObjectHandle(fwInstance, fwObject, &error);
}
if ((CK_OBJECT_HANDLE)0 == phObject[i]) {
/* This isn't right either, is it? */
nssCKFWObject_Destroy(fwObject);
goto loser;
/* CreateObjectHandle returns CKR_GENERAL_ERROR if fwObject already
* has a handle. This happens when another thread creates a handle
* between our FindObjectHandle and CreateObjectHandle calls.
*/
if (error == CKR_GENERAL_ERROR) {
error = CKR_OK;
phObject[i] = nssCKFWInstance_FindObjectHandle(fwInstance, fwObject);
}
if (error != CKR_OK || (CK_OBJECT_HANDLE)0 == phObject[i]) {
goto loser;
}
}
}