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

Unified Diff: nss/mozilla/security/nss/lib/softoken/pkcs11.c

Issue 11193042: Update NSS to NSS 3.14 RC1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/
Patch Set: Created 8 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
Index: nss/mozilla/security/nss/lib/softoken/pkcs11.c
===================================================================
--- nss/mozilla/security/nss/lib/softoken/pkcs11.c (revision 162724)
+++ nss/mozilla/security/nss/lib/softoken/pkcs11.c (working copy)
@@ -347,6 +347,9 @@
{CKM_AES_MAC, {16, 32, CKF_SN_VR}, PR_TRUE},
{CKM_AES_MAC_GENERAL, {16, 32, CKF_SN_VR}, PR_TRUE},
{CKM_AES_CBC_PAD, {16, 32, CKF_EN_DE_WR_UN}, PR_TRUE},
+ {CKM_AES_CTS, {16, 32, CKF_EN_DE}, PR_TRUE},
+ {CKM_AES_CTR, {16, 32, CKF_EN_DE}, PR_TRUE},
+ {CKM_AES_GCM, {16, 32, CKF_EN_DE}, PR_TRUE},
/* ------------------------- Camellia Operations --------------------- */
{CKM_CAMELLIA_KEY_GEN, {16, 32, CKF_GENERATE}, PR_TRUE},
{CKM_CAMELLIA_ECB, {16, 32, CKF_EN_DE_WR_UN}, PR_TRUE},
@@ -611,8 +614,8 @@
* value and len
*/
CK_RV
-sftk_defaultAttribute(SFTKObject *object,CK_ATTRIBUTE_TYPE type,void *value,
- unsigned int len)
+sftk_defaultAttribute(SFTKObject *object,CK_ATTRIBUTE_TYPE type,
+ const void *value, unsigned int len)
{
if ( !sftk_hasAttribute(object, type)) {
return sftk_AddAttributeType(object,type,value,len);

Powered by Google App Engine
This is Rietveld 408576698