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

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

Issue 105893015: Update third_party/nss to NSS 3.15.4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Remove SVN property on new file nss/lib/freebl/rsapkcs.c Created 6 years, 11 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
« no previous file with comments | « nss/lib/pk11wrap/pk11pub.h ('k') | nss/lib/smime/smime.h » ('j') | no next file with comments »
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 * 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 87
88 88
89 void SECMOD_SlotDestroyModule(SECMODModule *module, PRBool fromSlot); 89 void SECMOD_SlotDestroyModule(SECMODModule *module, PRBool fromSlot);
90 CK_RV pk11_notify(CK_SESSION_HANDLE session, CK_NOTIFICATION event, 90 CK_RV pk11_notify(CK_SESSION_HANDLE session, CK_NOTIFICATION event,
91 CK_VOID_PTR pdata); 91 CK_VOID_PTR pdata);
92 void pk11_SignedToUnsigned(CK_ATTRIBUTE *attrib); 92 void pk11_SignedToUnsigned(CK_ATTRIBUTE *attrib);
93 CK_OBJECT_HANDLE pk11_FindObjectByTemplate(PK11SlotInfo *slot, 93 CK_OBJECT_HANDLE pk11_FindObjectByTemplate(PK11SlotInfo *slot,
94 CK_ATTRIBUTE *inTemplate,int tsize); 94 CK_ATTRIBUTE *inTemplate,int tsize);
95 CK_OBJECT_HANDLE *pk11_FindObjectsByTemplate(PK11SlotInfo *slot, 95 CK_OBJECT_HANDLE *pk11_FindObjectsByTemplate(PK11SlotInfo *slot,
96 CK_ATTRIBUTE *inTemplate,int tsize, int *objCount); 96 CK_ATTRIBUTE *inTemplate,int tsize, int *objCount);
97 SECStatus PK11_UpdateSlotAttribute(PK11SlotInfo *slot,
98 PK11DefaultArrayEntry *entry, PRBool add);
99 97
100 #define PK11_GETTAB(x) ((CK_FUNCTION_LIST_PTR)((x)->functionList)) 98 #define PK11_GETTAB(x) ((CK_FUNCTION_LIST_PTR)((x)->functionList))
101 #define PK11_SETATTRS(x,id,v,l) (x)->type = (id); \ 99 #define PK11_SETATTRS(x,id,v,l) (x)->type = (id); \
102 (x)->pValue=(v); (x)->ulValueLen = (l); 100 (x)->pValue=(v); (x)->ulValueLen = (l);
103 SECStatus PK11_CreateNewObject(PK11SlotInfo *slot, CK_SESSION_HANDLE session, 101 SECStatus PK11_CreateNewObject(PK11SlotInfo *slot, CK_SESSION_HANDLE session,
104 const CK_ATTRIBUTE *theTemplate, int count, 102 const CK_ATTRIBUTE *theTemplate, int count,
105 PRBool token, CK_OBJECT_HANDLE *objectID); 103 PRBool token, CK_OBJECT_HANDLE *objectID);
106 104
107 SECStatus pbe_PK11AlgidToParam(SECAlgorithmID *algid,SECItem *mech); 105 SECStatus pbe_PK11AlgidToParam(SECAlgorithmID *algid,SECItem *mech);
108 SECStatus PBE_PK11ParamToAlgid(SECOidTag algTag, SECItem *param, 106 SECStatus PBE_PK11ParamToAlgid(SECOidTag algTag, SECItem *param,
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 CK_OBJECT_HANDLE certID, CK_ATTRIBUTE *privateLabel); 163 CK_OBJECT_HANDLE certID, CK_ATTRIBUTE *privateLabel);
166 164
167 SECItem *pk11_GenerateNewParamWithKeyLen(CK_MECHANISM_TYPE type, int keyLen); 165 SECItem *pk11_GenerateNewParamWithKeyLen(CK_MECHANISM_TYPE type, int keyLen);
168 SECItem *pk11_ParamFromIVWithLen(CK_MECHANISM_TYPE type, 166 SECItem *pk11_ParamFromIVWithLen(CK_MECHANISM_TYPE type,
169 SECItem *iv, int keyLen); 167 SECItem *iv, int keyLen);
170 168
171 SEC_END_PROTOS 169 SEC_END_PROTOS
172 170
173 #endif 171 #endif
174 172
OLDNEW
« no previous file with comments | « nss/lib/pk11wrap/pk11pub.h ('k') | nss/lib/smime/smime.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698