Permalink
Browse files

Bug 527659, Update mozilla-central to NSS 3.12.6 (beta)

== NSS portion
== r=rrelyea/wtc for upgrading mozilla-central to cvs tag NSS_3_12_6_BETA1
== This includes reapplying the (merged) patch from bug 519550 on top of NSS.
== PSM portion
== Includes the patch to disable TLS compression, r=kaie
== Include the patch to disable zlib test programs, which don't work on maemo, r=kaie
  • Loading branch information...
1 parent 74304b1 commit 0ccf958b451eba97d3bc909e78f5c56b8b737611 @kaie kaie committed Feb 7, 2010
Showing with 113,774 additions and 56,028 deletions.
  1. +6 −0 dbm/include/Makefile.win
  2. +1 −1 dbm/src/Makefile.in
  3. +7 −1 dbm/src/Makefile.win
  4. +1 −1 dbm/tests/Makefile.in
  5. +1 −3 security/coreconf/BSD_OS.mk
  6. +0 −2 security/coreconf/BeOS.mk
  7. +3 −1 security/coreconf/Darwin.mk
  8. +8 −3 security/coreconf/FreeBSD.mk
  9. +1 −2 security/coreconf/HP-UX.mk
  10. +9 −12 security/coreconf/Linux.mk
  11. +4 −1 security/coreconf/Linux2.4.mk
  12. +0 −1 security/coreconf/NetBSD.mk
  13. +0 −1 security/coreconf/OpenBSD.mk
  14. +0 −1 security/coreconf/OpenUNIX.mk
  15. +0 −1 security/coreconf/QNX.mk
  16. +5 −6 security/coreconf/RISCOS.mk
  17. +0 −1 security/coreconf/SCO_SV3.2.mk
  18. +0 −5 security/coreconf/config.mk
  19. +0 −1 security/coreconf/coreconf.dep
  20. +2 −1 security/coreconf/rules.mk
  21. +7 −0 security/manager/Makefile.in
  22. +0 −4 security/nss/cmd/Makefile
  23. +1 −0 security/nss/cmd/certutil/certutil.c
  24. +0 −41 security/nss/cmd/crlutil/crlgen.c
  25. +12 −0 security/nss/cmd/lib/SSLerrs.h
  26. +1 −1 security/nss/cmd/manifest.mn
  27. +79 −0 security/nss/cmd/multinit/Makefile
  28. +45 −0 security/nss/cmd/multinit/manifest.mn
  29. +940 −0 security/nss/cmd/multinit/multinit.c
  30. +11 −27 security/nss/cmd/platlibs.mk
  31. +150 −8 security/nss/cmd/selfserv/selfserv.c
  32. +5 −5 security/nss/cmd/shlibsign/sign.sh
  33. +3 −0 security/nss/cmd/signtool/certgen.c
  34. +76 −31 security/nss/cmd/ssltap/ssltap.c
  35. +34 −10 security/nss/cmd/strsclnt/strsclnt.c
  36. +129 −0 security/nss/cmd/tests/dertimetest.c
  37. +1 −0 security/nss/cmd/tests/manifest.mn
  38. +62 −17 security/nss/cmd/tstclnt/tstclnt.c
  39. +163 −0 security/nss/coverage/cov.sh
  40. +238 −0 security/nss/coverage/report.sh
  41. +3 −3 security/nss/lib/Makefile
  42. +9 −1 security/nss/lib/certdb/cert.h
  43. +95 −0 security/nss/lib/certhigh/certhigh.c
  44. +200 −24 security/nss/lib/certhigh/ocsp.c
  45. +37 −1 security/nss/lib/certhigh/ocsp.h
  46. +3 −25 security/nss/lib/ckfw/builtins/Makefile
  47. +1 −3 security/nss/lib/ckfw/builtins/manifest.mn
  48. +2 −2 security/nss/lib/cryptohi/cryptohi.h
  49. +3 −1 security/nss/lib/cryptohi/key.h
  50. +3 −3 security/nss/lib/cryptohi/seckey.c
  51. +2 −2 security/nss/lib/cryptohi/secsign.c
  52. +2 −4 security/nss/lib/dev/ckhelper.c
  53. +1 −5 security/nss/lib/dev/ckhelper.h
  54. +1 −5 security/nss/lib/dev/dev.h
  55. +1 −5 security/nss/lib/dev/devm.h
  56. +2 −4 security/nss/lib/dev/devslot.c
  57. +1 −5 security/nss/lib/dev/devt.h
  58. +20 −4 security/nss/lib/dev/devtoken.c
  59. +4 −4 security/nss/lib/freebl/Makefile
  60. +16 −2 security/nss/lib/libpkix/pkix/checker/pkix_ocspchecker.c
  61. +4 −1 security/nss/lib/libpkix/pkix/util/pkix_tools.c
  62. +2 −2 security/nss/lib/manifest.mn
  63. +0 −5 security/nss/lib/nss/config.mk
  64. +18 −0 security/nss/lib/nss/nss.def
  65. +93 −9 security/nss/lib/nss/nss.h
  66. +2 −2 security/nss/lib/nss/nss.rc
  67. +431 −204 security/nss/lib/nss/nssinit.c
  68. +1 −19 security/nss/lib/pk11wrap/pk11akey.c
  69. +16 −11 security/nss/lib/pk11wrap/pk11cert.c
  70. +3 −2 security/nss/lib/pk11wrap/pk11func.h
  71. +155 −32 security/nss/lib/pk11wrap/pk11load.c
  72. +0 −1 security/nss/lib/pk11wrap/pk11merge.c
  73. +803 −4 security/nss/lib/pk11wrap/pk11pars.c
  74. +0 −6 security/nss/lib/pk11wrap/pk11pk12.c
  75. +1 −0 security/nss/lib/pk11wrap/pk11priv.h
  76. +9 −0 security/nss/lib/pk11wrap/pk11pub.h
  77. +50 −2 security/nss/lib/pk11wrap/pk11slot.c
  78. +35 −56 security/nss/lib/pk11wrap/pk11util.c
  79. +4 −0 security/nss/lib/pk11wrap/secmod.h
  80. +32 −2 security/nss/lib/pk11wrap/secmodi.h
  81. +11 −1 security/nss/lib/pki/pki3hack.c
  82. +2 −2 security/nss/lib/smime/smime.rc
  83. +1 −1 security/nss/lib/softoken/softkver.h
  84. +6 −0 security/nss/lib/sqlite/README
  85. +9 −0 security/nss/lib/sqlite/config.mk
  86. +1 −1 security/nss/lib/sqlite/manifest.mn
  87. +1 −1 security/nss/lib/sqlite/sqlite.def
  88. +99,624 −53,657 security/nss/lib/sqlite/sqlite3.c
  89. +4,961 −1,184 security/nss/lib/sqlite/sqlite3.h
  90. +5 −0 security/nss/lib/ssl/Makefile
  91. +7 −15 security/nss/lib/ssl/config.mk
  92. +11 −0 security/nss/lib/ssl/ssl.def
  93. +110 −6 security/nss/lib/ssl/ssl.h
  94. +2 −2 security/nss/lib/ssl/ssl.rc
  95. +798 −100 security/nss/lib/ssl/ssl3con.c
  96. +3 −3 security/nss/lib/ssl/ssl3ecc.c
  97. +325 −74 security/nss/lib/ssl/ssl3ext.c
  98. +5 −18 security/nss/lib/ssl/ssl3prot.h
  99. +27 −5 security/nss/lib/ssl/sslcon.c
  100. +7 −1 security/nss/lib/ssl/sslerr.h
  101. +2 −2 security/nss/lib/ssl/sslgathr.c
  102. +65 −8 security/nss/lib/ssl/sslimpl.h
  103. +69 −5 security/nss/lib/ssl/sslinfo.c
  104. +10 −1 security/nss/lib/ssl/sslproto.h
  105. +40 −2 security/nss/lib/ssl/sslreveal.c
  106. +144 −61 security/nss/lib/ssl/sslsecur.c
  107. +276 −63 security/nss/lib/ssl/sslsnce.c
  108. +189 −4 security/nss/lib/ssl/sslsock.c
  109. +31 −1 security/nss/lib/ssl/sslt.h
  110. +80 −0 security/nss/lib/sysinit/Makefile
  111. +121 −0 security/nss/lib/sysinit/config.mk
  112. +48 −0 security/nss/lib/sysinit/manifest.mn
  113. +377 −0 security/nss/lib/sysinit/nsssysinit.c
  114. +0 −5 security/nss/lib/util/config.mk
  115. +42 −17 security/nss/lib/util/dertime.c
  116. +1 −0 security/nss/lib/util/manifest.mn
  117. +7 −0 security/nss/lib/util/nssutil.def
  118. +7 −6 security/nss/lib/util/nssutil.h
  119. +2 −2 security/nss/lib/util/nssutil.rc
  120. +7 −1 security/nss/lib/util/secasn1.h
  121. +217 −0 security/nss/lib/util/secload.c
  122. +1 −1 security/nss/lib/util/secoid.h
  123. +71 −20 security/nss/lib/util/secport.c
  124. +39 −1 security/nss/lib/util/secport.h
  125. 0 security/nss/{cmd → lib}/zlib/Makefile
  126. 0 security/nss/{cmd → lib}/zlib/README
  127. +1 −1 security/nss/{cmd → lib}/zlib/adler32.c
  128. +1 −1 security/nss/{cmd → lib}/zlib/compress.c
  129. 0 security/nss/{cmd → lib}/zlib/config.mk
  130. +1 −1 security/nss/{cmd → lib}/zlib/crc32.c
  131. 0 security/nss/{cmd → lib}/zlib/crc32.h
  132. +1 −1 security/nss/{cmd → lib}/zlib/deflate.c
  133. +1 −1 security/nss/{cmd → lib}/zlib/deflate.h
  134. +1 −1 security/nss/{cmd → lib}/zlib/example.c
  135. +1 −1 security/nss/{cmd → lib}/zlib/gzio.c
  136. 0 security/nss/{cmd → lib}/zlib/infback.c
  137. 0 security/nss/{cmd → lib}/zlib/inffast.c
  138. 0 security/nss/{cmd → lib}/zlib/inffast.h
  139. 0 security/nss/{cmd → lib}/zlib/inffixed.h
  140. 0 security/nss/{cmd → lib}/zlib/inflate.c
  141. 0 security/nss/{cmd → lib}/zlib/inflate.h
  142. 0 security/nss/{cmd → lib}/zlib/inftrees.c
  143. 0 security/nss/{cmd → lib}/zlib/inftrees.h
  144. 0 security/nss/{cmd → lib}/zlib/manifest.mn
  145. +1 −1 security/nss/{cmd → lib}/zlib/minigzip.c
  146. +1 −1 security/nss/{cmd → lib}/zlib/trees.c
  147. 0 security/nss/{cmd → lib}/zlib/trees.h
  148. +1 −1 security/nss/{cmd → lib}/zlib/uncompr.c
  149. +1 −1 security/nss/{cmd → lib}/zlib/zconf.h
  150. 0 security/nss/{cmd → lib}/zlib/zlib.h
  151. +1 −1 security/nss/{cmd → lib}/zlib/zutil.c
  152. +1 −1 security/nss/{cmd → lib}/zlib/zutil.h
  153. +2 −2 security/nss/tests/all.sh
  154. +7 −2 security/nss/tests/cert/cert.sh
  155. +36 −0 security/nss/tests/cert/certext.txt
  156. +13 −4 security/nss/tests/chains/chains.sh
  157. +7 −0 security/nss/tests/chains/ocspd-config/ocspd-certs.sh
  158. +36 −0 security/nss/tests/chains/scenarios/aia.cfg
  159. +36 −0 security/nss/tests/chains/scenarios/anypolicy.cfg
  160. +36 −0 security/nss/tests/chains/scenarios/anypolicywithlevel.cfg
  161. +36 −0 security/nss/tests/chains/scenarios/bridge.cfg
  162. +36 −0 security/nss/tests/chains/scenarios/bridgewithaia.cfg
  163. +36 −0 security/nss/tests/chains/scenarios/bridgewithhalfaia.cfg
  164. +36 −0 security/nss/tests/chains/scenarios/bridgewithpolicyextensionandmapping.cfg
  165. +40 −0 security/nss/tests/chains/scenarios/crldp.cfg
  166. +36 −0 security/nss/tests/chains/scenarios/dsa.cfg
  167. +36 −0 security/nss/tests/chains/scenarios/explicitPolicy.cfg
  168. +36 −0 security/nss/tests/chains/scenarios/extension.cfg
  169. +36 −0 security/nss/tests/chains/scenarios/extension2.cfg
  170. +36 −0 security/nss/tests/chains/scenarios/mapping.cfg
  171. +36 −0 security/nss/tests/chains/scenarios/mapping2.cfg
  172. +36 −0 security/nss/tests/chains/scenarios/megabridge_3_2.cfg
  173. +62 −0 security/nss/tests/chains/scenarios/ocsp.cfg
  174. +79 −2 security/nss/tests/chains/scenarios/ocspd.cfg
  175. +36 −0 security/nss/tests/chains/scenarios/realcerts.cfg
  176. +36 −0 security/nss/tests/chains/scenarios/revoc.cfg
  177. +36 −0 security/nss/tests/chains/scenarios/scenarios
  178. +1 −1 security/nss/tests/cipher/cipher.sh
  179. +35 −0 security/nss/tests/cipher/cipher.txt
  180. +35 −0 security/nss/tests/cipher/dsa.txt
  181. +35 −0 security/nss/tests/cipher/hash.txt
  182. +36 −0 security/nss/tests/cipher/performance.sh
  183. +35 −0 security/nss/tests/cipher/rsa.txt
  184. +35 −0 security/nss/tests/cipher/symmkey.txt
  185. +1 −1 security/nss/tests/common/Makefile
  186. +3 −2 security/nss/tests/common/cleanup.sh
  187. +2 −1 security/nss/tests/common/init.sh
  188. +2 −2 security/nss/tests/crmf/crmf.sh
  189. +1 −1 security/nss/tests/dbtests/dbtests.sh
  190. +1 −1 security/nss/tests/dbupgrade/dbupgrade.sh
  191. +2 −2 security/nss/tests/fips/fips.sh
  192. +4 −4 security/nss/tests/iopr/cert_iopr.sh
  193. +4 −4 security/nss/tests/iopr/ocsp_iopr.sh
  194. +35 −0 security/nss/tests/iopr/server_scr/apache_unix.cfg
  195. +36 −1 security/nss/tests/iopr/server_scr/cert_gen.sh
  196. +35 −0 security/nss/tests/iopr/server_scr/cipher.list
  197. +35 −0 security/nss/tests/iopr/server_scr/client.cgi
  198. +35 −0 security/nss/tests/iopr/server_scr/config
  199. +35 −0 security/nss/tests/iopr/server_scr/iis_windows.cfg
  200. +35 −0 security/nss/tests/iopr/server_scr/iopr_server.cfg
  201. +7 −4 security/nss/tests/iopr/ssl_iopr.sh
  202. BIN security/nss/tests/libpkix/certs/OCSPCA1.p12
  203. BIN security/nss/tests/libpkix/certs/OCSPCA2.p12
  204. BIN security/nss/tests/libpkix/certs/OCSPCA3.p12
  205. BIN security/nss/tests/libpkix/certs/OCSPEE22.cert
  206. BIN security/nss/tests/libpkix/certs/OCSPEE23.cert
  207. BIN security/nss/tests/libpkix/certs/OCSPEE32.cert
  208. BIN security/nss/tests/libpkix/certs/OCSPEE33.cert
  209. BIN security/nss/tests/libpkix/certs/OCSPRoot.p12
  210. +37 −0 security/nss/tests/memleak/ignored
  211. +1 −1 security/nss/tests/memleak/memleak.sh
  212. +2 −3 security/nss/tests/merge/merge.sh
  213. +191 −0 security/nss/tests/multinit/multinit.sh
  214. +79 −0 security/nss/tests/multinit/multinit.txt
  215. +5 −3 security/nss/tests/ocsp/ocsp.sh
  216. +2 −2 security/nss/tests/perf/perf.sh
  217. +2 −2 security/nss/tests/pkits/pkits.sh
  218. +2 −2 security/nss/tests/run_niscc.sh
  219. +2 −2 security/nss/tests/sdr/sdr.sh
  220. +27 −8 security/nss/tests/ssl/ssl.sh
  221. +2 −2 security/nss/tests/ssl/ssl_dist_stress.sh
  222. +68 −20 security/nss/tests/ssl/sslauth.txt
  223. +34 −0 security/nss/tests/ssl/sslcov.txt
  224. +41 −0 security/nss/tests/ssl/sslstress.txt
  225. +35 −0 security/nss/tests/tools/sign.html
  226. +35 −0 security/nss/tests/tools/signjs.html
  227. +21 −15 security/nss/tests/tools/tools.sh
