nss/lib/pk11wrap/pk11mech.c - Issue 27510015: Support ChaCha20+Poly1305 cipher suites.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: nss/lib/pk11wrap/pk11mech.c

Issue 27510015: Support ChaCha20+Poly1305 cipher suites. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/

Patch Set: Fold long lines 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:

Index: nss/lib/pk11wrap/pk11mech.c

===================================================================

--- nss/lib/pk11wrap/pk11mech.c (revision 228205)

+++ nss/lib/pk11wrap/pk11mech.c (working copy)

@@ -152,6 +152,8 @@

return CKM_SEED_CBC;

case CKK_CAMELLIA:

return CKM_CAMELLIA_CBC;

+ case CKK_NSS_CHACHA20:

+ return CKM_NSS_CHACHA20_POLY1305;

case CKK_AES:

return CKM_AES_CBC;

case CKK_DES:

@@ -219,6 +221,8 @@

case CKM_CAMELLIA_CBC_PAD:

case CKM_CAMELLIA_KEY_GEN:

return CKK_CAMELLIA;

+ case CKM_NSS_CHACHA20_POLY1305:

+ return CKK_NSS_CHACHA20;

case CKM_AES_ECB:

case CKM_AES_CBC:

case CKM_AES_CCM:

@@ -429,6 +433,8 @@