mozilla/security/nss/lib/ckfw/builtins/nssckbi.h - Issue 12197027: Merge NSS_3_14_2_RTM.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12197027: Merge NSS_3_14_2_RTM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/

Patch Set: Created 7 years, 10 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 | « mozilla/security/nss/lib/ckfw/builtins/certdata.c ('k') | mozilla/security/nss/lib/freebl/arcfour.c » ('j') | no next file with comments »

OLD	NEW
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 Loading...
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 1	47 #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1

48 #define NSS_BUILTINS_LIBRARY_VERSION_MINOR 92	48 #define NSS_BUILTINS_LIBRARY_VERSION_MINOR 93

49 #define NSS_BUILTINS_LIBRARY_VERSION "1.92"	49 #define NSS_BUILTINS_LIBRARY_VERSION "1.93"

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 */

OLD	NEW