View
@@ -41,6 +41,12 @@
#//
#//------------------------------------------------------------------------
+!if "$(MOZ_BITS)" == "16"
+!ifndef MOZ_DEBUG
+OPTIMIZER=-Os -UDEBUG -DNDEBUG
+!endif
+!endif
+
#//------------------------------------------------------------------------
#//
#// Specify the depth of the current directory relative to the
View
@@ -46,7 +46,7 @@ LIBRARY_NAME = mozdbm_s
LIB_IS_C_ONLY = 1
ifeq ($(OS_ARCH),WINNT)
-LIBRARY_NAME = dbm32
+LIBRARY_NAME = dbm$(MOZ_BITS)
endif
CSRCS = \
View
@@ -41,6 +41,12 @@
#//
#//------------------------------------------------------------------------
+!if "$(MOZ_BITS)" == "16"
+!ifndef MOZ_DEBUG
+OPTIMIZER=-Os -UDEBUG -DNDEBUG
+!endif
+!endif
+
#//------------------------------------------------------------------------
#//
#// Specify the depth of the current directory relative to the
@@ -58,7 +64,7 @@ MAKE_OBJ_TYPE=EXE
#// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...)
#//
#//------------------------------------------------------------------------
-LIBNAME=dbm32
+LIBNAME=dbm$(MOZ_BITS)
PDBFILE=$(LIBNAME).pdb
#//------------------------------------------------------------------------
View
@@ -51,7 +51,7 @@ PROGRAM = lots$(BIN_SUFFIX)
CSRCS = lots.c
ifeq ($(OS_ARCH),WINNT)
-EXTRA_DSO_LIBS = dbm32
+EXTRA_DSO_LIBS = dbm$(MOZ_BITS)
else
EXTRA_DSO_LIBS = mozdbm_s
endif
@@ -71,9 +71,7 @@ OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -DBSD_OS -DBSDI -D
ARCH = bsdos
DSO_CFLAGS = -fPIC -DPIC
-DSO_LDOPTS = -shared
-DSO_LDFLAGS =
-DSO_LDOPTS += -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
+DSO_LDOPTS = -shared -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
ifdef LIBRUNPATH
DSO_LDOPTS += -Wl,-R$(LIBRUNPATH)
@@ -77,5 +77,3 @@ ARCH = beos
DSO_CFLAGS = -fPIC
DSO_LDOPTS =
-DSO_LDFLAGS =
-
@@ -121,8 +121,10 @@ endif
ARCH = darwin
DSO_CFLAGS = -fPIC
+# May override this with different compatibility and current version numbers.
+DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1
# May override this with -bundle to create a loadable module.
-DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
+DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
MKSHLIB = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
DLL_SUFFIX = dylib
@@ -42,11 +42,16 @@ CC = gcc
CCC = g++
RANLIB = ranlib
-ifeq ($(OS_TEST),alpha)
-CPU_ARCH = alpha
-else
+CPU_ARCH = $(OS_TEST)
+ifeq ($(CPU_ARCH),i386)
+CPU_ARCH = x86
+endif
+ifeq ($(CPU_ARCH),pc98)
CPU_ARCH = x86
endif
+ifeq ($(CPU_ARCH),amd64)
+CPU_ARCH = x86_64
+endif
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
@@ -88,10 +88,9 @@ RPATH = +b '$$ORIGIN'
ifneq ($(OS_TEST),ia64)
# pa-risc
ifndef USE_64
-RPATH =
+RPATH =
endif
endif
-DSO_LDFLAGS =
# +Z generates position independent code for use in shared libraries.
DSO_CFLAGS = +Z
View
@@ -53,48 +53,41 @@ RANLIB = ranlib
DEFAULT_COMPILER = gcc
ifeq ($(OS_TEST),ppc64)
- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = ppc
ifeq ($(USE_64),1)
ARCHFLAG = -m64
endif
else
ifeq ($(OS_TEST),alpha)
- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE
+ OS_REL_CFLAGS = -D_ALPHA_
CPU_ARCH = alpha
else
ifeq ($(OS_TEST),x86_64)
ifeq ($(USE_64),1)
- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = x86_64
else
- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
+ OS_REL_CFLAGS = -Di386
CPU_ARCH = x86
ARCHFLAG = -m32
endif
else
ifeq ($(OS_TEST),sparc64)
- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = sparc
else
ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = arm
else
ifeq (,$(filter-out parisc%,$(OS_TEST)))
- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = hppa
else
ifeq (,$(filter-out i%86,$(OS_TEST)))
- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
+ OS_REL_CFLAGS = -Di386
CPU_ARCH = x86
else
ifeq ($(OS_TEST),sh4a)
- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = sh4
else
# $(OS_TEST) == m68k, ppc, ia64, sparc, s390, s390x, mips, sh3, sh4
- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = $(OS_TEST)
endif
endif
@@ -134,7 +127,12 @@ ifeq ($(USE_PTHREADS),1)
OS_PTHREAD = -lpthread
endif
-OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -ansi -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
+# See bug 537829, in particular comment 23.
+# Place -ansi and *_SOURCE before $(DSO_CFLAGS) so DSO_CFLAGS can override
+# -ansi on platforms like Android where the system headers are C99 and do
+# not build with -ansi.
+STANDARDS_CFLAGS = -ansi -D_POSIX_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE
+OS_CFLAGS = $(STANDARDS_CFLAGS) $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -DHAVE_STRERROR
OS_LIBS = $(OS_PTHREAD) -ldl -lc
ifdef USE_PTHREADS
@@ -150,7 +148,6 @@ DSO_LDOPTS = -shared $(ARCHFLAG)
# we don't use -z defs there.
ZDEFS_FLAG = -Wl,-z,defs
DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
-DSO_LDFLAGS =
LDFLAGS += $(ARCHFLAG)
# INCLUDES += -I/usr/include -Y/usr/include/linux
@@ -46,5 +46,8 @@ endif
PROCESS_MAP_FILE = grep -v ';-' $< | \
sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
-NSS_NO_FORK_CHECK=1
+# Softoken 3.13 uses NO_FORK_CHECK only.
+# Softoken 3.12 uses NO_FORK_CHECK and NO_CHECK_FORK.
+# Don't use NO_CHECK_FORK in new code.
+DEFINES += -DNO_FORK_CHECK -DNO_CHECK_FORK
@@ -66,7 +66,6 @@ ARCH = netbsd
DSO_CFLAGS = -fPIC -DPIC
DSO_LDOPTS = -shared
-DSO_LDFLAGS =
ifeq ($(OBJECT_FMT),ELF)
DSO_LDOPTS += -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
endif
@@ -66,7 +66,6 @@ ARCH = openbsd
DSO_CFLAGS = -fPIC -DPIC
DSO_LDOPTS = -shared -fPIC -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-DSO_LDFLAGS =
MKSHLIB = $(CC) $(DSO_LDOPTS)
@@ -87,7 +87,6 @@ PROCESS_MAP_FILE = cp $< $@
BUILD_UNIX_PLUGINS = 1
#DSO_LDOPTS += -b elf -G -z defs
DSO_LDOPTS += -G
-DSO_LDFLAGS += -nostdlib -L/lib -L/usr/lib -lXm -lXt -lX11 -lgen
# Used for Java compiler
EXPORT_FLAGS += -W l,-Bexport
View
@@ -69,4 +69,3 @@ ARCH = QNX
DSO_CFLAGS = -Wc,-fPIC
DSO_LDOPTS = -shared
-DSO_LDFLAGS =
@@ -40,16 +40,15 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk
LIB_SUFFIX = a
DLL_SUFFIX = so
-AR = ar cr $@
+AR = ar cr $@
LDOPTS += -L$(SOURCE_LIB_DIR)
MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-OS_RELEASE =
-OS_TARGET = RISCOS
+OS_RELEASE =
+OS_TARGET = RISCOS
-DSO_CFLAGS = -fPIC
-DSO_LDOPTS = -shared
-DSO_LDFLAGS =
+DSO_CFLAGS = -fPIC
+DSO_LDOPTS = -shared
ifdef BUILD_OPT
OPTIMIZER = -O3
@@ -87,7 +87,6 @@ PROCESS_MAP_FILE = cp $< $@
BUILD_UNIX_PLUGINS = 1
#DSO_LDOPTS += -b elf -G -z defs
DSO_LDOPTS += -b elf -G
-DSO_LDFLAGS += -nostdlib -L/lib -L/usr/lib -lXm -lXt -lX11 -lgen
# Used for Java compiler
EXPORT_FLAGS += -W l,-Bexport
@@ -194,11 +194,6 @@ ifdef NSS_DISABLE_DBM
DEFINES += -DNSS_DISABLE_DBM
endif
-ifdef NSS_NO_FORK_CHECK
-DEFINES += -DNO_FORK_CHECK
-DEFINES += -DNO_CHECK_FORK
-endif
-
# Avoid building object leak test code for optimized library
ifndef BUILD_OPT
ifdef PKIX_OBJECT_LEAK_TEST
@@ -42,4 +42,3 @@
*/
#error "Do not include this header file."
-
@@ -410,7 +410,8 @@ PWD := $(shell pwd)
endif
endif
-core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))
+# The quotes allow absolute paths to contain spaces.
+core_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))"
$(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c
@$(MAKE_OBJDIR)
@@ -243,6 +243,13 @@ ifeq ($(OS_ARCH),Linux)
DEFAULT_GMAKE_FLAGS += FREEBL_NO_DEPEND=1
endif
+# Turn off TLS compression support because NSS 3.12.5 Beta can't be built
+# with Mozilla's zlib.h. See bug 527659 comment 10.
+DEFAULT_GMAKE_FLAGS += USE_SYSTEM_ZLIB=
+
+# Disable building of the test programs in security/nss/lib/zlib
+DEFAULT_GMAKE_FLAGS += PROGRAMS=
+
ifdef CROSS_COMPILE
ifdef WINCE
@@ -46,10 +46,6 @@ ifdef BUILD_LIBPKIX_TESTS
DIRS += libpkix
endif
-ifndef USE_SYSTEM_ZLIB
-ZLIB_SRCDIR = zlib # Add the zlib directory to DIRS.
-endif
-
INCLUDES += \
-I$(DIST)/../public/security \
-I./include \
@@ -257,6 +257,7 @@ CertReq(SECKEYPrivateKey *privk, SECKEYPublicKey *pubk, KeyType keyType,
/* Generate certificate request */
cr = CERT_CreateCertificateRequest(subject, spki, NULL);
+ SECKEY_DestroySubjectPublicKeyInfo(spki);
if (!cr) {
SECU_PrintError(progName, "unable to make certificate request");
return SECFailure;
@@ -56,47 +56,6 @@
#include "crlgen.h"
-/* these reroutines were taken from secitem.c, which is supposed to
- * replace this file some day */
-/*
- * This is the hash function. We simply XOR the encoded form with
- * itself in sizeof(PLHashNumber)-byte chunks. Improving this
- * routine is left as an excercise for the more mathematically
- * inclined student.
- */
-PLHashNumber PR_CALLBACK
-SECITEM_Hash ( const void *key)
-{
- const SECItem *item = (const SECItem *)key;
- PLHashNumber rv = 0;
-
- PRUint8 *data = (PRUint8 *)item->data;
- PRUint32 i;
- PRUint8 *rvc = (PRUint8 *)&rv;
-
- for( i = 0; i < item->len; i++ ) {
- rvc[ i % sizeof(rv) ] ^= *data;
- data++;
- }
-
- return rv;
-}
-
-/*
- * This is the key-compare function. It simply does a lexical
- * comparison on the item data. This does not result in
- * quite the same ordering as the "sequence of numbers" order,
- * but heck it's only used internally by the hash table anyway.
- */
-PRIntn PR_CALLBACK
-SECITEM_HashCompare ( const void *k1, const void *k2)
-{
- const SECItem *i1 = (const SECItem *)k1;
- const SECItem *i2 = (const SECItem *)k2;
-
- return SECITEM_ItemsAreEqual(i1,i2);
-}
-
/* Destroys extHandle and data. data was create on heap.
* extHandle creaded by CERT_StartCRLEntryExtensions. entry
* was allocated on arena.*/
@@ -390,3 +390,15 @@ ER3(SSL_ERROR_RX_UNEXPECTED_NEW_SESSION_TICKET, (SSL_ERROR_BASE + 109),
ER3(SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET, (SSL_ERROR_BASE + 110),
"SSL received a malformed New Session Ticket handshake message.")
+
+ER3(SSL_ERROR_DECOMPRESSION_FAILURE, (SSL_ERROR_BASE + 111),
+"SSL received a compressed record that could not be decompressed.")
+
+ER3(SSL_ERROR_RENEGOTIATION_NOT_ALLOWED, (SSL_ERROR_BASE + 112),
+"Renegotiation is not allowed on this SSL socket.")
+
+ER3(SSL_ERROR_UNSAFE_NEGOTIATION, (SSL_ERROR_BASE + 113),
+"Peer attempted old style (potentially vulnerable) handshake.")
+
+ER3(SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD, (SSL_ERROR_BASE + 114),
+"SSL received an unexpected uncompressed record.")
@@ -41,7 +41,6 @@ DEPTH = ../..
REQUIRES = nss nspr libdbm
DIRS = lib \
- $(ZLIB_SRCDIR) \
addbuiltin \
atob \
bltest \
@@ -56,6 +55,7 @@ DIRS = lib \
digest \
fipstest \
makepqg \
+ multinit \
ocspclnt \
oidcalc \
p7content \
Oops, something went wrong.

0 comments on commit 0ccf958

Please sign in to comment.