nss/lib/softoken/pkcs11u.c - Issue 195763027: Update NSS to NSS_3_16_RC0.

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/softoken/pkcs11u.c

Issue 195763027: Update NSS to NSS_3_16_RC0. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/

Patch Set: Use the RTM tag Created 6 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:

View side-by-side diff with in-line comments

Download patch

Index: nss/lib/softoken/pkcs11u.c

===================================================================

--- nss/lib/softoken/pkcs11u.c (revision 256695)

+++ nss/lib/softoken/pkcs11u.c (working copy)

@@ -1246,7 +1246,7 @@

};

static const CK_ULONG dhPubKeyAttrsCount =

sizeof(dhPubKeyAttrs)/sizeof(dhPubKeyAttrs[0]);

-#ifdef NSS_ENABLE_ECC

+#ifndef NSS_DISABLE_ECC

static const CK_ATTRIBUTE_TYPE ecPubKeyAttrs[] = {

CKA_EC_PARAMS, CKA_EC_POINT

};

@@ -1279,7 +1279,7 @@

};

static const CK_ULONG dhPrivKeyAttrsCount =

sizeof(dhPrivKeyAttrs)/sizeof(dhPrivKeyAttrs[0]);

-#ifdef NSS_ENABLE_ECC

+#ifndef NSS_DISABLE_ECC

static const CK_ATTRIBUTE_TYPE ecPrivKeyAttrs[] = {

CKA_EC_PARAMS, CKA_VALUE

};

@@ -1390,7 +1390,7 @@

crv = stfk_CopyTokenAttributes(destObject, src_to, dhPrivKeyAttrs,

dhPrivKeyAttrsCount);

break;

-#ifdef NSS_ENABLE_ECC

+#ifndef NSS_DISABLE_ECC

case CKK_EC:

crv = stfk_CopyTokenAttributes(destObject, src_to, ecPrivKeyAttrs,

ecPrivKeyAttrsCount);

@@ -1452,7 +1452,7 @@

crv = stfk_CopyTokenAttributes(destObject, src_to, dhPubKeyAttrs,

dhPubKeyAttrsCount);

break;

-#ifdef NSS_ENABLE_ECC

+#ifndef NSS_DISABLE_ECC

case CKK_EC:

crv = stfk_CopyTokenAttributes(destObject, src_to, ecPubKeyAttrs,

ecPubKeyAttrsCount);

« no previous file with comments | « nss/lib/softoken/pkcs11c.c ('k') | nss/lib/softoken/sdb.c » ('j') | no next file with comments »