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

Side by Side Diff: nss/lib/pk11wrap/secmodi.h

Issue 319593003: Update to NSS 3.16.2 Beta 3. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/nss
Patch Set: Remove unused function SEC_NumberOrNameStringToOIDTag Created 6 years, 6 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 | Annotate | Revision Log
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 /* Operate on modules by name */ 43 /* Operate on modules by name */
44 extern SECMODModule *SECMOD_FindModuleByID(SECMODModuleID); 44 extern SECMODModule *SECMOD_FindModuleByID(SECMODModuleID);
45 extern SECMODModule *secmod_FindModuleByFuncPtr(void *funcPtr); 45 extern SECMODModule *secmod_FindModuleByFuncPtr(void *funcPtr);
46 46
47 /* database/memory management */ 47 /* database/memory management */
48 extern SECMODModuleList *SECMOD_NewModuleListElement(void); 48 extern SECMODModuleList *SECMOD_NewModuleListElement(void);
49 extern SECMODModuleList *SECMOD_DestroyModuleListElement(SECMODModuleList *); 49 extern SECMODModuleList *SECMOD_DestroyModuleListElement(SECMODModuleList *);
50 extern void SECMOD_DestroyModuleList(SECMODModuleList *); 50 extern void SECMOD_DestroyModuleList(SECMODModuleList *);
51 extern SECStatus SECMOD_AddModule(SECMODModule *newModule); 51 extern SECStatus SECMOD_AddModule(SECMODModule *newModule);
52 52
53 extern unsigned long SECMOD_InternaltoPubMechFlags(unsigned long internalFlags);
54 extern unsigned long SECMOD_InternaltoPubCipherFlags(unsigned long internalFlags ); 53 extern unsigned long SECMOD_InternaltoPubCipherFlags(unsigned long internalFlags );
55 54
56 /* Library functions */ 55 /* Library functions */
57 SECStatus secmod_LoadPKCS11Module(SECMODModule *, SECMODModule **oldModule); 56 SECStatus secmod_LoadPKCS11Module(SECMODModule *, SECMODModule **oldModule);
58 SECStatus SECMOD_UnloadModule(SECMODModule *); 57 SECStatus SECMOD_UnloadModule(SECMODModule *);
59 void SECMOD_SetInternalModule(SECMODModule *); 58 void SECMOD_SetInternalModule(SECMODModule *);
60 PRBool secmod_IsInternalKeySlot(SECMODModule *); 59 PRBool secmod_IsInternalKeySlot(SECMODModule *);
61 void secmod_SetInternalKeySlotFlag(SECMODModule *mod, PRBool val); 60 void secmod_SetInternalKeySlotFlag(SECMODModule *mod, PRBool val);
62 61
63 62
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 CK_OBJECT_HANDLE certID, CK_ATTRIBUTE *privateLabel); 162 CK_OBJECT_HANDLE certID, CK_ATTRIBUTE *privateLabel);
164 163
165 SECItem *pk11_GenerateNewParamWithKeyLen(CK_MECHANISM_TYPE type, int keyLen); 164 SECItem *pk11_GenerateNewParamWithKeyLen(CK_MECHANISM_TYPE type, int keyLen);
166 SECItem *pk11_ParamFromIVWithLen(CK_MECHANISM_TYPE type, 165 SECItem *pk11_ParamFromIVWithLen(CK_MECHANISM_TYPE type,
167 SECItem *iv, int keyLen); 166 SECItem *iv, int keyLen);
168 167
169 SEC_END_PROTOS 168 SEC_END_PROTOS
170 169
171 #endif 170 #endif
172 171
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698