blob: 32881b92d41c8b2078707c7d2778e99e4e475349 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp
--- a/security/manager/ssl/nsNSSComponent.cpp
+++ b/security/manager/ssl/nsNSSComponent.cpp
@@ -683,10 +683,17 @@
AutoSECMODListReadLock secmodLock;
SECMODModuleList* list = SECMOD_GetDefaultModuleList();
while (list) {
- if (SECMOD_HasRemovableSlots(list->module)) {
+ SECMODModule* module = list->module;
+ if (SECMOD_HasRemovableSlots(module)) {
*result = true;
return NS_OK;
}
+ for (int i = 0; i < module->slotCount; i++) {
+ if (!PK11_IsFriendly(module->slots[i])) {
+ *result = true;
+ return NS_OK;
+ }
+ }
list = list->next;
}
#endif
|
