| 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 * Deal with PKCS #11 Slots. | 5 * Deal with PKCS #11 Slots. |
| 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" |
| 11 #include "secmodti.h" | 11 #include "secmodti.h" |
| 12 #include "pkcs11t.h" | 12 #include "pkcs11t.h" |
| 13 #include "pk11func.h" | 13 #include "pk11func.h" |
| 14 #include "secitem.h" | 14 #include "secitem.h" |
| 15 #include "secerr.h" | 15 #include "secerr.h" |
| 16 | 16 |
| 17 #include "dev.h" | 17 #include "dev.h" |
| 18 #include "dev3hack.h" | 18 #include "dev3hack.h" |
| 19 #include "pkim.h" | 19 #include "pkim.h" |
| 20 #include "utilpars.h" |
| 20 | 21 |
| 21 | 22 |
| 22 /************************************************************* | 23 /************************************************************* |
| 23 * local static and global data | 24 * local static and global data |
| 24 *************************************************************/ | 25 *************************************************************/ |
| 25 | 26 |
| 26 /* | 27 /* |
| 27 * This array helps parsing between names, mechanisms, and flags. | 28 * This array helps parsing between names, mechanisms, and flags. |
| 28 * to make the config files understand more entries, add them | 29 * to make the config files understand more entries, add them |
| 29 * to this table. | 30 * to this table. |
| (...skipping 2291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2321 first_time_set = PR_TRUE; | 2322 first_time_set = PR_TRUE; |
| 2322 } | 2323 } |
| 2323 if ((interval-first_time) > timeout) { | 2324 if ((interval-first_time) > timeout) { |
| 2324 return waitForRemoval ? PK11TokenPresent : PK11TokenRemoved; | 2325 return waitForRemoval ? PK11TokenPresent : PK11TokenRemoved; |
| 2325 } | 2326 } |
| 2326 } | 2327 } |
| 2327 PR_Sleep(latency); | 2328 PR_Sleep(latency); |
| 2328 } | 2329 } |
| 2329 return waitForRemoval ? PK11TokenRemoved : PK11TokenPresent; | 2330 return waitForRemoval ? PK11TokenRemoved : PK11TokenPresent; |
| 2330 } | 2331 } |
| OLD | NEW |