OLD | NEW |
1 /* This Source Code Form is subject to the terms of the Mozilla Public | 1 /* This Source Code Form is subject to the terms of the Mozilla Public |
2 * License, v. 2.0. If a copy of the MPL was not distributed with this | 2 * License, v. 2.0. If a copy of the MPL was not distributed with this |
3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
4 /* | 4 /* |
5 * Initialize the PCKS 11 subsystem | 5 * Initialize the PCKS 11 subsystem |
6 */ | 6 */ |
7 #include "seccomon.h" | 7 #include "seccomon.h" |
8 #include "secmod.h" | 8 #include "secmod.h" |
9 #include "nssilock.h" | 9 #include "nssilock.h" |
10 #include "secmodi.h" | 10 #include "secmodi.h" |
(...skipping 1040 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1051 mod->evControlMask |= SECMOD_WAIT_SIMULATED_EVENT; | 1051 mod->evControlMask |= SECMOD_WAIT_SIMULATED_EVENT; |
1052 while (mod->evControlMask & SECMOD_WAIT_SIMULATED_EVENT) { | 1052 while (mod->evControlMask & SECMOD_WAIT_SIMULATED_EVENT) { |
1053 PZ_Unlock(mod->refLock); | 1053 PZ_Unlock(mod->refLock); |
1054 /* now is a good time to see if new slots have been added */ | 1054 /* now is a good time to see if new slots have been added */ |
1055 SECMOD_UpdateSlotList(mod); | 1055 SECMOD_UpdateSlotList(mod); |
1056 | 1056 |
1057 /* loop through all the slots on a module */ | 1057 /* loop through all the slots on a module */ |
1058 SECMOD_GetReadLock(moduleLock); | 1058 SECMOD_GetReadLock(moduleLock); |
1059 for (i=0; i < mod->slotCount; i++) { | 1059 for (i=0; i < mod->slotCount; i++) { |
1060 PK11SlotInfo *slot = mod->slots[i]; | 1060 PK11SlotInfo *slot = mod->slots[i]; |
1061 » uint16 series; | 1061 » PRUint16 series; |
1062 PRBool present; | 1062 PRBool present; |
1063 | 1063 |
1064 /* perm modules do not change */ | 1064 /* perm modules do not change */ |
1065 if (slot->isPerm) { | 1065 if (slot->isPerm) { |
1066 continue; | 1066 continue; |
1067 } | 1067 } |
1068 removableSlotsFound = PR_TRUE; | 1068 removableSlotsFound = PR_TRUE; |
1069 /* simulate the PKCS #11 module flags. are the flags different | 1069 /* simulate the PKCS #11 module flags. are the flags different |
1070 * from the last time we called? */ | 1070 * from the last time we called? */ |
1071 series = slot->series; | 1071 series = slot->series; |
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1569 * on multiple failures, we are only returning the lastError. The caller | 1569 * on multiple failures, we are only returning the lastError. The caller |
1570 * can determine which slots are bad by calling PK11_IsDisabled(). | 1570 * can determine which slots are bad by calling PK11_IsDisabled(). |
1571 */ | 1571 */ |
1572 if (rrv != SECSuccess) { | 1572 if (rrv != SECSuccess) { |
1573 /* restore the last error code */ | 1573 /* restore the last error code */ |
1574 PORT_SetError(lastError); | 1574 PORT_SetError(lastError); |
1575 } | 1575 } |
1576 | 1576 |
1577 return rrv; | 1577 return rrv; |
1578 } | 1578 } |
OLD | NEW |