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

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

Issue 1504923011: Update NSS to 3.21 RTM and NSPR to 4.11 RTM (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/nss
Patch Set: Created 5 years 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 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 *
(...skipping 27 matching lines...) Expand all
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 4 48 #define NSS_BUILTINS_LIBRARY_VERSION_MINOR 6
49 #define NSS_BUILTINS_LIBRARY_VERSION "2.4" 49 #define NSS_BUILTINS_LIBRARY_VERSION "2.6"
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

Powered by Google App Engine
This is Rietveld 408576698