nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1769627 - switch to SECMOD_LockedModuleHasRemovableSlots. r=keeler

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D147095
This commit is contained in:
John Schanck 2022-05-23 20:49:51 +00:00
parent 86ec9c28f7
commit 9fee1bf9c5
2 changed files with 3 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
security/manager/ssl/nsNSSComponent.cpp
View file

@ -857,7 +857,7 @@ nsNSSComponent::HasActiveSmartCards(bool* result) {
SECMODModuleList* list = SECMOD_GetDefaultModuleList();
while (list) {
SECMODModule* module = list->module;
if (SECMOD_HasRemovableSlots(module)) {
if (SECMOD_LockedModuleHasRemovableSlots(module)) {
*result = true;
return NS_OK;
}
@ -921,7 +921,7 @@ nsresult nsNSSComponent::CheckForSmartCardChanges() {
AutoSECMODListReadLock secmodLock;
SECMODModuleList* list = SECMOD_GetDefaultModuleList();
while (list) {
if (SECMOD_HasRemovableSlots(list->module)) {
if (SECMOD_LockedModuleHasRemovableSlots(list->module)) {
UniqueSECMODModule module(SECMOD_ReferenceModule(list->module));
if (!modulesWithRemovableSlots.append(std::move(module))) {
return NS_ERROR_OUT_OF_MEMORY;

2
security/nss.symbols
View file

@ -570,10 +570,10 @@ SECMOD_GetDefaultModuleListLock
SECMOD_GetInternalModule
SECMOD_GetModuleSpecList
SECMOD_GetReadLock
SECMOD_HasRemovableSlots
SECMOD_InternaltoPubMechFlags
SECMOD_LoadModule
SECMOD_LoadUserModule
SECMOD_LockedModuleHasRemovableSlots
SECMOD_OpenUserDB
SECMOD_PubCipherFlagstoInternal
SECMOD_PubMechFlagstoInternal