2015-10-21 05:03:22 +02:00
|
|
|
/*
|
|
|
|
* Softoken version numbers
|
|
|
|
*
|
2018-05-04 16:08:28 +02:00
|
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
2015-10-21 05:03:22 +02:00
|
|
|
|
|
|
|
#ifndef _SOFTKVER_H_
|
|
|
|
#define _SOFTKVER_H_
|
|
|
|
|
cherry-picked mozilla NSS upstream changes (to rev f7a4c771997e, which is on par with 3.16.1 but without windows rand() changes):
9934c8faef29, 3c3b381c4865, 5a67f6beee9a, 1b1eb6d77728, a8b668fd72f7, bug962760, bug743700, bug857304, bug972653, bug972450, bug971358, bug903885, bug977073, bug976111, bug949939, bug947653, bug947572, bug903885, bug979106, bug966596, bug979004, bug979752, bug980848, bug938369, bug981170, bug668130, bug974693, bug975056, bug979132, bug370717, bug979070, bug985070, bug900067, bug977673, bug519255, bug989558, bug557299, bug987263, bug369802, a751a5146718, bug992343, bug952572, bug979703, bug994883, bug994869, bug993489, bug984608, bug977869, bug667371, bug672828, bug793347, bug977869
2018-07-10 17:07:31 +02:00
|
|
|
#ifndef NSS_DISABLE_ECC
|
2015-10-21 05:03:22 +02:00
|
|
|
#ifdef NSS_ECC_MORE_THAN_SUITE_B
|
|
|
|
#define SOFTOKEN_ECC_STRING " Extended ECC"
|
|
|
|
#else
|
|
|
|
#define SOFTOKEN_ECC_STRING " Basic ECC"
|
|
|
|
#endif
|
|
|
|
#else
|
|
|
|
#define SOFTOKEN_ECC_STRING ""
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
2018-05-04 16:08:28 +02:00
|
|
|
* Softoken's major version, minor version, patch level, build number,
|
|
|
|
* and whether this is a beta release.
|
2015-10-21 05:03:22 +02:00
|
|
|
*
|
|
|
|
* The format of the version string should be
|
2018-05-04 16:08:28 +02:00
|
|
|
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
|
2015-10-21 05:03:22 +02:00
|
|
|
*/
|
cherry-picked mozilla NSS upstream changes (to rev 902bc119dcdb, which is on par with 3.17.2):
bug920719, bug1026148, bug1028647, bug963150, bug1030486, bug1025729, bug836658, bug1028582, bug1038728, bug1038526, bug1042634, bug1047210, bug1043891, bug1043108, bug1046735, bug1043082, bug1036735, bug1046718, bug1050107, bug1054625, bug1057465, bug1057476, bug1041326, bug1058933, bug1064636, bug1057161, bug1078669, bug1049435, bug1070493, bug1083360, bug1028764, bug1065990, bug1073330, bug1064670, bug1094650
2018-07-11 15:35:15 +02:00
|
|
|
#define SOFTOKEN_VERSION "3.17.2.1" SOFTOKEN_ECC_STRING
|
2015-10-21 05:03:22 +02:00
|
|
|
#define SOFTOKEN_VMAJOR 3
|
cherry-picked mozilla NSS upstream changes (to rev 902bc119dcdb, which is on par with 3.17.2):
bug920719, bug1026148, bug1028647, bug963150, bug1030486, bug1025729, bug836658, bug1028582, bug1038728, bug1038526, bug1042634, bug1047210, bug1043891, bug1043108, bug1046735, bug1043082, bug1036735, bug1046718, bug1050107, bug1054625, bug1057465, bug1057476, bug1041326, bug1058933, bug1064636, bug1057161, bug1078669, bug1049435, bug1070493, bug1083360, bug1028764, bug1065990, bug1073330, bug1064670, bug1094650
2018-07-11 15:35:15 +02:00
|
|
|
#define SOFTOKEN_VMINOR 17
|
cherry-picked mozilla NSS upstream changes (to rev b07697c94038, which is on par with 3.16.2):
bug753136, bug999893, bug1011090, bug1009785, bug1009794, bug421391, bug1011229, bug1013088, bug996237, bug970539, bug1016567, bug485732, bug334013, bug959864, bug1016836, bug1016811, bug1018536, bug996250, bug1009227, bug963150, bug1007126, bug952572, bug1021102, bug1020395, bug902171
2018-07-11 14:39:02 +02:00
|
|
|
#define SOFTOKEN_VPATCH 2
|
|
|
|
#define SOFTOKEN_VBUILD 1
|
2015-10-21 05:03:22 +02:00
|
|
|
#define SOFTOKEN_BETA PR_FALSE
|
|
|
|
|
|
|
|
#endif /* _SOFTKVER_H_ */
|