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

Side by Side Diff: nss/lib/softoken/pkcs11i.h

Issue 13898013: Update NSS to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Update NSS versions and tag in README.chromium Created 7 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 | 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 data structures and functions used by pkcs11.c 5 * Internal data structures and functions used by pkcs11.c
6 */ 6 */
7 #ifndef _PKCS11I_H_ 7 #ifndef _PKCS11I_H_
8 #define _PKCS11I_H_ 1 8 #define _PKCS11I_H_ 1
9 9
10 #include "nssilock.h" 10 #include "nssilock.h"
(...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 void *pctx, void *out, unsigned int *outLength, unsigned int maxLength); 730 void *pctx, void *out, unsigned int *outLength, unsigned int maxLength);
731 void sftk_MACConstantTime_DestroyContext(void *pctx, PRBool); 731 void sftk_MACConstantTime_DestroyContext(void *pctx, PRBool);
732 732
733 /**************************************** 733 /****************************************
734 * implement TLS Pseudo Random Function (PRF) 734 * implement TLS Pseudo Random Function (PRF)
735 */ 735 */
736 736
737 extern CK_RV 737 extern CK_RV
738 sftk_TLSPRFInit(SFTKSessionContext *context, 738 sftk_TLSPRFInit(SFTKSessionContext *context,
739 SFTKObject * key, 739 SFTKObject * key,
740 » » CK_KEY_TYPE key_type); 740 » » CK_KEY_TYPE key_type,
741 » » HASH_HashType hash_alg);
741 742
742 SEC_END_PROTOS 743 SEC_END_PROTOS
743 744
744 #endif /* _PKCS11I_H_ */ 745 #endif /* _PKCS11I_H_ */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698