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

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

Issue 195763027: Update NSS to NSS_3_16_RC0. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Use the RTM tag Created 6 years, 9 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 | « nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_cert.c ('k') | nss/lib/pk11wrap/pk11pub.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 /* 1 /*
2 * NSS utility functions 2 * NSS utility functions
3 * 3 *
4 * This Source Code Form is subject to the terms of the Mozilla Public 4 * This Source Code Form is subject to the terms of the Mozilla Public
5 * License, v. 2.0. If a copy of the MPL was not distributed with this 5 * License, v. 2.0. If a copy of the MPL was not distributed with this
6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
7 7
8 #ifndef __nss_h_ 8 #ifndef __nss_h_
9 #define __nss_h_ 9 #define __nss_h_
10 10
11 /* The private macro _NSS_ECC_STRING is for NSS internal use only. */ 11 /* The private macro _NSS_ECC_STRING is for NSS internal use only. */
12 #ifdef NSS_ENABLE_ECC 12 #ifndef NSS_DISABLE_ECC
13 #ifdef NSS_ECC_MORE_THAN_SUITE_B 13 #ifdef NSS_ECC_MORE_THAN_SUITE_B
14 #define _NSS_ECC_STRING " Extended ECC" 14 #define _NSS_ECC_STRING " Extended ECC"
15 #else 15 #else
16 #define _NSS_ECC_STRING " Basic ECC" 16 #define _NSS_ECC_STRING " Basic ECC"
17 #endif 17 #endif
18 #else 18 #else
19 #define _NSS_ECC_STRING "" 19 #define _NSS_ECC_STRING ""
20 #endif 20 #endif
21 21
22 /* The private macro _NSS_CUSTOMIZED is for NSS internal use only. */ 22 /* The private macro _NSS_CUSTOMIZED is for NSS internal use only. */
23 #if defined(NSS_ALLOW_UNSUPPORTED_CRITICAL) 23 #if defined(NSS_ALLOW_UNSUPPORTED_CRITICAL)
24 #define _NSS_CUSTOMIZED " (Customized build)" 24 #define _NSS_CUSTOMIZED " (Customized build)"
25 #else 25 #else
26 #define _NSS_CUSTOMIZED 26 #define _NSS_CUSTOMIZED
27 #endif 27 #endif
28 28
29 /* 29 /*
30 * NSS's major version, minor version, patch level, build number, and whether 30 * NSS's major version, minor version, patch level, build number, and whether
31 * this is a beta release. 31 * this is a beta release.
32 * 32 *
33 * The format of the version string should be 33 * The format of the version string should be
34 * "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>] [ <Beta>]" 34 * "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>] [ <Beta>]"
35 */ 35 */
36 #define NSS_VERSION "3.15.5" _NSS_ECC_STRING _NSS_CUSTOMIZED 36 #define NSS_VERSION "3.16" _NSS_ECC_STRING _NSS_CUSTOMIZED
37 #define NSS_VMAJOR 3 37 #define NSS_VMAJOR 3
38 #define NSS_VMINOR 15 38 #define NSS_VMINOR 16
39 #define NSS_VPATCH 5 39 #define NSS_VPATCH 0
40 #define NSS_VBUILD 0 40 #define NSS_VBUILD 0
41 #define NSS_BETA PR_FALSE 41 #define NSS_BETA PR_FALSE
42 42
43 #ifndef RC_INVOKED 43 #ifndef RC_INVOKED
44 44
45 #include "seccomon.h" 45 #include "seccomon.h"
46 46
47 typedef struct NSSInitParametersStr NSSInitParameters; 47 typedef struct NSSInitParametersStr NSSInitParameters;
48 48
49 /* 49 /*
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 /* 310 /*
311 * Dump the contents of the certificate cache and the temporary cert store. 311 * Dump the contents of the certificate cache and the temporary cert store.
312 * Use to detect leaked references of certs at shutdown time. 312 * Use to detect leaked references of certs at shutdown time.
313 */ 313 */
314 void nss_DumpCertificateCacheInfo(void); 314 void nss_DumpCertificateCacheInfo(void);
315 315
316 SEC_END_PROTOS 316 SEC_END_PROTOS
317 317
318 #endif /* RC_INVOKED */ 318 #endif /* RC_INVOKED */
319 #endif /* __nss_h_ */ 319 #endif /* __nss_h_ */
OLDNEW
« no previous file with comments | « nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_cert.c ('k') | nss/lib/pk11wrap/pk11pub.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698