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

Unified Diff: nss/mozilla/security/nss/lib/softoken/pkcs11u.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/pkcs11u.c
===================================================================
--- nss/mozilla/security/nss/lib/softoken/pkcs11u.c (revision 162724)
+++ nss/mozilla/security/nss/lib/softoken/pkcs11u.c (working copy)
@@ -24,7 +24,7 @@
*/
static SFTKAttribute *
sftk_NewAttribute(SFTKObject *object,
- CK_ATTRIBUTE_TYPE type, CK_VOID_PTR value, CK_ULONG len)
+ CK_ATTRIBUTE_TYPE type, const void *value, CK_ULONG len)
{
SFTKAttribute *attribute;
@@ -496,7 +496,7 @@
static CK_RV
sftk_forceTokenAttribute(SFTKObject *object,CK_ATTRIBUTE_TYPE type,
- void *value, unsigned int len)
+ const void *value, unsigned int len)
{
CK_ATTRIBUTE attribute;
SFTKDBHandle *dbHandle = NULL;
@@ -523,8 +523,8 @@
* force an attribute to a specifc value.
*/
CK_RV
-sftk_forceAttribute(SFTKObject *object,CK_ATTRIBUTE_TYPE type, void *value,
- unsigned int len)
+sftk_forceAttribute(SFTKObject *object,CK_ATTRIBUTE_TYPE type,
+ const void *value, unsigned int len)
{
SFTKAttribute *attribute;
void *att_val = NULL;
@@ -783,8 +783,8 @@
}
CK_RV
-sftk_AddAttributeType(SFTKObject *object,CK_ATTRIBUTE_TYPE type,void *valPtr,
- CK_ULONG length)
+sftk_AddAttributeType(SFTKObject *object,CK_ATTRIBUTE_TYPE type,
+ const void *valPtr, CK_ULONG length)
{
SFTKAttribute *attribute;
attribute = sftk_NewAttribute(object,type,valPtr,length);

Powered by Google App Engine
This is Rietveld 408576698