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

Side by Side Diff: mozilla/security/nss/lib/util/secoidt.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/secoid.c ('k') | mozilla/security/nss/lib/util/utilmod.c » ('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 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 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 SEC_OID_PKCS1_RSA_PSS_SIGNATURE = 307, 426 SEC_OID_PKCS1_RSA_PSS_SIGNATURE = 307,
427 SEC_OID_PKCS1_SHA224_WITH_RSA_ENCRYPTION = 308, 427 SEC_OID_PKCS1_SHA224_WITH_RSA_ENCRYPTION = 308,
428 428
429 SEC_OID_SHA224 = 309, 429 SEC_OID_SHA224 = 309,
430 430
431 SEC_OID_EV_INCORPORATION_LOCALITY = 310, 431 SEC_OID_EV_INCORPORATION_LOCALITY = 310,
432 SEC_OID_EV_INCORPORATION_STATE = 311, 432 SEC_OID_EV_INCORPORATION_STATE = 311,
433 SEC_OID_EV_INCORPORATION_COUNTRY = 312, 433 SEC_OID_EV_INCORPORATION_COUNTRY = 312,
434 SEC_OID_BUSINESS_CATEGORY = 313, 434 SEC_OID_BUSINESS_CATEGORY = 313,
435 435
436 SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA224_DIGEST = 314,
437 SEC_OID_NIST_DSA_SIGNATURE_WITH_SHA256_DIGEST = 315,
438
436 SEC_OID_TOTAL 439 SEC_OID_TOTAL
437 } SECOidTag; 440 } SECOidTag;
438 441
439 #define SEC_OID_SECG_EC_SECP192R1 SEC_OID_ANSIX962_EC_PRIME192V1 442 #define SEC_OID_SECG_EC_SECP192R1 SEC_OID_ANSIX962_EC_PRIME192V1
440 #define SEC_OID_SECG_EC_SECP256R1 SEC_OID_ANSIX962_EC_PRIME256V1 443 #define SEC_OID_SECG_EC_SECP256R1 SEC_OID_ANSIX962_EC_PRIME256V1
441 #define SEC_OID_PKCS12_KEY_USAGE SEC_OID_X509_KEY_USAGE 444 #define SEC_OID_PKCS12_KEY_USAGE SEC_OID_X509_KEY_USAGE
442 445
443 /* fake OID for DSS sign/verify */ 446 /* fake OID for DSS sign/verify */
444 #define SEC_OID_SHA SEC_OID_MISS_DSS 447 #define SEC_OID_SHA SEC_OID_MISS_DSS
445 448
(...skipping 22 matching lines...) Expand all
468 #define NSS_USE_ALG_IN_CMS_SIGNATURE 0x00000002 /* used in S/MIME */ 471 #define NSS_USE_ALG_IN_CMS_SIGNATURE 0x00000002 /* used in S/MIME */
469 #define NSS_USE_ALG_RESERVED 0xfffffffc /* may be used in future */ 472 #define NSS_USE_ALG_RESERVED 0xfffffffc /* may be used in future */
470 473
471 /* Code MUST NOT SET or CLEAR reserved bits, and must NOT depend on them 474 /* Code MUST NOT SET or CLEAR reserved bits, and must NOT depend on them
472 * being all zeros or having any other known value. The reserved bits 475 * being all zeros or having any other known value. The reserved bits
473 * must be ignored. 476 * must be ignored.
474 */ 477 */
475 478
476 479
477 #endif /* _SECOIDT_H_ */ 480 #endif /* _SECOIDT_H_ */
OLDNEW
« no previous file with comments | « mozilla/security/nss/lib/util/secoid.c ('k') | mozilla/security/nss/lib/util/utilmod.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698