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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: nss/lib/ckfw/builtins/builtins.h

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
« no previous file with comments | « nss/lib/ckfw/builtins/btoken.c ('k') | nss/lib/ckfw/builtins/certdata.c » ('j') | nss/lib/util/secoid.c » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "nssckmdt.h" 5 #include "nssckmdt.h"
6 #include "nssckfw.h" 6 #include "nssckfw.h"
7 7
8 /* 8 /*
9 * I'm including this for access to the arena functions. 9 * I'm including this for access to the arena functions.
10 * Looks like we should publish that API. 10 * Looks like we should publish that API.
11 */ 11 */
12 #ifndef BASE_H 12 #ifndef BASE_H
13 #include "base.h" 13 #include "base.h"
14 #endif /* BASE_H */ 14 #endif /* BASE_H */
15 15
16 /* 16 /*
17 * This is where the Netscape extensions live, at least for now. 17 * This is where the Netscape extensions live, at least for now.
18 */ 18 */
19 #ifndef CKT_H 19 #ifndef CKT_H
20 #include "ckt.h" 20 #include "ckt.h"
21 #endif /* CKT_H */ 21 #endif /* CKT_H */
22 22
23 struct builtinsInternalObjectStr { 23 struct builtinsInternalObjectStr {
24 CK_ULONG n; 24 CK_ULONG n;
25 const CK_ATTRIBUTE_TYPE *types; 25 const CK_ATTRIBUTE_TYPE *types;
26 const NSSItem *items; 26 const NSSItem *items;
27 NSSCKMDObject mdObject; 27 NSSCKMDObject mdObject;
28 }; 28 };
29 typedef struct builtinsInternalObjectStr builtinsInternalObject; 29 typedef struct builtinsInternalObjectStr builtinsInternalObject;
30 30
31 extern builtinsInternalObject nss_builtins_data[]; 31 extern builtinsInternalObject nss_builtins_data[];
32 extern const PRUint32 nss_builtins_nObjects; 32 extern const PRUint32 nss_builtins_nObjects;
33 33
34 extern const CK_VERSION nss_builtins_CryptokiVersion; 34 extern const CK_VERSION nss_builtins_CryptokiVersion;
35 extern const CK_VERSION nss_builtins_LibraryVersion; 35 extern const CK_VERSION nss_builtins_LibraryVersion;
36 extern const CK_VERSION nss_builtins_HardwareVersion; 36 extern const CK_VERSION nss_builtins_HardwareVersion;
37 extern const CK_VERSION nss_builtins_FirmwareVersion; 37 extern const CK_VERSION nss_builtins_FirmwareVersion;
38 38
39 extern const NSSUTF8 nss_builtins_ManufacturerID[]; 39 extern const NSSUTF8 nss_builtins_ManufacturerID[];
40 extern const NSSUTF8 nss_builtins_LibraryDescription[]; 40 extern const NSSUTF8 nss_builtins_LibraryDescription[];
41 extern const NSSUTF8 nss_builtins_SlotDescription[]; 41 extern const NSSUTF8 nss_builtins_SlotDescription[];
42 extern const NSSUTF8 nss_builtins_TokenLabel[]; 42 extern const NSSUTF8 nss_builtins_TokenLabel[];
43 extern const NSSUTF8 nss_builtins_TokenModel[]; 43 extern const NSSUTF8 nss_builtins_TokenModel[];
44 extern const NSSUTF8 nss_builtins_TokenSerialNumber[]; 44 extern const NSSUTF8 nss_builtins_TokenSerialNumber[];
45 45
46 extern const NSSCKMDInstance nss_builtins_mdInstance; 46 extern const NSSCKMDInstance nss_builtins_mdInstance;
47 extern const NSSCKMDSlot nss_builtins_mdSlot; 47 extern const NSSCKMDSlot nss_builtins_mdSlot;
48 extern const NSSCKMDToken nss_builtins_mdToken; 48 extern const NSSCKMDToken nss_builtins_mdToken;
49 49
50 NSS_EXTERN NSSCKMDSession * 50 NSS_EXTERN NSSCKMDSession *
51 nss_builtins_CreateSession 51 nss_builtins_CreateSession(
52 ( 52 NSSCKFWSession *fwSession,
53 NSSCKFWSession *fwSession, 53 CK_RV *pError);
54 CK_RV *pError
55 );
56 54
57 NSS_EXTERN NSSCKMDFindObjects * 55 NSS_EXTERN NSSCKMDFindObjects *
58 nss_builtins_FindObjectsInit 56 nss_builtins_FindObjectsInit(
59 ( 57 NSSCKFWSession *fwSession,
60 NSSCKFWSession *fwSession, 58 CK_ATTRIBUTE_PTR pTemplate,
61 CK_ATTRIBUTE_PTR pTemplate, 59 CK_ULONG ulAttributeCount,
62 CK_ULONG ulAttributeCount, 60 CK_RV *pError);
63 CK_RV *pError
64 );
65 61
66 NSS_EXTERN NSSCKMDObject * 62 NSS_EXTERN NSSCKMDObject *
67 nss_builtins_CreateMDObject 63 nss_builtins_CreateMDObject(
68 ( 64 NSSArena *arena,
69 NSSArena *arena, 65 builtinsInternalObject *io,
70 builtinsInternalObject *io, 66 CK_RV *pError);
71 CK_RV *pError
72 );
OLDNEW
« no previous file with comments | « nss/lib/ckfw/builtins/btoken.c ('k') | nss/lib/ckfw/builtins/certdata.c » ('j') | nss/lib/util/secoid.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698