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

Side by Side Diff: nss/lib/pk11wrap/secmodi.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
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 * Internal header file included only by files in pkcs11 dir, or in 5 * Internal header file included only by files in pkcs11 dir, or in
6 * pkcs11 specific client and server files. 6 * pkcs11 specific client and server files.
7 */ 7 */
8 #ifndef _SECMODI_H_ 8 #ifndef _SECMODI_H_
9 #define _SECMODI_H_ 1 9 #define _SECMODI_H_ 1
10 #include "pkcs11.h" 10 #include "pkcs11.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 SECMODConfigList *conflist, int count); 69 SECMODConfigList *conflist, int count);
70 /* free our list of databases */ 70 /* free our list of databases */
71 void secmod_FreeConfigList(SECMODConfigList *conflist, int count); 71 void secmod_FreeConfigList(SECMODConfigList *conflist, int count);
72 72
73 /* parsing parameters */ 73 /* parsing parameters */
74 /* returned char * must be freed by caller with PORT_Free */ 74 /* returned char * must be freed by caller with PORT_Free */
75 /* children and ids are null terminated arrays which must be freed with 75 /* children and ids are null terminated arrays which must be freed with
76 * secmod_FreeChildren */ 76 * secmod_FreeChildren */
77 char *secmod_ParseModuleSpecForTokens(PRBool convert, 77 char *secmod_ParseModuleSpecForTokens(PRBool convert,
78 PRBool isFIPS, 78 PRBool isFIPS,
79 » » » » char *moduleSpec, 79 » » » » const char *moduleSpec,
80 » » » » char ***children, 80 » » » » char ***children,
81 CK_SLOT_ID **ids); 81 CK_SLOT_ID **ids);
82 void secmod_FreeChildren(char **children, CK_SLOT_ID *ids); 82 void secmod_FreeChildren(char **children, CK_SLOT_ID *ids);
83 char *secmod_MkAppendTokensList(PLArenaPool *arena, char *origModuleSpec, 83 char *secmod_MkAppendTokensList(PLArenaPool *arena, char *origModuleSpec,
84 char *newModuleSpec, CK_SLOT_ID newID, 84 char *newModuleSpec, CK_SLOT_ID newID,
85 char **children, CK_SLOT_ID *ids); 85 char **children, CK_SLOT_ID *ids);
86 86
87 87
88 void SECMOD_SlotDestroyModule(SECMODModule *module, PRBool fromSlot); 88 void SECMOD_SlotDestroyModule(SECMODModule *module, PRBool fromSlot);
89 CK_RV pk11_notify(CK_SESSION_HANDLE session, CK_NOTIFICATION event, 89 CK_RV pk11_notify(CK_SESSION_HANDLE session, CK_NOTIFICATION event,
90 CK_VOID_PTR pdata); 90 CK_VOID_PTR pdata);
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 CK_OBJECT_HANDLE certID, CK_ATTRIBUTE *privateLabel); 162 CK_OBJECT_HANDLE certID, CK_ATTRIBUTE *privateLabel);
163 163
164 SECItem *pk11_GenerateNewParamWithKeyLen(CK_MECHANISM_TYPE type, int keyLen); 164 SECItem *pk11_GenerateNewParamWithKeyLen(CK_MECHANISM_TYPE type, int keyLen);
165 SECItem *pk11_ParamFromIVWithLen(CK_MECHANISM_TYPE type, 165 SECItem *pk11_ParamFromIVWithLen(CK_MECHANISM_TYPE type,
166 SECItem *iv, int keyLen); 166 SECItem *iv, int keyLen);
167 167
168 SEC_END_PROTOS 168 SEC_END_PROTOS
169 169
170 #endif 170 #endif
171 171
OLDNEW
« no previous file with comments | « nss/lib/pk11wrap/pk11util.c ('k') | nss/lib/pkcs7/p7local.c » ('j') | nss/lib/util/secoid.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698