Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Side by Side Diff: nss/lib/ckfw/builtins/bslot.c

Issue 1843333003: Update NSPR to 4.12 and NSS to 3.23 on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/nss.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #include "builtins.h" 5 #include "builtins.h"
6 6
7 /* 7 /*
8 * builtins/slot.c 8 * builtins/slot.c
9 * 9 *
10 * This file implements the NSSCKMDSlot object for the 10 * This file implements the NSSCKMDSlot object for the
11 * "builtin objects" cryptoki module. 11 * "builtin objects" cryptoki module.
12 */ 12 */
13 13
14 static NSSUTF8 * 14 static NSSUTF8 *
15 builtins_mdSlot_GetSlotDescription 15 builtins_mdSlot_GetSlotDescription(
16 ( 16 NSSCKMDSlot *mdSlot,
17 NSSCKMDSlot *mdSlot, 17 NSSCKFWSlot *fwSlot,
18 NSSCKFWSlot *fwSlot, 18 NSSCKMDInstance *mdInstance,
19 NSSCKMDInstance *mdInstance, 19 NSSCKFWInstance *fwInstance,
20 NSSCKFWInstance *fwInstance, 20 CK_RV *pError)
21 CK_RV *pError
22 )
23 { 21 {
24 return (NSSUTF8 *)nss_builtins_SlotDescription; 22 return (NSSUTF8 *)nss_builtins_SlotDescription;
25 } 23 }
26 24
27 static NSSUTF8 * 25 static NSSUTF8 *
28 builtins_mdSlot_GetManufacturerID 26 builtins_mdSlot_GetManufacturerID(
29 ( 27 NSSCKMDSlot *mdSlot,
30 NSSCKMDSlot *mdSlot, 28 NSSCKFWSlot *fwSlot,
31 NSSCKFWSlot *fwSlot, 29 NSSCKMDInstance *mdInstance,
32 NSSCKMDInstance *mdInstance, 30 NSSCKFWInstance *fwInstance,
33 NSSCKFWInstance *fwInstance, 31 CK_RV *pError)
34 CK_RV *pError
35 )
36 { 32 {
37 return (NSSUTF8 *)nss_builtins_ManufacturerID; 33 return (NSSUTF8 *)nss_builtins_ManufacturerID;
38 } 34 }
39 35
40 static CK_VERSION 36 static CK_VERSION
41 builtins_mdSlot_GetHardwareVersion 37 builtins_mdSlot_GetHardwareVersion(
42 ( 38 NSSCKMDSlot *mdSlot,
43 NSSCKMDSlot *mdSlot, 39 NSSCKFWSlot *fwSlot,
44 NSSCKFWSlot *fwSlot, 40 NSSCKMDInstance *mdInstance,
45 NSSCKMDInstance *mdInstance, 41 NSSCKFWInstance *fwInstance)
46 NSSCKFWInstance *fwInstance
47 )
48 { 42 {
49 return nss_builtins_HardwareVersion; 43 return nss_builtins_HardwareVersion;
50 } 44 }
51 45
52 static CK_VERSION 46 static CK_VERSION
53 builtins_mdSlot_GetFirmwareVersion 47 builtins_mdSlot_GetFirmwareVersion(
54 ( 48 NSSCKMDSlot *mdSlot,
55 NSSCKMDSlot *mdSlot, 49 NSSCKFWSlot *fwSlot,
56 NSSCKFWSlot *fwSlot, 50 NSSCKMDInstance *mdInstance,
57 NSSCKMDInstance *mdInstance, 51 NSSCKFWInstance *fwInstance)
58 NSSCKFWInstance *fwInstance
59 )
60 { 52 {
61 return nss_builtins_FirmwareVersion; 53 return nss_builtins_FirmwareVersion;
62 } 54 }
63 55
64 static NSSCKMDToken * 56 static NSSCKMDToken *
65 builtins_mdSlot_GetToken 57 builtins_mdSlot_GetToken(
66 ( 58 NSSCKMDSlot *mdSlot,
67 NSSCKMDSlot *mdSlot, 59 NSSCKFWSlot *fwSlot,
68 NSSCKFWSlot *fwSlot, 60 NSSCKMDInstance *mdInstance,
69 NSSCKMDInstance *mdInstance, 61 NSSCKFWInstance *fwInstance,
70 NSSCKFWInstance *fwInstance, 62 CK_RV *pError)
71 CK_RV *pError
72 )
73 { 63 {
74 return (NSSCKMDToken *)&nss_builtins_mdToken; 64 return (NSSCKMDToken *)&nss_builtins_mdToken;
75 } 65 }
76 66
77 const NSSCKMDSlot 67 const NSSCKMDSlot
78 nss_builtins_mdSlot = { 68 nss_builtins_mdSlot = {
79 (void *)NULL, /* etc */ 69 (void *)NULL, /* etc */
80 NULL, /* Initialize */ 70 NULL, /* Initialize */
81 NULL, /* Destroy */ 71 NULL, /* Destroy */
82 builtins_mdSlot_GetSlotDescription, 72 builtins_mdSlot_GetSlotDescription,
83 builtins_mdSlot_GetManufacturerID, 73 builtins_mdSlot_GetManufacturerID,
84 NULL, /* GetTokenPresent -- defaults to true */ 74 NULL, /* GetTokenPresent -- defaults to true */
85 NULL, /* GetRemovableDevice -- defaults to false */ 75 NULL, /* GetRemovableDevice -- defaults to false */
86 NULL, /* GetHardwareSlot -- defaults to false */ 76 NULL, /* GetHardwareSlot -- defaults to false */
87 builtins_mdSlot_GetHardwareVersion, 77 builtins_mdSlot_GetHardwareVersion,
88 builtins_mdSlot_GetFirmwareVersion, 78 builtins_mdSlot_GetFirmwareVersion,
89 builtins_mdSlot_GetToken, 79 builtins_mdSlot_GetToken,
90 (void *)NULL /* null terminator */ 80 (void *)NULL /* null terminator */
91 }; 81 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698