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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: nss/lib/util/pkcs11n.h

Issue 27510015: Support ChaCha20+Poly1305 cipher suites. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Fix compilation error, fix typos in function arguments Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
« nss/lib/freebl/chacha20/chacha20_vec.c ('K') | « nss/lib/softoken/pkcs11c.c ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nss/lib/util/pkcs11n.h
===================================================================
--- nss/lib/util/pkcs11n.h (revision 228205)
+++ nss/lib/util/pkcs11n.h (working copy)
@@ -51,6 +51,8 @@
#define CKK_NSS_JPAKE_ROUND1 (CKK_NSS + 2)
#define CKK_NSS_JPAKE_ROUND2 (CKK_NSS + 3)
+#define CKK_NSS_CHACHA20 (CKK_NSS + 4)
+
/*
* NSS-defined certificate types
*
@@ -214,6 +216,17 @@
#define CKM_NSS_TLS_KEY_AND_MAC_DERIVE_SHA256 (CKM_NSS + 23)
#define CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256 (CKM_NSS + 24)
+#define CKM_NSS_CHACHA20_POLY1305 (CKM_NSS + 25)
+#define CKM_NSS_CHACHA20_KEY_GEN (CKM_NSS + 26)
+
+typedef struct CK_AEAD_PARAMS {
+ CK_BYTE_PTR pIv; /* This is the nonce. */
+ CK_ULONG ulIvLen;
+ CK_BYTE_PTR pAAD;
+ CK_ULONG ulAADLen;
+ CK_ULONG ulTagBits;
+} CK_AEAD_PARAMS;
+
/*
* HISTORICAL:
* Do not attempt to use these. They are only used by NETSCAPE's internal
« nss/lib/freebl/chacha20/chacha20_vec.c ('K') | « nss/lib/softoken/pkcs11c.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698