Permalink
Browse files

Bug 816392: Update to NSS 3.14.1 beta 2 (NSS_3_14_1_BETA2), r=me, a=r…

…relyea

--HG--
extra : rebase_source : fad4097ed16f529fc9845231292c99fce4fea1f5
  • Loading branch information...
1 parent 1409811 commit 8d3ff8680afeb9a8bcacc65071aa1005f782b638 @briansmith briansmith committed Dec 5, 2012
Showing with 1,344 additions and 25,112 deletions.
  1. +2 −2 client.py
  2. +1 −1 configure.in
  3. +0 −5 dbm/include/mcom_db.h
  4. +0 −6 dbm/include/winfile.h
  5. +0 −4 dbm/src/Makefile.in
  6. +0 −8 dbm/src/mktemp.c
  7. +1 −1 security/coreconf/Linux.mk
  8. +0 −6 security/coreconf/README
  9. +1 −1 security/coreconf/WIN95.mk
  10. +0 −182 security/coreconf/WINCE.mk
  11. +1 −1 security/coreconf/WINNT.mk
  12. +1 −1 security/coreconf/config.mk
  13. +0 −1 security/coreconf/coreconf.dep
  14. +8 −17 security/coreconf/rules.mk
  15. +10 −12 security/coreconf/ruleset.mk
  16. +1 −1 security/dbm/Makefile
  17. +7 −9 security/nss/Makefile
  18. +1 −1 security/nss/TAG-INFO
  19. +1 −1 security/nss/TAG-INFO-CKBI
  20. +15 −2 security/nss/cmd/addbuiltin/addbuiltin.c
  21. +1 −0 security/nss/cmd/bltest/blapitest.c
  22. +1 −3 security/nss/cmd/certutil/keystuff.c
  23. +0 −6 security/nss/cmd/lib/basicutil.c
  24. +0 −4 security/nss/cmd/lib/config.mk
  25. +2 −5 security/nss/cmd/lib/secpwd.c
  26. +0 −2 security/nss/cmd/lib/secutil.c
  27. +5 −5 security/nss/cmd/lib/secutil.h
  28. +0 −33 security/nss/cmd/lib/wincemain.c
  29. +1 −0 security/nss/cmd/manifest.mn
  30. +47 −0 security/nss/cmd/ocspresp/Makefile
  31. +15 −0 security/nss/cmd/ocspresp/manifest.mn
  32. +249 −0 security/nss/cmd/ocspresp/ocspresp.c
  33. +2 −2 security/nss/cmd/platlibs.mk
  34. +0 −2 security/nss/cmd/strsclnt/strsclnt.c
  35. +1 −0 security/nss/lib/certhigh/manifest.mn
  36. +7 −7 security/nss/lib/certhigh/ocsp.c
  37. +31 −1 security/nss/lib/certhigh/ocsp.h
  38. +546 −0 security/nss/lib/certhigh/ocspsig.c
  39. +1 −2 security/nss/lib/certhigh/ocspt.h
  40. +2 −2 security/nss/lib/ckfw/Makefile
  41. +9 −3 security/nss/lib/ckfw/builtins/Makefile
  42. +6 −9 security/nss/lib/ckfw/builtins/README
  43. +0 −24,385 security/nss/lib/ckfw/builtins/certdata.c
  44. +30 −34 security/nss/lib/ckfw/builtins/certdata.perl
  45. +4 −1 security/nss/lib/ckfw/builtins/config.mk
  46. +6 −1 security/nss/lib/cryptohi/keythi.h
  47. +1 −2 security/nss/lib/cryptohi/seckey.c
  48. +1 −6 security/nss/lib/freebl/Makefile
  49. +0 −5 security/nss/lib/freebl/arcfour.c
  50. +0 −2 security/nss/lib/freebl/config.mk
  51. +11 −0 security/nss/lib/freebl/genload.c
  52. +4 −2 security/nss/lib/freebl/intel-aes.s
  53. +5 −5 security/nss/lib/freebl/mpi/mpcpucache.c
  54. +1 −5 security/nss/lib/freebl/mpi/mpi.h
  55. +6 −6 security/nss/lib/freebl/mpi/mpi_arm.c
  56. +13 −19 security/nss/lib/freebl/mpi/mpmontg.c
  57. +5 −5 security/nss/lib/freebl/nsslowhash.c
  58. +2 −86 security/nss/lib/freebl/win_rand.c
  59. +10 −0 security/nss/lib/nss/nss.def
  60. +5 −5 security/nss/lib/nss/nss.h
  61. +2 −3 security/nss/lib/nss/nssinit.c
  62. +1 −1 security/nss/lib/nss/utilwrap.c
  63. +3 −3 security/nss/lib/pk11wrap/pk11akey.c
  64. +23 −9 security/nss/lib/pk11wrap/pk11auth.c
  65. +1 −1 security/nss/lib/pk11wrap/pk11cert.c
  66. +7 −5 security/nss/lib/pk11wrap/pk11cxt.c
  67. +14 −14 security/nss/lib/pk11wrap/pk11merge.c
  68. +36 −27 security/nss/lib/pk11wrap/pk11obj.c
  69. +6 −4 security/nss/lib/pk11wrap/pk11priv.h
  70. +9 −8 security/nss/lib/pk11wrap/pk11pub.h
  71. +0 −3 security/nss/lib/pk11wrap/pk11skey.c
  72. +36 −16 security/nss/lib/pk11wrap/pk11slot.c
  73. +0 −1 security/nss/lib/pk11wrap/pk11util.c
  74. +4 −4 security/nss/lib/pkcs7/p7decode.c
  75. +2 −2 security/nss/lib/pkcs7/secpkcs7.h
  76. +1 −1 security/nss/lib/softoken/Makefile
  77. +0 −4 security/nss/lib/softoken/config.mk
  78. +0 −4 security/nss/lib/softoken/legacydb/config.mk
  79. +1 −1 security/nss/lib/softoken/pkcs11u.c
  80. +0 −2 security/nss/lib/softoken/sdb.c
  81. +4 −4 security/nss/lib/softoken/softkver.h
  82. +3 −3 security/nss/lib/ssl/notes.txt
  83. +14 −8 security/nss/lib/ssl/ssl3con.c
  84. +12 −4 security/nss/lib/ssl/ssl3ext.c
  85. +1 −3 security/nss/lib/ssl/sslimpl.h
  86. +3 −3 security/nss/lib/ssl/sslnonce.c
  87. +10 −6 security/nss/lib/ssl/sslsock.c
  88. +2 −2 security/nss/lib/util/base64.h
  89. +2 −2 security/nss/lib/util/nssb64d.c
  90. +4 −4 security/nss/lib/util/nssutil.h
  91. +1 −4 security/nss/lib/util/secder.h
  92. +1 −5 security/nss/lib/util/secport.c
  93. +1 −10 security/nss/lib/util/secport.h
  94. +15 −21 security/nss/lib/util/utilmod.c
  95. +10 −2 security/nss/lib/util/utilpars.c
  96. +1 −0 security/nss/lib/util/utilpars.h
  97. +32 −0 security/nss/tests/cert/cert.sh
  98. +2 −1 security/nss/tests/chains/chains.sh
