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

Side by Side 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, 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* This Source Code Form is subject to the terms of the Mozilla Public 1 /* This Source Code Form is subject to the terms of the Mozilla Public
2 * License, v. 2.0. If a copy of the MPL was not distributed with this 2 * License, v. 2.0. If a copy of the MPL was not distributed with this
3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4 /* License to copy and use this software is granted provided that it is 4 /* License to copy and use this software is granted provided that it is
5 * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface 5 * identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface
6 * (Cryptoki)" in all material mentioning or referencing this software. 6 * (Cryptoki)" in all material mentioning or referencing this software.
7 7
8 * License is also granted to make and use derivative works provided that 8 * License is also granted to make and use derivative works provided that
9 * such works are identified as "derived from the RSA Security Inc. PKCS #11 9 * such works are identified as "derived from the RSA Security Inc. PKCS #11
10 * Cryptographic Token Interface (Cryptoki)" in all material mentioning or 10 * Cryptographic Token Interface (Cryptoki)" in all material mentioning or
(...skipping 1251 matching lines...) Expand 10 before | Expand all | Expand 10 after
1262 } CK_RSA_PKCS_PSS_PARAMS; 1262 } CK_RSA_PKCS_PSS_PARAMS;
1263 1263
1264 typedef CK_RSA_PKCS_PSS_PARAMS CK_PTR CK_RSA_PKCS_PSS_PARAMS_PTR; 1264 typedef CK_RSA_PKCS_PSS_PARAMS CK_PTR CK_RSA_PKCS_PSS_PARAMS_PTR;
1265 1265
1266 /* CK_EC_KDF_TYPE is new for v2.11. */ 1266 /* CK_EC_KDF_TYPE is new for v2.11. */
1267 typedef CK_ULONG CK_EC_KDF_TYPE; 1267 typedef CK_ULONG CK_EC_KDF_TYPE;
1268 1268
1269 /* The following EC Key Derivation Functions are defined */ 1269 /* The following EC Key Derivation Functions are defined */
1270 #define CKD_NULL 0x00000001 1270 #define CKD_NULL 0x00000001
1271 #define CKD_SHA1_KDF 0x00000002 1271 #define CKD_SHA1_KDF 0x00000002
1272 #define CKD_SHA224_KDF 0x00000005
1273 #define CKD_SHA256_KDF 0x00000006
1274 #define CKD_SHA384_KDF 0x00000007
1275 #define CKD_SHA512_KDF 0x00000008
1272 1276
1273 /* CK_ECDH1_DERIVE_PARAMS is new for v2.11. 1277 /* CK_ECDH1_DERIVE_PARAMS is new for v2.11.
1274 * CK_ECDH1_DERIVE_PARAMS provides the parameters to the 1278 * CK_ECDH1_DERIVE_PARAMS provides the parameters to the
1275 * CKM_ECDH1_DERIVE and CKM_ECDH1_COFACTOR_DERIVE mechanisms, 1279 * CKM_ECDH1_DERIVE and CKM_ECDH1_COFACTOR_DERIVE mechanisms,
1276 * where each party contributes one key pair. 1280 * where each party contributes one key pair.
1277 */ 1281 */
1278 typedef struct CK_ECDH1_DERIVE_PARAMS { 1282 typedef struct CK_ECDH1_DERIVE_PARAMS {
1279 CK_EC_KDF_TYPE kdf; 1283 CK_EC_KDF_TYPE kdf;
1280 CK_ULONG ulSharedDataLen; 1284 CK_ULONG ulSharedDataLen;
1281 CK_BYTE_PTR pSharedData; 1285 CK_BYTE_PTR pSharedData;
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
1743 /* stuff that for historic reasons is in this header file but should have 1747 /* stuff that for historic reasons is in this header file but should have
1744 * been in pkcs11n.h */ 1748 * been in pkcs11n.h */
1745 #define CKK_INVALID_KEY_TYPE 0xffffffff 1749 #define CKK_INVALID_KEY_TYPE 0xffffffff
1746 1750
1747 #include "pkcs11n.h" 1751 #include "pkcs11n.h"
1748 1752
1749 /* undo packing */ 1753 /* undo packing */
1750 #include "pkcs11u.h" 1754 #include "pkcs11u.h"
1751 1755
1752 #endif 1756 #endif
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698