nss/lib/pk11wrap/pk11mech.c - Issue 1843333003: Update NSPR to 4.12 and NSS to 3.23 on iOS

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 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, 9 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

diff --git a/nss/lib/pk11wrap/pk11mech.c b/nss/lib/pk11wrap/pk11mech.c

index 0ebb07565e61f3138ce3a52a5d4464f4bc1d8135..bab17e4e40c6b548108e41189bfb8661d7a0c5e1 100644

--- a/nss/lib/pk11wrap/pk11mech.c

+++ b/nss/lib/pk11wrap/pk11mech.c

@@ -222,6 +222,7 @@ PK11_GetKeyType(CK_MECHANISM_TYPE type,unsigned long len)

case CKM_CAMELLIA_KEY_GEN:

return CKK_CAMELLIA;

case CKM_NSS_CHACHA20_POLY1305:

+ case CKM_NSS_CHACHA20_KEY_GEN:

return CKK_NSS_CHACHA20;

case CKM_AES_ECB:

case CKM_AES_CBC: