wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 1039642 - stop PKCS#11 module threads before deleting them r=jcj r=mmc a=metered

Browse Source
This commit is contained in:
David Keeler 2014-11-05 13:53:28 -08:00
parent 1c4bcef973
commit 036550c543
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
security/manager/ssl/src/nsCrypto.cpp
View File

@ -50,21 +50,22 @@ nsPkcs11::DeleteModule(const nsAString& aModuleName)
}
NS_ConvertUTF16toUTF8 modName(aModuleName);
#ifndef MOZ_NO_SMART_CARDS
SECMODModule* module = SECMOD_FindModule(modName.get());
if (!module) {
return NS_ERROR_FAILURE;
}
nssComponent->ShutdownSmartCardThread(module);
SECMOD_DestroyModule(module);
#endif
int32_t modType;
SECStatus srv = SECMOD_DeleteModule(modName.get(), &modType);
if (srv == SECSuccess) {
SECMODModule *module = SECMOD_FindModule(modName.get());
if (module) {
#ifndef MOZ_NO_SMART_CARDS
nssComponent->ShutdownSmartCardThread(module);
#endif
SECMOD_DestroyModule(module);
}
rv = NS_OK;
} else {
rv = NS_ERROR_FAILURE;
if (srv != SECSuccess) {
return NS_ERROR_FAILURE;
}
return rv;
return NS_OK;
}
//Add a new PKCS11 module to the user's profile.