| 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  * This file implements PKCS 11 on top of our existing security modules | 5  * This file implements PKCS 11 on top of our existing security modules | 
| 6  * | 6  * | 
| 7  * For more information about PKCS 11 See PKCS 11 Token Inteface Standard. | 7  * For more information about PKCS 11 See PKCS 11 Token Inteface Standard. | 
| 8  *   This implementation has two slots: | 8  *   This implementation has two slots: | 
| 9  *      slot 1 is our generic crypto support. It does not require login | 9  *      slot 1 is our generic crypto support. It does not require login | 
| 10  *   (unless you've enabled FIPS). It supports Public Key ops, and all they | 10  *   (unless you've enabled FIPS). It supports Public Key ops, and all they | 
| (...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 429 CK_RV FC_Initialize(CK_VOID_PTR pReserved) { | 429 CK_RV FC_Initialize(CK_VOID_PTR pReserved) { | 
| 430     const char *envp; | 430     const char *envp; | 
| 431     CK_RV crv; | 431     CK_RV crv; | 
| 432 | 432 | 
| 433     sftk_ForkReset(pReserved, &crv); | 433     sftk_ForkReset(pReserved, &crv); | 
| 434 | 434 | 
| 435     if (nsf_init) { | 435     if (nsf_init) { | 
| 436         return CKR_CRYPTOKI_ALREADY_INITIALIZED; | 436         return CKR_CRYPTOKI_ALREADY_INITIALIZED; | 
| 437     } | 437     } | 
| 438 | 438 | 
| 439     if ((envp = PR_GetEnv("NSS_ENABLE_AUDIT")) != NULL) { | 439     if ((envp = PR_GetEnvSecure("NSS_ENABLE_AUDIT")) != NULL) { | 
| 440         sftk_audit_enabled = (atoi(envp) == 1); | 440         sftk_audit_enabled = (atoi(envp) == 1); | 
| 441     } | 441     } | 
| 442 | 442 | 
| 443     crv = nsc_CommonInitialize(pReserved, PR_TRUE); | 443     crv = nsc_CommonInitialize(pReserved, PR_TRUE); | 
| 444 | 444 | 
| 445     /* not an 'else' rv can be set by either SFTK_LowInit or SFTK_SlotInit*/ | 445     /* not an 'else' rv can be set by either SFTK_LowInit or SFTK_SlotInit*/ | 
| 446     if (crv != CKR_OK) { | 446     if (crv != CKR_OK) { | 
| 447         sftk_fatalError = PR_TRUE; | 447         sftk_fatalError = PR_TRUE; | 
| 448         return crv; | 448         return crv; | 
| 449     } | 449     } | 
| (...skipping 1092 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1542 } | 1542 } | 
| 1543 | 1543 | 
| 1544 | 1544 | 
| 1545 CK_RV FC_WaitForSlotEvent(CK_FLAGS flags, CK_SLOT_ID_PTR pSlot, | 1545 CK_RV FC_WaitForSlotEvent(CK_FLAGS flags, CK_SLOT_ID_PTR pSlot, | 
| 1546                                                          CK_VOID_PTR pReserved) | 1546                                                          CK_VOID_PTR pReserved) | 
| 1547 { | 1547 { | 
| 1548     CHECK_FORK(); | 1548     CHECK_FORK(); | 
| 1549 | 1549 | 
| 1550     return NSC_WaitForSlotEvent(flags, pSlot, pReserved); | 1550     return NSC_WaitForSlotEvent(flags, pSlot, pReserved); | 
| 1551 } | 1551 } | 
| OLD | NEW | 
|---|