mozilla/security/nss/lib/pk11wrap/secmodi.h - Issue 11362174: Update NSS to NSS 3.14 pre-release snapshot 2012-06-28 01:00:00 PDT.

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

Issue 11362174: Update NSS to NSS 3.14 pre-release snapshot 2012-06-28 01:00:00 PDT. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/

Patch Set: Update the snapshot timestamp in README.chromium Created 8 years, 1 month 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

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 * 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 66 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
77 * secmod_FreeChildren */	77 * secmod_FreeChildren */

78 char *secmod_ParseModuleSpecForTokens(PRBool convert,	78 char *secmod_ParseModuleSpecForTokens(PRBool convert,

79 PRBool isFIPS,	79 PRBool isFIPS,

80 char *moduleSpec,	80 char *moduleSpec,

81 char ***children,	81 char ***children,

82 CK_SLOT_ID **ids);	82 CK_SLOT_ID **ids);

83 void secmod_FreeChildren(char *children, CK_SLOT_ID ids);	83 void secmod_FreeChildren(char *children, CK_SLOT_ID ids);

84 char secmod_MkAppendTokensList(PRArenaPool arena, char *origModuleSpec,	84 char secmod_MkAppendTokensList(PRArenaPool arena, char *origModuleSpec,

85 char *newModuleSpec, CK_SLOT_ID newID,	85 char *newModuleSpec, CK_SLOT_ID newID,

86 char *children, CK_SLOT_ID ids);	86 char *children, CK_SLOT_ID ids);

87 char secmod_DoubleEscape(const char string, char quote1, char quote2);

88

89	87

90	88

91 void SECMOD_SlotDestroyModule(SECMODModule *module, PRBool fromSlot);	89 void SECMOD_SlotDestroyModule(SECMODModule *module, PRBool fromSlot);

92 CK_RV pk11_notify(CK_SESSION_HANDLE session, CK_NOTIFICATION event,	90 CK_RV pk11_notify(CK_SESSION_HANDLE session, CK_NOTIFICATION event,

93 CK_VOID_PTR pdata);	91 CK_VOID_PTR pdata);

94 void pk11_SignedToUnsigned(CK_ATTRIBUTE *attrib);	92 void pk11_SignedToUnsigned(CK_ATTRIBUTE *attrib);

95 CK_OBJECT_HANDLE pk11_FindObjectByTemplate(PK11SlotInfo *slot,	93 CK_OBJECT_HANDLE pk11_FindObjectByTemplate(PK11SlotInfo *slot,

96 CK_ATTRIBUTE *inTemplate,int tsize);	94 CK_ATTRIBUTE *inTemplate,int tsize);

97 CK_OBJECT_HANDLE pk11_FindObjectsByTemplate(PK11SlotInfo slot,	95 CK_OBJECT_HANDLE pk11_FindObjectsByTemplate(PK11SlotInfo slot,

98 CK_ATTRIBUTE inTemplate,int tsize, int objCount);	96 CK_ATTRIBUTE inTemplate,int tsize, int objCount);

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
167 CK_OBJECT_HANDLE certID, CK_ATTRIBUTE *privateLabel);	165 CK_OBJECT_HANDLE certID, CK_ATTRIBUTE *privateLabel);

168	166

169 SECItem *pk11_GenerateNewParamWithKeyLen(CK_MECHANISM_TYPE type, int keyLen);	167 SECItem *pk11_GenerateNewParamWithKeyLen(CK_MECHANISM_TYPE type, int keyLen);

170 SECItem *pk11_ParamFromIVWithLen(CK_MECHANISM_TYPE type,	168 SECItem *pk11_ParamFromIVWithLen(CK_MECHANISM_TYPE type,

171 SECItem *iv, int keyLen);	169 SECItem *iv, int keyLen);

172	170

173 SEC_END_PROTOS	171 SEC_END_PROTOS

174	172

175 #endif	173 #endif

176	174

OLD	NEW

« no previous file with comments | « mozilla/security/nss/lib/pk11wrap/pk11util.c ('k') | mozilla/security/nss/lib/pk11wrap/secmodt.h » ('j') | mozilla/security/nss/lib/pk11wrap/secmodt.h » ('J')