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

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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/freebl/poly1305/poly1305-donna-x64-sse2-incremental-source.c ('k') | nss/lib/softoken/pkcs11.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nss/lib/pk11wrap/pk11mech.c
===================================================================
--- nss/lib/pk11wrap/pk11mech.c (revision 228205)
+++ nss/lib/pk11wrap/pk11mech.c (working copy)
@@ -396,6 +396,8 @@
case CKM_TLS_PRF_GENERAL:
case CKM_NSS_TLS_PRF_GENERAL_SHA256:
return CKK_GENERIC_SECRET;
+ case CKM_NSS_CHACHA20_POLY1305:
+ return CKK_NSS_CHACHA20;
default:
return pk11_lookup(type)->keyType;
}
@@ -613,6 +615,8 @@
case CKM_PBE_SHA1_DES2_EDE_CBC:
case CKM_PKCS5_PBKD2:
return type;
+ case CKM_NSS_CHACHA20_POLY1305:
+ return CKM_NSS_CHACHA20_KEY_GEN;
default:
return pk11_lookup(type)->keyGen;
}
« nss/lib/freebl/chacha20/chacha20_vec.c ('K') | « nss/lib/freebl/poly1305/poly1305-donna-x64-sse2-incremental-source.c ('k') | nss/lib/softoken/pkcs11.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698