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

Side by Side Diff: nss/lib/softoken/pkcs11i.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 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 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 void *hashContext; 394 void *hashContext;
395 SFTKBegin begin; 395 SFTKBegin begin;
396 SFTKHash update; 396 SFTKHash update;
397 SFTKEnd end; 397 SFTKEnd end;
398 CK_ULONG macSize; 398 CK_ULONG macSize;
399 int padSize; 399 int padSize;
400 unsigned char key[MAX_KEY_LEN]; 400 unsigned char key[MAX_KEY_LEN];
401 unsigned int keySize; 401 unsigned int keySize;
402 }; 402 };
403 403
404 /* SFTKChaCha20Poly1305Info saves the key, tag length, nonce, and additional 404 /* SFTKChaCha20Poly1305Info saves the key, tag length, nonce,
405 * data for a ChaCha20+Poly1305 AEAD operation. */ 405 * and additional data for a ChaCha20+Poly1305 AEAD operation. */
406 struct SFTKChaCha20Poly1305InfoStr { 406 struct SFTKChaCha20Poly1305InfoStr {
407 ChaCha20Poly1305Context freeblCtx; 407 ChaCha20Poly1305Context freeblCtx;
408 unsigned char nonce[8]; 408 unsigned char nonce[12];
409 unsigned char ad[16]; 409 unsigned char ad[16];
410 unsigned char *adOverflow; 410 unsigned char *adOverflow;
411 unsigned int adLen; 411 unsigned int adLen;
412 }; 412 };
413 413
414 /* 414 /*
415 * Template based on SECItems, suitable for passing as arrays 415 * Template based on SECItems, suitable for passing as arrays
416 */ 416 */
417 struct SFTKItemTemplateStr { 417 struct SFTKItemTemplateStr {
418 CK_ATTRIBUTE_TYPE type; 418 CK_ATTRIBUTE_TYPE type;
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
749 extern CK_RV 749 extern CK_RV
750 sftk_TLSPRFInit(SFTKSessionContext *context, 750 sftk_TLSPRFInit(SFTKSessionContext *context,
751 SFTKObject * key, 751 SFTKObject * key,
752 CK_KEY_TYPE key_type, 752 CK_KEY_TYPE key_type,
753 HASH_HashType hash_alg, 753 HASH_HashType hash_alg,
754 unsigned int out_len); 754 unsigned int out_len);
755 755
756 SEC_END_PROTOS 756 SEC_END_PROTOS
757 757
758 #endif /* _PKCS11I_H_ */ 758 #endif /* _PKCS11I_H_ */
OLDNEW
« no previous file with comments | « nss/lib/softoken/pkcs11c.c ('k') | nss/lib/softoken/sdb.c » ('j') | nss/lib/util/secoid.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698