mozilla/security/nss/lib/util/pkcs11t.h - Issue 10961060: Update NSS to NSS 3.14 Beta 1.

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: mozilla/security/nss/lib/util/pkcs11t.h

Issue 10961060: Update NSS to NSS 3.14 Beta 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/

Patch Set: Add the NSS snapshot timestamp to README.chromium and nss-checkout.sh Created 8 years, 3 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:

Index: mozilla/security/nss/lib/util/pkcs11t.h

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

--- mozilla/security/nss/lib/util/pkcs11t.h (revision 158129)

+++ mozilla/security/nss/lib/util/pkcs11t.h (working copy)

@@ -1269,6 +1269,10 @@

/* The following EC Key Derivation Functions are defined */

#define CKD_NULL 0x00000001

#define CKD_SHA1_KDF 0x00000002

+#define CKD_SHA224_KDF 0x00000005

+#define CKD_SHA256_KDF 0x00000006

+#define CKD_SHA384_KDF 0x00000007

+#define CKD_SHA512_KDF 0x00000008

/* CK_ECDH1_DERIVE_PARAMS is new for v2.11.

* CK_ECDH1_DERIVE_PARAMS provides the parameters to the

« no previous file with comments | « mozilla/security/nss/lib/util/nssutil.h ('k') | mozilla/security/nss/lib/util/secerr.h » ('j') | no next file with comments »