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

Side by Side Diff: nss/lib/ckfw/builtins/nssckbi.h

Issue 1843333003: Update NSPR to 4.12 and NSS to 3.23 on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/nss.git@master
Patch Set: Created 4 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
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 NSSCKBI_H 5 #ifndef NSSCKBI_H
6 #define NSSCKBI_H 6 #define NSSCKBI_H
7 7
8 /* 8 /*
9 * NSS BUILTINS Version numbers. 9 * NSS BUILTINS Version numbers.
10 * 10 *
11 * These are the version numbers for the builtins module packaged with 11 * These are the version numbers for the builtins module packaged with
12 * this release on NSS. To determine the version numbers of the builtin 12 * this release on NSS. To determine the version numbers of the builtin
13 * module you are using, use the appropriate PKCS #11 calls. 13 * module you are using, use the appropriate PKCS #11 calls.
14 * 14 *
15 * These version numbers detail changes to the PKCS #11 interface. They map 15 * These version numbers detail changes to the PKCS #11 interface. They map
16 * to the PKCS #11 spec versions. 16 * to the PKCS #11 spec versions.
17 */ 17 */
18 #define NSS_BUILTINS_CRYPTOKI_VERSION_MAJOR 2 18 #define NSS_BUILTINS_CRYPTOKI_VERSION_MAJOR 2
19 #define NSS_BUILTINS_CRYPTOKI_VERSION_MINOR 20 19 #define NSS_BUILTINS_CRYPTOKI_VERSION_MINOR 20
20 20
21 /* These version numbers detail the changes 21 /* These version numbers detail the changes
22 * to the list of trusted certificates. 22 * to the list of trusted certificates.
23 * 23 *
24 * The NSS_BUILTINS_LIBRARY_VERSION_MINOR macro needs to be bumped 24 * The NSS_BUILTINS_LIBRARY_VERSION_MINOR macro needs to be bumped
25 * for each NSS minor release AND whenever we change the list of 25 * for each NSS minor release AND whenever we change the list of
26 * trusted certificates. 10 minor versions are allocated for each 26 * trusted certificates. 10 minor versions are allocated for each
27 * NSS 3.x branch as follows, allowing us to change the list of 27 * NSS 3.x branch as follows, allowing us to change the list of
28 * trusted certificates up to 9 times on each branch. 28 * trusted certificates up to 9 times on each branch.
29 * - NSS 3.5 branch: 3-9 29 * - NSS 3.5 branch: 3-9
30 * - NSS 3.6 branch: 10-19 30 * - NSS 3.6 branch: 10-19
31 * - NSS 3.7 branch: 20-29 31 * - NSS 3.7 branch: 20-29
32 * - NSS 3.8 branch: 30-39 32 * - NSS 3.8 branch: 30-39
33 * - NSS 3.9 branch: 40-49 33 * - NSS 3.9 branch: 40-49
34 * - NSS 3.10 branch: 50-59 34 * - NSS 3.10 branch: 50-59
35 * - NSS 3.11 branch: 60-69 35 * - NSS 3.11 branch: 60-69
36 * ... 36 * ...
37 * - NSS 3.12 branch: 70-89 37 * - NSS 3.12 branch: 70-89
38 * - NSS 3.13 branch: 90-99 38 * - NSS 3.13 branch: 90-99
39 * - NSS 3.14 branch: 100-109 39 * - NSS 3.14 branch: 100-109
40 * ... 40 * ...
41 * - NSS 3.29 branch: 250-255 41 * - NSS 3.29 branch: 250-255
42 * 42 *
43 * NSS_BUILTINS_LIBRARY_VERSION_MINOR is a CK_BYTE. It's not clear 43 * NSS_BUILTINS_LIBRARY_VERSION_MINOR is a CK_BYTE. It's not clear
44 * whether we may use its full range (0-255) or only 0-99 because 44 * whether we may use its full range (0-255) or only 0-99 because
45 * of the comment in the CK_VERSION type definition. 45 * of the comment in the CK_VERSION type definition.
46 */ 46 */
47 #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 2 47 #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 2
48 #define NSS_BUILTINS_LIBRARY_VERSION_MINOR 6 48 #define NSS_BUILTINS_LIBRARY_VERSION_MINOR 7
49 #define NSS_BUILTINS_LIBRARY_VERSION "2.6" 49 #define NSS_BUILTINS_LIBRARY_VERSION "2.7"
50 50
51 /* These version numbers detail the semantic changes to the ckfw engine. */ 51 /* These version numbers detail the semantic changes to the ckfw engine. */
52 #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1 52 #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
53 #define NSS_BUILTINS_HARDWARE_VERSION_MINOR 0 53 #define NSS_BUILTINS_HARDWARE_VERSION_MINOR 0
54 54
55 /* These version numbers detail the semantic changes to ckbi itself 55 /* These version numbers detail the semantic changes to ckbi itself
56 * (new PKCS #11 objects), etc. */ 56 * (new PKCS #11 objects), etc. */
57 #define NSS_BUILTINS_FIRMWARE_VERSION_MAJOR 1 57 #define NSS_BUILTINS_FIRMWARE_VERSION_MAJOR 1
58 #define NSS_BUILTINS_FIRMWARE_VERSION_MINOR 0 58 #define NSS_BUILTINS_FIRMWARE_VERSION_MINOR 0
59 59
60 #endif /* NSSCKBI_H */ 60 #endif /* NSSCKBI_H */
OLDNEW
« no previous file with comments | « nss/lib/ckfw/builtins/constants.c ('k') | nss/lib/ckfw/ckfw.h » ('j') | nss/lib/util/secoid.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698