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

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

Issue 319593003: Update to NSS 3.16.2 Beta 3. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/nss
Patch Set: Remove unused function SEC_NumberOrNameStringToOIDTag Created 6 years, 6 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 _UTILMODT_H_ 5 #ifndef _UTILMODT_H_
6 #define _UTILMODT_H_ 1 6 #define _UTILMODT_H_ 1
7 7
8 /* 8 /*
9 * these are SECMOD flags that would normally be in secmodt.h, but are needed 9 * these are SECMOD flags that would normally be in secmodt.h, but are needed
10 * for the parser in util. Fort this reason we preserve the SECMOD names. 10 * for the parser in util. Fort this reason we preserve the SECMOD names.
11 */ 11 */
12 #define SECMOD_RSA_FLAG 0x00000001L 12 #define SECMOD_RSA_FLAG 0x00000001L
13 #define SECMOD_DSA_FLAG 0x00000002L 13 #define SECMOD_DSA_FLAG 0x00000002L
14 #define SECMOD_RC2_FLAG 0x00000004L 14 #define SECMOD_RC2_FLAG 0x00000004L
15 #define SECMOD_RC4_FLAG 0x00000008L 15 #define SECMOD_RC4_FLAG 0x00000008L
16 #define SECMOD_DES_FLAG 0x00000010L 16 #define SECMOD_DES_FLAG 0x00000010L
17 #define SECMOD_DH_FLAG 0x00000020L 17 #define SECMOD_DH_FLAG 0x00000020L
18 #define SECMOD_FORTEZZA_FLAG 0x00000040L 18 #define SECMOD_FORTEZZA_FLAG 0x00000040L
19 #define SECMOD_RC5_FLAG 0x00000080L 19 #define SECMOD_RC5_FLAG 0x00000080L
20 #define SECMOD_SHA1_FLAG 0x00000100L 20 #define SECMOD_SHA1_FLAG 0x00000100L
21 #define SECMOD_MD5_FLAG 0x00000200L 21 #define SECMOD_MD5_FLAG 0x00000200L
22 #define SECMOD_MD2_FLAG 0x00000400L 22 #define SECMOD_MD2_FLAG 0x00000400L
23 #define SECMOD_SSL_FLAG 0x00000800L 23 #define SECMOD_SSL_FLAG 0x00000800L
24 #define SECMOD_TLS_FLAG 0x00001000L 24 #define SECMOD_TLS_FLAG 0x00001000L
25 #define SECMOD_AES_FLAG 0x00002000L 25 #define SECMOD_AES_FLAG 0x00002000L
26 #define SECMOD_SHA256_FLAG» 0x00004000L 26 #define SECMOD_SHA256_FLAG» 0x00004000L /* also for SHA224 */
27 #define SECMOD_SHA512_FLAG 0x00008000L /* also for SHA384 */ 27 #define SECMOD_SHA512_FLAG 0x00008000L /* also for SHA384 */
28 #define SECMOD_CAMELLIA_FLAG 0x00010000L /* = PUBLIC_MECH_CAMELLIA_FLAG */ 28 #define SECMOD_CAMELLIA_FLAG 0x00010000L /* = PUBLIC_MECH_CAMELLIA_FLAG */
29 #define SECMOD_SEED_FLAG 0x00020000L 29 #define SECMOD_SEED_FLAG 0x00020000L
30 #define SECMOD_ECC_FLAG 0x00040000L
30 /* reserved bit for future, do not use */ 31 /* reserved bit for future, do not use */
31 #define SECMOD_RESERVED_FLAG 0X08000000L 32 #define SECMOD_RESERVED_FLAG 0X08000000L
32 #define SECMOD_FRIENDLY_FLAG 0x10000000L 33 #define SECMOD_FRIENDLY_FLAG 0x10000000L
33 #define SECMOD_RANDOM_FLAG 0x80000000L 34 #define SECMOD_RANDOM_FLAG 0x80000000L
34 35
35 #define PK11_OWN_PW_DEFAULTS 0x20000000L 36 #define PK11_OWN_PW_DEFAULTS 0x20000000L
36 #define PK11_DISABLE_FLAG 0x40000000L 37 #define PK11_DISABLE_FLAG 0x40000000L
37 38
38 /* need to make SECMOD and PK11 prefixes consistent. */ 39 /* need to make SECMOD and PK11 prefixes consistent. */
39 #define SECMOD_OWN_PW_DEFAULTS PK11_OWN_PW_DEFAULTS 40 #define SECMOD_OWN_PW_DEFAULTS PK11_OWN_PW_DEFAULTS
40 #define SECMOD_DISABLE_FLAG PK11_DISABLE_FLAG 41 #define SECMOD_DISABLE_FLAG PK11_DISABLE_FLAG
41 42
42 #endif /* _UTILMODT_H_ */ 43 #endif /* _UTILMODT_H_ */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698