v4.8.5 proposal

CHANGELOG.md

@@ -1,5 +1,45 @@
 # Node.js ChangeLog
 
+## 2017-10-03, Version 4.8.5 'Argon' (Maintenance), @MylesBorins
+
+### Notable Changes
+
+Coming Soon
+
+### Commits
+
+* [[`0b1df7e99d`](https://github.com/nodejs/node/commit/0b1df7e99d)] - deps/v8: add missing #include "unicode/normlzr.h" (Bruno Pagani) [#13040](https://github.com/nodejs/node/pull/13040)
+* [[`dc05da730f`](https://github.com/nodejs/node/commit/dc05da730f)] - **build**: codesign tarball binary on macOS (Evan Lucas) [#14179](https://github.com/nodejs/node/pull/14179)
+* [[`40fb0da733`](https://github.com/nodejs/node/commit/40fb0da733)] - **build**: avoid /docs/api and /docs/doc/api upload (Rod Vagg) [#12957](https://github.com/nodejs/node/pull/12957)
+* [[`70f2299c1e`](https://github.com/nodejs/node/commit/70f2299c1e)] - **build,tools**: do not force codesign prefix (Evan Lucas) [#14179](https://github.com/nodejs/node/pull/14179)
+* [[`fc6d118cbf`](https://github.com/nodejs/node/commit/fc6d118cbf)] - **crypto**: update root certificates (Ben Noordhuis) [#13279](https://github.com/nodejs/node/pull/13279)
+* [[`491f8c7db4`](https://github.com/nodejs/node/commit/491f8c7db4)] - **crypto**: update root certificates (Ben Noordhuis) [#12402](https://github.com/nodejs/node/pull/12402)
+* [[`61f046404d`](https://github.com/nodejs/node/commit/61f046404d)] - **crypto**: clear err stack after ECDH::BufferToPoint (Ryan Kelly) [#13275](https://github.com/nodejs/node/pull/13275)
+* [[`84a838e209`](https://github.com/nodejs/node/commit/84a838e209)] - **deps**: update openssl asm and asm_obsolete files (Daniel Bevenius) [#13233](https://github.com/nodejs/node/pull/13233)
+* [[`df2ee21172`](https://github.com/nodejs/node/commit/df2ee21172)] - **deps**: update openssl config files (Daniel Bevenius) [#13233](https://github.com/nodejs/node/pull/13233)
+* [[`c98f78d4f5`](https://github.com/nodejs/node/commit/c98f78d4f5)] - **deps**: add -no_rand_screen to openssl s_client (Shigeki Ohtsu) [nodejs/io.js#1836](https://github.com/nodejs/io.js/pull/1836)
+* [[`a4e947fcf0`](https://github.com/nodejs/node/commit/a4e947fcf0)] - **deps**: fix asm build error of openssl in x86_win32 (Shigeki Ohtsu) [iojs/io.js#1389](https://github.com/iojs/io.js/pull/1389)
+* [[`0bacd2dfed`](https://github.com/nodejs/node/commit/0bacd2dfed)] - **deps**: fix openssl assembly error on ia32 win32 (Fedor Indutny) [iojs/io.js#1389](https://github.com/iojs/io.js/pull/1389)
+* [[`283dd7387c`](https://github.com/nodejs/node/commit/283dd7387c)] - **deps**: copy all openssl header files to include dir (Daniel Bevenius) [#13233](https://github.com/nodejs/node/pull/13233)
+* [[`a5a80655b8`](https://github.com/nodejs/node/commit/a5a80655b8)] - **deps**: upgrade openssl sources to 1.0.2l (Daniel Bevenius) [#13233](https://github.com/nodejs/node/pull/13233)
+* [[`0286833a39`](https://github.com/nodejs/node/commit/0286833a39)] - **deps**: add example of comparing OpenSSL changes (Daniel Bevenius) [#13234](https://github.com/nodejs/node/pull/13234)
+* [[`5d7f68ae9d`](https://github.com/nodejs/node/commit/5d7f68ae9d)] - **deps**: cherry-pick 09db540,686558d from V8 upstream (Jesse Rosenberger) [#14829](https://github.com/nodejs/node/pull/14829)
+* [[`df23963e82`](https://github.com/nodejs/node/commit/df23963e82)] - ***Revert*** "**deps**: backport e093a04, 09db540 from upstream V8" (Jesse Rosenberger) [#14829](https://github.com/nodejs/node/pull/14829)
+* [[`dabc7c3a12`](https://github.com/nodejs/node/commit/dabc7c3a12)] - **deps**: cherry-pick 18ea996 from c-ares upstream (Anna Henningsen) [#13883](https://github.com/nodejs/node/pull/13883)
+* [[`64f5b73f00`](https://github.com/nodejs/node/commit/64f5b73f00)] - **deps**: update openssl asm and asm_obsolete files (Shigeki Ohtsu) [#12913](https://github.com/nodejs/node/pull/12913)
+* [[`f4c5874a01`](https://github.com/nodejs/node/commit/f4c5874a01)] - **deps**: cherry-pick 4ae5993 from upstream OpenSSL (Shigeki Ohtsu) [#12913](https://github.com/nodejs/node/pull/12913)
+* [[`273e02d89a`](https://github.com/nodejs/node/commit/273e02d89a)] - **doc**: add missing make command to UPGRADING.md (Daniel Bevenius) [#13233](https://github.com/nodejs/node/pull/13233)
+* [[`244983a6ab`](https://github.com/nodejs/node/commit/244983a6ab)] - **doc**: add entry for subprocess.killed property (Rich Trott) [#14578](https://github.com/nodejs/node/pull/14578)
+* [[`fd27dc72a4`](https://github.com/nodejs/node/commit/fd27dc72a4)] - **doc**: change `child` to `subprocess` (Rich Trott) [#14578](https://github.com/nodejs/node/pull/14578)
+* [[`fc6145ff03`](https://github.com/nodejs/node/commit/fc6145ff03)] - **docs**: Fix broken links in crypto.md (Zuzana Svetlikova) [#15182](https://github.com/nodejs/node/pull/15182)
+* [[`d93ef98ac9`](https://github.com/nodejs/node/commit/d93ef98ac9)] - **openssl**: fix keypress requirement in apps on win32 (Shigeki Ohtsu) [iojs/io.js#1389](https://github.com/iojs/io.js/pull/1389)
+* [[`fdcfc4c153`](https://github.com/nodejs/node/commit/fdcfc4c153)] - **tools**: update certdata.txt (Ben Noordhuis) [#13279](https://github.com/nodejs/node/pull/13279)
+* [[`6fa2d7eccb`](https://github.com/nodejs/node/commit/6fa2d7eccb)] - **tools**: update certdata.txt (Ben Noordhuis) [#12402](https://github.com/nodejs/node/pull/12402)
+* [[`8c9f1b3474`](https://github.com/nodejs/node/commit/8c9f1b3474)] - **tools**: be explicit about including key-id (Myles Borins) [#13309](https://github.com/nodejs/node/pull/13309)
+* [[`0bcd62baee`](https://github.com/nodejs/node/commit/0bcd62baee)] - **v8**: fix stack overflow in recursive method (Ben Noordhuis) [#12460](https://github.com/nodejs/node/pull/12460)
+* [[`5422eb8d4e`](https://github.com/nodejs/node/commit/5422eb8d4e)] - **zlib**: fix crash when initializing failed (Anna Henningsen) [#14666](https://github.com/nodejs/node/pull/14666)
+* [[`2a8ef7a1af`](https://github.com/nodejs/node/commit/2a8ef7a1af)] - **zlib**: fix node crashing on invalid options (Alexey Orlenko) [#13098](https://github.com/nodejs/node/pull/13098)
+
 ## 2017-07-11, Version 4.8.4 'Argon' (Maintenance), @MylesBorins
 
 This is a security release. All Node.js users should consult the security release summary at https://nodejs.org/en/blog/vulnerability/july-2017-security-releases/ for details on patched vulnerabilities.

Makefile

@@ -515,7 +515,8 @@ $(PKG): release-only
 		--release-urlbase=$(RELEASE_URLBASE) \
 		$(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)
 	$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)
-	SIGN="$(CODESIGN_CERT)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
+	SIGN="$(CODESIGN_CERT)" PKGDIR="$(PKGDIR)/usr/local" bash \
+		tools/osx-codesign.sh
 	cat tools/osx-pkg.pmdoc/index.xml.tmpl \
 		| sed -E "s/\\{nodeversion\\}/$(FULLVERSION)/g" \
 		| sed -E "s/\\{npmversion\\}/$(NPMVERSION)/g" \
@@ -568,9 +569,9 @@ ifeq ($(XZ), 0)
 endif
 
 doc-upload: doc
-	ssh $(STAGINGSERVER) "mkdir -p nodejs/$(DISTTYPEDIR)/$(FULLVERSION)"
+	ssh $(STAGINGSERVER) "mkdir -p nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/docs/"
 	chmod -R ug=rw-x+X,o=r+X out/doc/
-	scp -pr out/doc/ $(STAGINGSERVER):nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/docs/
+	scp -pr out/doc/* $(STAGINGSERVER):nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/docs/
 	ssh $(STAGINGSERVER) "touch nodejs/$(DISTTYPEDIR)/$(FULLVERSION)/docs.done"
 
 $(TARBALL)-headers: release-only
@@ -616,6 +617,9 @@ $(BINARYTAR): release-only
 	cp README.md $(BINARYNAME)
 	cp LICENSE $(BINARYNAME)
 	cp CHANGELOG.md $(BINARYNAME)
+ifeq ($(OSTYPE),darwin)
+	SIGN="$(CODESIGN_CERT)" PKGDIR="$(BINARYNAME)" bash tools/osx-codesign.sh
+endif
 	tar -cf $(BINARYNAME).tar $(BINARYNAME)
 	rm -rf $(BINARYNAME)
 	gzip -c -f -9 $(BINARYNAME).tar > $(BINARYNAME).tar.gz

deps/cares/src/ares_parse_naptr_reply.c

@@ -110,18 +110,19 @@ ares_parse_naptr_reply (const unsigned char *abuf, int alen,
           status = ARES_EBADRESP;
           break;
         }
-      /* RR must contain at least 7 bytes = 2 x int16 + 3 x name */
-      if (rr_len < 7)
-        {
-          status = ARES_EBADRESP;
-          break;
-        }
 
       /* Check if we are really looking at a NAPTR record */
       if (rr_class == C_IN && rr_type == T_NAPTR)
         {
           /* parse the NAPTR record itself */
 
+          /* RR must contain at least 7 bytes = 2 x int16 + 3 x name */
+          if (rr_len < 7)
+            {
+              status = ARES_EBADRESP;
+              break;
+            }
+
           /* Allocate storage for this NAPTR answer appending it to the list */
           naptr_curr = ares_malloc_data(ARES_DATATYPE_NAPTR_REPLY);
           if (!naptr_curr)

deps/openssl/asm/arm-void-gas/aes/bsaes-armv7.S

@@ -1298,7 +1298,7 @@ bsaes_cbc_encrypt:
 	vmov	q4,q15		@ just in case ensure that IV
 	vmov	q5,q0			@ and input are preserved
 	bl	AES_decrypt
-	vld1.8	{q0}, [r9,:64]		@ load result
+	vld1.8	{q0}, [r9]		@ load result
 	veor	q0, q0, q4	@ ^= IV
 	vmov	q15, q5		@ q5 holds input
 	vst1.8	{q0}, [r10]		@ write output

deps/openssl/asm/x64-elf-gas/aes/aesni-sha1-x86_64.s

@@ -2692,6 +2692,7 @@ aesni_cbc_sha1_enc_shaext:
 	movl	240(%rcx),%r11d
 	subq	%rdi,%rsi
 	movups	(%rcx),%xmm15
+	movups	(%r8),%xmm2
 	movups	16(%rcx),%xmm0
 	leaq	112(%rcx),%rcx
 

deps/openssl/asm/x64-elf-gas/aes/aesni-sha256-x86_64.s

@@ -4012,6 +4012,7 @@ aesni_cbc_sha256_enc_shaext:
 	movl	240(%rcx),%r11d
 	subq	%rdi,%rsi
 	movups	(%rcx),%xmm15
+	movups	(%r8),%xmm6
 	movups	16(%rcx),%xmm4
 	leaq	112(%rcx),%rcx
 

deps/openssl/asm/x64-elf-gas/x86_64cpuid.s

@@ -107,14 +107,6 @@ OPENSSL_ia32_cpuid:
 	shrl	$14,%r10d
 	andl	$0xfff,%r10d
 
-	cmpl	$7,%r11d
-	jb	.Lnocacheinfo
-
-	movl	$7,%eax
-	xorl	%ecx,%ecx
-	cpuid
-	movl	%ebx,8(%rdi)
-
 .Lnocacheinfo:
 	movl	$1,%eax
 	cpuid
@@ -144,6 +136,15 @@ OPENSSL_ia32_cpuid:
 	orl	%ecx,%r9d
 
 	movl	%edx,%r10d
+
+	cmpl	$7,%r11d
+	jb	.Lno_extended_info
+	movl	$7,%eax
+	xorl	%ecx,%ecx
+	cpuid
+	movl	%ebx,8(%rdi)
+.Lno_extended_info:
+
 	btl	$27,%r9d
 	jnc	.Lclear_avx
 	xorl	%ecx,%ecx

deps/openssl/asm/x64-macosx-gas/aes/aesni-sha1-x86_64.s

@@ -2692,6 +2692,7 @@ aesni_cbc_sha1_enc_shaext:
 	movl	240(%rcx),%r11d
 	subq	%rdi,%rsi
 	movups	(%rcx),%xmm15
+	movups	(%r8),%xmm2
 	movups	16(%rcx),%xmm0
 	leaq	112(%rcx),%rcx
 

deps/openssl/asm/x64-macosx-gas/aes/aesni-sha256-x86_64.s

@@ -4012,6 +4012,7 @@ aesni_cbc_sha256_enc_shaext:
 	movl	240(%rcx),%r11d
 	subq	%rdi,%rsi
 	movups	(%rcx),%xmm15
+	movups	(%r8),%xmm6
 	movups	16(%rcx),%xmm4
 	leaq	112(%rcx),%rcx
 

deps/openssl/asm/x64-macosx-gas/x86_64cpuid.s

@@ -108,14 +108,6 @@ L$intel:
 	shrl	$14,%r10d
 	andl	$0xfff,%r10d
 
-	cmpl	$7,%r11d
-	jb	L$nocacheinfo
-
-	movl	$7,%eax
-	xorl	%ecx,%ecx
-	cpuid
-	movl	%ebx,8(%rdi)
-
 L$nocacheinfo:
 	movl	$1,%eax
 	cpuid
@@ -145,6 +137,15 @@ L$generic:
 	orl	%ecx,%r9d
 
 	movl	%edx,%r10d
+
+	cmpl	$7,%r11d
+	jb	L$no_extended_info
+	movl	$7,%eax
+	xorl	%ecx,%ecx
+	cpuid
+	movl	%ebx,8(%rdi)
+L$no_extended_info:
+
 	btl	$27,%r9d
 	jnc	L$clear_avx
 	xorl	%ecx,%ecx

deps/openssl/asm/x64-win32-masm/aes/aesni-sha1-x86_64.asm

@@ -2793,6 +2793,7 @@ $L$prologue_shaext::
 	mov	r11d,DWORD PTR[240+rcx]
 	sub	rsi,rdi
 	movups	xmm15,XMMWORD PTR[rcx]
+	movups	xmm2,XMMWORD PTR[r8]
 	movups	xmm0,XMMWORD PTR[16+rcx]
 	lea	rcx,QWORD PTR[112+rcx]
 

deps/openssl/asm/x64-win32-masm/aes/aesni-sha256-x86_64.asm

@@ -4146,11 +4146,12 @@ $L$prologue_shaext::
 	mov	r11d,DWORD PTR[240+rcx]
 	sub	rsi,rdi
 	movups	xmm15,XMMWORD PTR[rcx]
+	movups	xmm6,XMMWORD PTR[r8]
 	movups	xmm4,XMMWORD PTR[16+rcx]
 	lea	rcx,QWORD PTR[112+rcx]
 
 	pshufd	xmm0,xmm1,01bh
-	pshufd	xmm1,xmm1,1h
+	pshufd	xmm1,xmm1,0b1h
 	pshufd	xmm2,xmm2,01bh
 	movdqa	xmm7,xmm3
 DB	102,15,58,15,202,8
@@ -4475,9 +4476,9 @@ $L$aesenclast4::
 	lea	rdi,QWORD PTR[64+rdi]
 	jnz	$L$oop_shaext
 
-	pshufd	xmm2,xmm2,1h
+	pshufd	xmm2,xmm2,0b1h
 	pshufd	xmm3,xmm1,01bh
-	pshufd	xmm1,xmm1,1h
+	pshufd	xmm1,xmm1,0b1h
 	punpckhqdq	xmm1,xmm2
 DB	102,15,58,15,211,8
 

deps/openssl/asm/x64-win32-masm/ec/ecp_nistz256-x86_64.asm

@@ -2051,7 +2051,7 @@ $L$SEH_begin_ecp_nistz256_point_add::
 	por	xmm5,xmm4
 
 	movdqu	xmm0,XMMWORD PTR[rsi]
-	pshufd	xmm3,xmm5,1h
+	pshufd	xmm3,xmm5,0b1h
 	movdqu	xmm1,XMMWORD PTR[16+rsi]
 	movdqu	xmm2,XMMWORD PTR[32+rsi]
 	por	xmm5,xmm3
@@ -2081,7 +2081,7 @@ DB	102,72,15,110,199
 	call	__ecp_nistz256_sqr_montq
 
 	pcmpeqd	xmm5,xmm4
-	pshufd	xmm4,xmm1,1h
+	pshufd	xmm4,xmm1,0b1h
 	por	xmm4,xmm1
 	pshufd	xmm5,xmm5,0
 	pshufd	xmm3,xmm4,01eh
@@ -2466,7 +2466,7 @@ $L$SEH_begin_ecp_nistz256_point_add_affine::
 	por	xmm5,xmm4
 
 	movdqu	xmm0,XMMWORD PTR[rbx]
-	pshufd	xmm3,xmm5,1h
+	pshufd	xmm3,xmm5,0b1h
 	movdqu	xmm1,XMMWORD PTR[16+rbx]
 	movdqu	xmm2,XMMWORD PTR[32+rbx]
 	por	xmm5,xmm3
@@ -2488,7 +2488,7 @@ DB	102,72,15,110,199
 	call	__ecp_nistz256_sqr_montq
 
 	pcmpeqd	xmm5,xmm4
-	pshufd	xmm4,xmm3,1h
+	pshufd	xmm4,xmm3,0b1h
 	mov	rax,QWORD PTR[rbx]
 
 	mov	r9,r12
@@ -3117,7 +3117,7 @@ $L$point_addx::
 	por	xmm5,xmm4
 
 	movdqu	xmm0,XMMWORD PTR[rsi]
-	pshufd	xmm3,xmm5,1h
+	pshufd	xmm3,xmm5,0b1h
 	movdqu	xmm1,XMMWORD PTR[16+rsi]
 	movdqu	xmm2,XMMWORD PTR[32+rsi]
 	por	xmm5,xmm3
@@ -3147,7 +3147,7 @@ DB	102,72,15,110,199
 	call	__ecp_nistz256_sqr_montx
 
 	pcmpeqd	xmm5,xmm4
-	pshufd	xmm4,xmm1,1h
+	pshufd	xmm4,xmm1,0b1h
 	por	xmm4,xmm1
 	pshufd	xmm5,xmm5,0
 	pshufd	xmm3,xmm4,01eh
@@ -3528,7 +3528,7 @@ $L$point_add_affinex::
 	por	xmm5,xmm4
 
 	movdqu	xmm0,XMMWORD PTR[rbx]
-	pshufd	xmm3,xmm5,1h
+	pshufd	xmm3,xmm5,0b1h
 	movdqu	xmm1,XMMWORD PTR[16+rbx]
 	movdqu	xmm2,XMMWORD PTR[32+rbx]
 	por	xmm5,xmm3
@@ -3550,7 +3550,7 @@ DB	102,72,15,110,199
 	call	__ecp_nistz256_sqr_montx
 
 	pcmpeqd	xmm5,xmm4
-	pshufd	xmm4,xmm3,1h
+	pshufd	xmm4,xmm3,0b1h
 	mov	rdx,QWORD PTR[rbx]
 
 	mov	r9,r12

deps/openssl/asm/x64-win32-masm/sha/sha256-x86_64.asm

@@ -1796,7 +1796,7 @@ $L$prologue_shaext::
 	movdqa	xmm7,XMMWORD PTR[((512-128))+rcx]
 
 	pshufd	xmm0,xmm1,01bh
-	pshufd	xmm1,xmm1,1h
+	pshufd	xmm1,xmm1,0b1h
 	pshufd	xmm2,xmm2,01bh
 	movdqa	xmm8,xmm7
 DB	102,15,58,15,202,8
@@ -1983,9 +1983,9 @@ DB	15,56,203,202
 	paddd	xmm1,xmm9
 	jnz	$L$oop_shaext
 
-	pshufd	xmm2,xmm2,1h
+	pshufd	xmm2,xmm2,0b1h
 	pshufd	xmm7,xmm1,01bh
-	pshufd	xmm1,xmm1,1h
+	pshufd	xmm1,xmm1,0b1h
 	punpckhqdq	xmm1,xmm2
 DB	102,15,58,15,215,8
 

deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm

@@ -118,14 +118,6 @@ $L$intel::
 	shr	r10d,14
 	and	r10d,0fffh
 
-	cmp	r11d,7
-	jb	$L$nocacheinfo
-
-	mov	eax,7
-	xor	ecx,ecx
-	cpuid
-	mov	DWORD PTR[8+rdi],ebx
-
 $L$nocacheinfo::
 	mov	eax,1
 	cpuid
@@ -155,6 +147,15 @@ $L$generic::
 	or	r9d,ecx
 
 	mov	r10d,edx
+
+	cmp	r11d,7
+	jb	$L$no_extended_info
+	mov	eax,7
+	xor	ecx,ecx
+	cpuid
+	mov	DWORD PTR[8+rdi],ebx
+$L$no_extended_info::
+
 	bt	r9d,27
 	jnc	$L$clear_avx
 	xor	ecx,ecx