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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 13898013: Update NSS to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« nss/lib/freebl/ecl/ecp_256_32.c ('K') | « nss/lib/pk11wrap/pk11pub.h ('k') | nss/lib/pkcs7/certread.c » ('j') | nss/lib/ssl/sslerr.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nss/lib/pk11wrap/pk11slot.c
===================================================================
--- nss/lib/pk11wrap/pk11slot.c (revision 195639)
+++ nss/lib/pk11wrap/pk11slot.c (working copy)
@@ -833,6 +833,10 @@
case CKM_CAMELLIA_ECB:
return &pk11_camelliaSlotList;
case CKM_AES_CBC:
+ case CKM_AES_CCM:
+ case CKM_AES_CTR:
+ case CKM_AES_CTS:
+ case CKM_AES_GCM:
case CKM_AES_ECB:
return &pk11_aesSlotList;
case CKM_DES_CBC:
@@ -880,6 +884,7 @@
return &pk11_sslSlotList;
case CKM_TLS_MASTER_KEY_DERIVE:
case CKM_TLS_KEY_AND_MAC_DERIVE:
+ case CKM_NSS_TLS_KEY_AND_MAC_DERIVE_SHA256:
return &pk11_tlsSlotList;
case CKM_IDEA_CBC:
case CKM_IDEA_ECB:
« nss/lib/freebl/ecl/ecp_256_32.c ('K') | « nss/lib/pk11wrap/pk11pub.h ('k') | nss/lib/pkcs7/certread.c » ('j') | nss/lib/ssl/sslerr.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698