View
@@ -96,10 +96,10 @@ def toggle_trailing_blank_line(depname):
if not lines[-1].strip():
# trailing line is blank, removing it
- open(depname, "w").writelines(lines[:-1])
+ open(depname, "wb").writelines(lines[:-1])
else:
# adding blank line
- open(depname, "a").write("\n")
+ open(depname, "ab").write("\n")
o = OptionParser(usage="client.py [options] update_nspr tagname | update_nss tagname | update_libffi tagname | update_webidlparser tagname")
o.add_option("--skip-mozilla", dest="skip_mozilla",
View
@@ -3983,7 +3983,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
_USE_SYSTEM_NSS=1 )
if test -n "$_USE_SYSTEM_NSS"; then
- AM_PATH_NSS(3.14, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+ AM_PATH_NSS(3.14.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
fi
if test -n "$MOZ_NATIVE_NSS"; then
View
@@ -35,11 +35,6 @@
#ifndef _DB_H_
#define _DB_H_
-
-#ifdef WINCE
-#define off_t long
-#endif
-
#ifndef macintosh
#include <sys/types.h>
#endif
View
@@ -31,13 +31,7 @@ typedef struct DIR_Struct {
typedef unsigned long mode_t;
typedef long uid_t;
typedef long gid_t;
-
-#ifdef WINCE
- typedef long ino_t;
-#else
typedef long off_t;
-#endif
-
typedef unsigned long nlink_t;
#endif
View
@@ -53,10 +53,6 @@ include $(topsrcdir)/config/rules.mk
DEFINES += -DMEMMOVE -D__DBINTERFACE_PRIVATE $(SECURITY_FLAG)
-ifeq ($(OS_ARCH),WINCE)
-DEFINES += -D__STDC__ -DDBM_REOPEN_ON_FLUSH
-endif
-
ifeq ($(OS_ARCH),AIX)
OS_LIBS += -lc_r
endif
View
@@ -78,14 +78,6 @@ mkstempflags(char *path, int extraFlags)
return (_gettemp(path, &fd, extraFlags) ? fd : -1);
}
-#ifdef WINCE /* otherwise, use the one in libc */
-char *
-mktemp(char *path)
-{
- return(_gettemp(path, (int *)NULL, 0) ? path : (char *)NULL);
-}
-#endif
-
/* NB: This routine modifies its input string, and does not always restore it.
** returns 1 on success, 0 on failure.
*/
@@ -132,7 +132,7 @@ endif
G++INCLUDES = -I/usr/include/g++
#
-# Always set CPU_TAG on Linux, WINCE.
+# Always set CPU_TAG on Linux.
#
CPU_TAG = _$(CPU_ARCH)
View
@@ -457,12 +457,6 @@ OVERVIEW of "rules.mk":
MISCELLANEOUS
-------------
- $(DIRS):: specifies a helper method
- used by $(LOOP_THROUGH_DIRS)
- to recursively change
- directories and invoke
- $(MAKE)
-
%.i: build the preprocessor file
associated with the
makefile rule dependency:
@@ -11,5 +11,5 @@ include $(CORE_DEPTH)/coreconf/WIN32.mk
DEFINES += -DWIN95
-# WINNT uses the lib prefix, Win95 and WinCE don't
+# WINNT uses the lib prefix, Win95 doesn't
NSPR31_LIB_PREFIX = $(NULL)
View
@@ -1,182 +0,0 @@
-#
-# 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/.
-
-#
-# Configuration common to all versions of Windows CE and Pocket PC x.
-#
-
-ifeq ($(CPU_ARCH),x86)
- DEFAULT_COMPILER = cl
- CC = cl
- CCC = cl
-else
-ifeq ($(CPU_ARCH),ARM)
- DEFAULT_COMPILER = clarm
- CC = clarm
- CCC = clarm
-else
-include CPU_ARCH_is_not_recognized
-include _$(CPU_ARCH)
-endif
-endif
-
-LINK = link
-AR = lib
-AR += -NOLOGO -OUT:"$@"
-RANLIB = echo
-BSDECHO = echo
-
-ifdef BUILD_TREE
-NSINSTALL_DIR = $(BUILD_TREE)/nss
-else
-NSINSTALL_DIR = $(CORE_DEPTH)/coreconf/nsinstall
-endif
-NSINSTALL = nsinstall
-
-MKDEPEND_DIR = $(CORE_DEPTH)/coreconf/mkdepend
-MKDEPEND = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend.exe
-# Note: MKDEPENDENCIES __MUST__ be a relative pathname, not absolute.
-# If it is absolute, gmake will crash unless the named file exists.
-MKDEPENDENCIES = $(OBJDIR_NAME)/depend.mk
-
-INSTALL = $(NSINSTALL)
-MAKE_OBJDIR = mkdir
-MAKE_OBJDIR += $(OBJDIR)
-RC = rc.exe
-GARBAGE += $(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb
-XP_DEFINE += -DXP_PC
-LIB_SUFFIX = lib
-DLL_SUFFIX = dll
-OS_DLLFLAGS += -DLL
-
-EXTRA_EXE_LD_FLAGS += -ENTRY:mainWCRTStartup
-
-ifdef BUILD_OPT
-# OS_CFLAGS += -MD
- OPTIMIZER += -O2
- DEFINES += -UDEBUG -U_DEBUG -DNDEBUG
- DLLFLAGS += -OUT:"$@"
-else
- #
- # Define USE_DEBUG_RTL if you want to use the debug runtime library
- # (RTL) in the debug build
- #
- ifdef USE_DEBUG_RTL
-# OS_CFLAGS += -MDd
- else
-# OS_CFLAGS += -MD
- endif
- OPTIMIZER += -Od -Z7
- #OPTIMIZER += -Zi -Fd$(OBJDIR)/ -Od
- DEFINES += -DDEBUG -D_DEBUG -UNDEBUG -DDEBUG_$(USERNAME)
- DLLFLAGS += -DEBUG -DEBUGTYPE:CV -OUT:"$@"
- LDFLAGS += -DEBUG -DEBUGTYPE:CV
-endif
-
-# DEFINES += -DWIN32
-
-ifdef MAPFILE
- DLLFLAGS += -DEF:$(MAPFILE)
-endif
-
-# Change PROCESS to put the mapfile in the correct format for this platform
-PROCESS_MAP_FILE = cp $< $@
-
-#
-# The following is NOT needed for the NSPR 2.0 library.
-#
-
-DEFINES += -D_WINDOWS
-
-# override default, which is ASFLAGS = CFLAGS
-AS = ml.exe
-ASFLAGS = -Cp -Sn -Zi -coff $(INCLUDES)
-
-#
-# override the definitions of RELEASE_TREE found in tree.mk
-#
-ifndef RELEASE_TREE
- ifdef BUILD_SHIP
- ifdef USE_SHIPS
- RELEASE_TREE = $(NTBUILD_SHIP)
- else
- RELEASE_TREE = //redbuild/components
- endif
- else
- RELEASE_TREE = //redbuild/components
- endif
-endif
-
-#
-# override the definitions of LIB_PREFIX and DLL_PREFIX in prefix.mk
-#
-
-ifndef LIB_PREFIX
- LIB_PREFIX = $(NULL)
-endif
-
-ifndef DLL_PREFIX
- DLL_PREFIX = $(NULL)
-endif
-
-#
-# override the definitions of various _SUFFIX symbols in suffix.mk
-#
-
-#
-# Object suffixes
-#
-ifndef OBJ_SUFFIX
- OBJ_SUFFIX = .obj
-endif
-
-#
-# Assembler source suffixes
-#
-ifndef ASM_SUFFIX
- ASM_SUFFIX = .asm
-endif
-
-#
-# Library suffixes
-#
-
-ifndef IMPORT_LIB_SUFFIX
- IMPORT_LIB_SUFFIX = .$(LIB_SUFFIX)
-endif
-
-ifndef DYNAMIC_LIB_SUFFIX_FOR_LINKING
- DYNAMIC_LIB_SUFFIX_FOR_LINKING = $(IMPORT_LIB_SUFFIX)
-endif
-
-#
-# Program suffixes
-#
-ifndef PROG_SUFFIX
- PROG_SUFFIX = .exe
-endif
-
-#
-# override ruleset.mk, removing the "lib" prefix for library names, and
-# adding the "32" after the LIBRARY_VERSION.
-#
-ifdef LIBRARY_NAME
- SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)32$(JDK_DEBUG_SUFFIX).dll
- IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)32$(JDK_DEBUG_SUFFIX).lib
-endif
-
-#
-# override the TARGETS defined in ruleset.mk, adding IMPORT_LIBRARY
-#
-ifndef TARGETS
- TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(PROGRAM)
-endif
-
-
-#
-# Always set CPU_TAG on Linux, WINCE.
-#
-CPU_TAG = _$(CPU_ARCH)
-
@@ -16,5 +16,5 @@ DEFINES += -DWINNT
#
OS_CFLAGS += -GT
-# WINNT uses the lib prefix, Win95 and WinCE don't
+# WINNT uses the lib prefix, Win95 doesn't
NSPR31_LIB_PREFIX = lib
@@ -31,7 +31,7 @@ endif
#######################################################################
TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
- AIX RISCOS WINNT WIN95 WINCE Linux
+ AIX RISCOS WINNT WIN95 Linux
ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
@@ -10,4 +10,3 @@
*/
#error "Do not include this header file."
-
View
@@ -241,7 +241,7 @@ alltags:
$(PROGRAM): $(OBJS) $(EXTRA_LIBS)
@$(MAKE_OBJDIR)
ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
- $(MKPROG) $(subst /,\\,$(OBJS)) -Fe$@ -link $(LDFLAGS) $(subst /,\\,$(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)) $(EXTRA_EXE_LD_FLAGS)
+ $(MKPROG) $(subst /,\\,$(OBJS)) -Fe$@ -link $(LDFLAGS) $(subst /,\\,$(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS))
ifdef MT
if test -f $@.manifest; then \
$(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
@@ -337,7 +337,7 @@ $(OBJDIR)/$(PROG_PREFIX)%$(PROG_SUFFIX): $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX)
@$(MAKE_OBJDIR)
ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
$(MKPROG) $< -Fe$@ -link \
- $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(EXTRA_EXE_LD_FLAGS)
+ $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
ifdef MT
if test -f $@.manifest; then \
$(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
@@ -365,12 +365,16 @@ else
# Windows
ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
NEED_ABSOLUTE_PATH := 1
+ifdef .PYMAKE
+PWD := $(CURDIR)
+else
PWD := $(shell pwd)
ifeq (,$(findstring ;,$(PATH)))
ifndef USE_MSYS
PWD := $(subst \,/,$(shell cygpath -w $(PWD)))
endif
endif
+endif
else
# everything else
@@ -476,19 +480,6 @@ endif
%: %.sh
rm -f $@; cp $< $@; chmod +x $@
-ifdef DIRS
-$(DIRS)::
- @if test -d $@; then \
- set $(EXIT_ON_ERROR); \
- echo "cd $@; $(MAKE)"; \
- cd $@; $(MAKE); \
- set +e; \
- else \
- echo "Skipping non-directory $@..."; \
- fi; \
- $(CLICK_STOPWATCH)
-endif
-
################################################################################
# Bunch of things that extend the 'export' rule (in order):
################################################################################
@@ -896,7 +887,7 @@ $(MKDEPENDENCIES)::
$(NOMD_CFLAGS) $(YOPT) $(CSRCS) $(CPPSRCS) $(ASFILES)
$(MKDEPEND):: $(MKDEPEND_DIR)/*.c $(MKDEPEND_DIR)/*.h
- cd $(MKDEPEND_DIR); $(MAKE)
+ $(MAKE) -C $(MKDEPEND_DIR)
ifdef OBJS
depend:: $(MKDEPEND) $(MKDEPENDENCIES)
@@ -958,5 +949,5 @@ $(filter $(OBJDIR)/%$(OBJ_SUFFIX),$(OBJS)): $(OBJDIR)/%$(OBJ_SUFFIX): $(DUMMY_DE
# Fake targets. Always run these rules, even if a file/directory with that
# name already exists.
#
-.PHONY: all all_platforms alltags boot clean clobber clobber_all export install libs program realclean release $(OBJDIR) $(DIRS)
+.PHONY: all all_platforms alltags boot clean clobber clobber_all export install libs program realclean release $(OBJDIR)
Oops, something went wrong.

0 comments on commit 8d3ff86

Please sign in to comment.