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

Side by Side Diff: nss/lib/util/secoidt.h

Issue 13898013: Update NSS to NSS_3_15_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Update NSS versions and tag in README.chromium Created 7 years, 8 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
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 4
5 #ifndef _SECOIDT_H_ 5 #ifndef _SECOIDT_H_
6 #define _SECOIDT_H_ 6 #define _SECOIDT_H_
7 7
8 #include "utilrename.h" 8 #include "utilrename.h"
9 9
10 /* 10 /*
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 435
436 SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA224_DIGEST = 314, 436 SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA224_DIGEST = 314,
437 SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA256_DIGEST = 315, 437 SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA256_DIGEST = 315,
438 438
439 /* Microsoft Trust List Signing 439 /* Microsoft Trust List Signing
440 * szOID_KP_CTL_USAGE_SIGNING 440 * szOID_KP_CTL_USAGE_SIGNING
441 * where KP stands for Key Purpose 441 * where KP stands for Key Purpose
442 */ 442 */
443 SEC_OID_MS_EXT_KEY_USAGE_CTL_SIGNING = 316, 443 SEC_OID_MS_EXT_KEY_USAGE_CTL_SIGNING = 316,
444 444
445 /* The 'name' attribute type in X.520 */
446 SEC_OID_AVA_NAME = 317,
447
445 SEC_OID_TOTAL 448 SEC_OID_TOTAL
446 } SECOidTag; 449 } SECOidTag;
447 450
448 #define SEC_OID_SECG_EC_SECP192R1 SEC_OID_ANSIX962_EC_PRIME192V1 451 #define SEC_OID_SECG_EC_SECP192R1 SEC_OID_ANSIX962_EC_PRIME192V1
449 #define SEC_OID_SECG_EC_SECP256R1 SEC_OID_ANSIX962_EC_PRIME256V1 452 #define SEC_OID_SECG_EC_SECP256R1 SEC_OID_ANSIX962_EC_PRIME256V1
450 #define SEC_OID_PKCS12_KEY_USAGE SEC_OID_X509_KEY_USAGE 453 #define SEC_OID_PKCS12_KEY_USAGE SEC_OID_X509_KEY_USAGE
451 454
452 /* fake OID for DSS sign/verify */ 455 /* fake OID for DSS sign/verify */
453 #define SEC_OID_SHA SEC_OID_MISS_DSS 456 #define SEC_OID_SHA SEC_OID_MISS_DSS
454 457
(...skipping 22 matching lines...) Expand all
477 #define NSS_USE_ALG_IN_CMS_SIGNATURE 0x00000002 /* used in S/MIME */ 480 #define NSS_USE_ALG_IN_CMS_SIGNATURE 0x00000002 /* used in S/MIME */
478 #define NSS_USE_ALG_RESERVED 0xfffffffc /* may be used in future */ 481 #define NSS_USE_ALG_RESERVED 0xfffffffc /* may be used in future */
479 482
480 /* Code MUST NOT SET or CLEAR reserved bits, and must NOT depend on them 483 /* Code MUST NOT SET or CLEAR reserved bits, and must NOT depend on them
481 * being all zeros or having any other known value. The reserved bits 484 * being all zeros or having any other known value. The reserved bits
482 * must be ignored. 485 * must be ignored.
483 */ 486 */
484 487
485 488
486 #endif /* _SECOIDT_H_ */ 489 #endif /* _SECOIDT_H_ */
OLDNEW
« nss/lib/util/secitem.c ('K') | « nss/lib/util/secoid.c ('k') | patches/nss-aes-gcm.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698