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

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

Issue 1017413002: Uprev NSS to 3.18 RTM (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/nss.git@nspr_uprev
Patch Set: Rebased Created 5 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
« no previous file with comments | « nss/lib/softoken/sdb.c ('k') | nss/lib/ssl/sslerr.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 * Softoken version numbers 2 * Softoken version numbers
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 _SOFTKVER_H_ 8 #ifndef _SOFTKVER_H_
9 #define _SOFTKVER_H_ 9 #define _SOFTKVER_H_
10 10
11 #ifndef NSS_DISABLE_ECC 11 #ifndef NSS_DISABLE_ECC
12 #ifdef NSS_ECC_MORE_THAN_SUITE_B 12 #ifdef NSS_ECC_MORE_THAN_SUITE_B
13 #define SOFTOKEN_ECC_STRING " Extended ECC" 13 #define SOFTOKEN_ECC_STRING " Extended ECC"
14 #else 14 #else
15 #define SOFTOKEN_ECC_STRING " Basic ECC" 15 #define SOFTOKEN_ECC_STRING " Basic ECC"
16 #endif 16 #endif
17 #else 17 #else
18 #define SOFTOKEN_ECC_STRING "" 18 #define SOFTOKEN_ECC_STRING ""
19 #endif 19 #endif
20 20
21 /* 21 /*
22 * Softoken's major version, minor version, patch level, build number, 22 * Softoken's major version, minor version, patch level, build number,
23 * and whether this is a beta release. 23 * and whether this is a beta release.
24 * 24 *
25 * The format of the version string should be 25 * The format of the version string should be
26 * "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>] [ <Beta>]" 26 * "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>] [ <Beta>]"
27 */ 27 */
28 #define SOFTOKEN_VERSION "3.16.5" SOFTOKEN_ECC_STRING 28 #define SOFTOKEN_VERSION "3.18" SOFTOKEN_ECC_STRING
29 #define SOFTOKEN_VMAJOR 3 29 #define SOFTOKEN_VMAJOR 3
30 #define SOFTOKEN_VMINOR 16 30 #define SOFTOKEN_VMINOR 18
31 #define SOFTOKEN_VPATCH 5 31 #define SOFTOKEN_VPATCH 0
32 #define SOFTOKEN_VBUILD 0 32 #define SOFTOKEN_VBUILD 2
33 #define SOFTOKEN_BETA PR_FALSE 33 #define SOFTOKEN_BETA PR_FALSE
34 34
35 #endif /* _SOFTKVER_H_ */ 35 #endif /* _SOFTKVER_H_ */
OLDNEW
« no previous file with comments | « nss/lib/softoken/sdb.c ('k') | nss/lib/ssl/sslerr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698