Bug 558140, Upgrade Mozilla to pick up new roots (NSS 3.12.6 + NSSCKBI_1_79_RTM)

r=wtc
This commit is contained in:
Kai Engert 2010-04-19 14:30:04 +02:00
parent 35cd0d8a5e
commit 05555f6df4
4 changed files with 711 additions and 3239 deletions

File diff suppressed because it is too large Load Diff

View File

@ -35,7 +35,7 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
my $cvs_id = '@(#) $RCSfile: certdata.perl,v $ $Revision: 1.12 $ $Date: 2008/01/23 07:34:49 $';
my $cvs_id = '@(#) $RCSfile: certdata.perl,v $ $Revision: 1.13 $ $Date: 2010/03/26 22:06:47 $';
use strict;
my %constants;
@ -101,9 +101,9 @@ while(<>) {
$fields[2] = "\"" . $fields[2] . "\"";
}
my $scratch = $fields[2];
$size = $scratch =~ s/[^"\n]//g; # should supposedly handle multilines, too..
$size += 1; # null terminate
my $scratch = eval($fields[2]);
$size = length($scratch) + 1; # null terminate
}
if( $fields[1] =~ /OCTAL/ ) {

File diff suppressed because it is too large Load Diff

View File

@ -77,8 +77,8 @@
* of the comment in the CK_VERSION type definition.
*/
#define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 78
#define NSS_BUILTINS_LIBRARY_VERSION "1.78"
#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 79
#define NSS_BUILTINS_LIBRARY_VERSION "1.79"
/* These version numbers detail the semantic changes to the ckfw engine. */
#define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1