deps: update archs files for OpenSSL-1.1.0i

`cd deps/openssl/config; make` updates all archs dependant files.

PR-URL: https://github.com/nodejs/node/pull/22318
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>

12 files changed, 149 insertions, 35 deletions

diff --git a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm
index cb318fa4a5..1b3e80fa90 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm
@@ -56,8 +56,8 @@ our %config = (
   shlib_version_number => "1.1",
   sourcedir => ".",
   target => "linux-armv4",
-  version => "1.1.0h",
-  version_num => "0x1010008fL",
+  version => "1.1.0i",
+  version_num => "0x1010009fL",
 );
 
 our %target = (
@@ -1077,6 +1077,10 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "test/errtest" =>
+                [
+                    "libcrypto",
+                ],
             "test/evp_extra_test" =>
                 [
                     "libcrypto",
@@ -1243,10 +1247,22 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "test/versions" =>
+                [
+                    "libcrypto",
+                ],
             "test/wp_test" =>
                 [
                     "libcrypto",
                 ],
+            "test/x509_dup_cert_test" =>
+                [
+                    "libcrypto",
+                ],
+            "test/x509_time_test" =>
+                [
+                    "libcrypto",
+                ],
             "test/x509aux" =>
                 [
                     "libcrypto",
@@ -3948,6 +3964,12 @@ our %unified_info = (
                     "crypto/include",
                     "include",
                 ],
+            "crypto/conf/conf_ssl.o" =>
+                [
+                    ".",
+                    "crypto/include",
+                    "include",
+                ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
@@ -6247,6 +6269,12 @@ our %unified_info = (
                     "crypto/include",
                     "include",
                 ],
+            "crypto/x509/x509_meth.o" =>
+                [
+                    ".",
+                    "crypto/include",
+                    "include",
+                ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
@@ -7234,6 +7262,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/errtest.o" =>
+                [
+                    "include",
+                ],
             "test/evp_extra_test.o" =>
                 [
                     "include",
@@ -7406,8 +7438,8 @@ our %unified_info = (
                 ],
             "test/testutil.o" =>
                 [
-                    "crypto/include",
                     "test",
+                    "crypto/include",
                     "include",
                     ".",
                 ],
@@ -7428,10 +7460,23 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/versions.o" =>
+                [
+                    "include",
+                ],
             "test/wp_test.o" =>
                 [
                     "include",
                 ],
+            "test/x509_dup_cert_test.o" =>
+                [
+                    "include",
+                ],
+            "test/x509_time_test.o" =>
+                [
+                    ".",
+                    "include",
+                ],
             "test/x509aux.o" =>
                 [
                     "include",
@@ -7587,6 +7632,7 @@ our %unified_info = (
             "test/ecdsatest",
             "test/ectest",
             "test/enginetest",
+            "test/errtest",
             "test/evp_extra_test",
             "test/evp_test",
             "test/exdatatest",
@@ -7627,7 +7673,10 @@ our %unified_info = (
             "test/v3ext",
             "test/v3nametest",
             "test/verify_extra_test",
+            "test/versions",
             "test/wp_test",
+            "test/x509_dup_cert_test",
+            "test/x509_time_test",
             "test/x509aux",
         ],
     "rawlines" =>
@@ -8009,6 +8058,9 @@ our %unified_info = (
             "test/enginetest" =>
                 [
                 ],
+            "test/errtest" =>
+                [
+                ],
             "test/evp_extra_test" =>
                 [
                 ],
@@ -8129,9 +8181,18 @@ our %unified_info = (
             "test/verify_extra_test" =>
                 [
                 ],
+            "test/versions" =>
+                [
+                ],
             "test/wp_test" =>
                 [
                 ],
+            "test/x509_dup_cert_test" =>
+                [
+                ],
+            "test/x509_time_test" =>
+                [
+                ],
             "test/x509aux" =>
                 [
                 ],
@@ -9144,6 +9205,10 @@ our %unified_info = (
                 [
                     "crypto/conf/conf_sap.c",
                 ],
+            "crypto/conf/conf_ssl.o" =>
+                [
+                    "crypto/conf/conf_ssl.c",
+                ],
             "crypto/cpt_err.o" =>
                 [
                     "crypto/cpt_err.c",
@@ -10612,6 +10677,10 @@ our %unified_info = (
                 [
                     "crypto/x509/x509_lu.c",
                 ],
+            "crypto/x509/x509_meth.o" =>
+                [
+                    "crypto/x509/x509_meth.c",
+                ],
             "crypto/x509/x509_obj.o" =>
                 [
                     "crypto/x509/x509_obj.c",
@@ -11137,6 +11206,7 @@ our %unified_info = (
                     "crypto/conf/conf_mall.o",
                     "crypto/conf/conf_mod.o",
                     "crypto/conf/conf_sap.o",
+                    "crypto/conf/conf_ssl.o",
                     "crypto/cpt_err.o",
                     "crypto/cryptlib.o",
                     "crypto/ct/ct_b64.o",
@@ -11504,6 +11574,7 @@ our %unified_info = (
                     "crypto/x509/x509_err.o",
                     "crypto/x509/x509_ext.o",
                     "crypto/x509/x509_lu.o",
+                    "crypto/x509/x509_meth.o",
                     "crypto/x509/x509_obj.o",
                     "crypto/x509/x509_r2x.o",
                     "crypto/x509/x509_req.o",
@@ -12507,6 +12578,15 @@ our %unified_info = (
                 [
                     "test/enginetest.c",
                 ],
+            "test/errtest" =>
+                [
+                    "test/errtest.o",
+                    "test/testutil.o",
+                ],
+            "test/errtest.o" =>
+                [
+                    "test/errtest.c",
+                ],
             "test/evp_extra_test" =>
                 [
                     "test/evp_extra_test.o",
@@ -12856,6 +12936,14 @@ our %unified_info = (
                 [
                     "test/verify_extra_test.c",
                 ],
+            "test/versions" =>
+                [
+                    "test/versions.o",
+                ],
+            "test/versions.o" =>
+                [
+                    "test/versions.c",
+                ],
             "test/wp_test" =>
                 [
                     "test/wp_test.o",
@@ -12864,6 +12952,23 @@ our %unified_info = (
                 [
                     "test/wp_test.c",
                 ],
+            "test/x509_dup_cert_test" =>
+                [
+                    "test/x509_dup_cert_test.o",
+                ],
+            "test/x509_dup_cert_test.o" =>
+                [
+                    "test/x509_dup_cert_test.c",
+                ],
+            "test/x509_time_test" =>
+                [
+                    "test/testutil.o",
+                    "test/x509_time_test.o",
+                ],
+            "test/x509_time_test.o" =>
+                [
+                    "test/x509_time_test.c",
+                ],
             "test/x509aux" =>
                 [
                     "test/x509aux.o",
diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/armv4cpuid.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/armv4cpuid.S
index deb6016737..eae2d6ad25 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/crypto/armv4cpuid.S
+++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/armv4cpuid.S
@@ -104,7 +104,7 @@ CRYPTO_memcmp:
 
 	ldmia	sp!,{r4,r5}
 .Lno_data:
-	neg	r0,ip
+	rsb	r0,ip,#0
 	mov	r0,r0,lsr#31
 #if __ARM_ARCH__>=5
 	bx	lr
diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/bn/armv4-mont.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/bn/armv4-mont.S
index bd5efa8156..9f6e7e0c79 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/crypto/bn/armv4-mont.S
+++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/bn/armv4-mont.S
@@ -165,14 +165,15 @@ bn_mul_mont:
 	mov	r4,sp			@ "rewind" r4
 	sub	r2,r2,r5		@ "rewind" r2
 
-	and	r1,r4,r14
-	bic	r3,r2,r14
-	orr	r1,r1,r3		@ ap=borrow?tp:rp
-
-.Lcopy:	ldr	r7,[r1],#4		@ copy or in-place refresh
+.Lcopy:	ldr	r7,[r4]		@ conditional copy
+	ldr	r5,[r2]
 	str	sp,[r4],#4		@ zap tp
-	str	r7,[r2],#4
-	cmp	r4,r0
+#ifdef	__thumb2__
+	it	cc
+#endif
+	movcc	r5,r7
+	str	r5,[r2],#4
+	teq	r4,r0		@ preserve carry
 	bne	.Lcopy
 
 	mov	sp,r0
diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h
index 6a7c2e2220..d930fb3ea6 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h
@@ -30,4 +30,4 @@ static const char cflags[] = {
     '"','"',' ','\0'
 };
 #define PLATFORM "platform: linux-armv4"
-#define DATE "built on: Tue Apr  3 00:38:25 2018"
+#define DATE "built on: Tue Aug 14 23:13:13 2018"
diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S
index 625e9506de..ee64a0b30b 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S
+++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S
@@ -3432,13 +3432,13 @@ ecp_nistz256_scatter_w7:
 .Loop_scatter_w7:
 	ldr	r3,[r1],#4
 	subs	r2,r2,#1
-	strb	r3,[r0,#64*0-1]
+	strb	r3,[r0,#64*0]
 	mov	r3,r3,lsr#8
-	strb	r3,[r0,#64*1-1]
+	strb	r3,[r0,#64*1]
 	mov	r3,r3,lsr#8
-	strb	r3,[r0,#64*2-1]
+	strb	r3,[r0,#64*2]
 	mov	r3,r3,lsr#8
-	strb	r3,[r0,#64*3-1]
+	strb	r3,[r0,#64*3]
 	add	r0,r0,#64*4
 	bne	.Loop_scatter_w7
 
@@ -4114,7 +4114,7 @@ ecp_nistz256_point_add:
 	stmia	r0!,{r4,r5}
 .Ladd_done:
 	add	sp,sp,#32*18+16+16	@ +16 means "skip even over saved r0-r3"
-#if __ARM_ARCH__>=5 || defined(__thumb__)
+#if __ARM_ARCH__>=5 || !defined(__thumb__)
 	ldmia	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,pc}
 #else
 	ldmia	sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghash-armv4.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghash-armv4.S
index 2134f9b647..e654d9480f 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghash-armv4.S
+++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghash-armv4.S
@@ -3,6 +3,8 @@
 .text
 #if defined(__thumb2__) || defined(__clang__)
 .syntax	unified
+#define ldrplb  ldrbpl
+#define ldrneb  ldrbne
 #endif
 #if defined(__thumb2__)
 .thumb
@@ -10,11 +12,6 @@
 .code	32
 #endif
 
-#ifdef  __clang__
-#define ldrplb  ldrbpl
-#define ldrneb  ldrbne
-#endif
-
 .type	rem_4bit,%object
 .align	5
 rem_4bit:
diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghashv8-armx.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghashv8-armx.S
index f6fb3f1f73..ceceb743ec 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghashv8-armx.S
+++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/modes/ghashv8-armx.S
@@ -1,5 +1,6 @@
 #include "arm_arch.h"
 
+#if __ARM_MAX_ARCH__>=7
 .text
 .fpu	neon
 .code	32
@@ -230,3 +231,4 @@ gcm_ghash_v8:
 .byte	71,72,65,83,72,32,102,111,114,32,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
 .align	2
 .align	2
+#endif
diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/poly1305/poly1305-armv4.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/poly1305/poly1305-armv4.S
index 7484c33b84..16b0eb0e9f 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/crypto/poly1305/poly1305-armv4.S
+++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/poly1305/poly1305-armv4.S
@@ -132,6 +132,7 @@ poly1305_init:
 .type	poly1305_blocks,%function
 .align	5
 poly1305_blocks:
+.Lpoly1305_blocks:
 	stmdb	sp!,{r3,r4,r5,r6,r7,r8,r9,r10,r11,lr}
 
 	ands	r2,r2,#-16
@@ -606,7 +607,7 @@ poly1305_blocks_neon:
 	cmp	r2,#64
 	bhs	.Lenter_neon
 	tst	ip,ip			@ is_base2_26?
-	beq	poly1305_blocks
+	beq	.Lpoly1305_blocks
 
 .Lenter_neon:
 	stmdb	sp!,{r4,r5,r6,r7}
diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S
index 239e7504f1..3efcde6b6e 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S
+++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S
@@ -1,4 +1,4 @@
-@ Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved.
+@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved.
 @
 @ Licensed under the OpenSSL license (the "License").  You may not use
 @ this file except in compliance with the License.  You can obtain a copy
@@ -1831,7 +1831,7 @@ sha256_block_data_order:
 	eor	r12,r12,r6			@ Maj(a,b,c)
 	add	r4,r4,r0,ror#2	@ h+=Sigma0(a)
 	@ add	r4,r4,r12			@ h+=Maj(a,b,c)
-#if __ARM_ARCH__>=7
+#ifdef	__thumb2__
 	ite	eq			@ Thumb2 thing, sanity check in ARM
 #endif
 	ldreq	r3,[sp,#16*4]		@ pull ctx
diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S
index 14eb87e0ce..1e2fbf6350 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S
+++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S
@@ -1,4 +1,4 @@
-@ Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved.
+@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved.
 @
 @ Licensed under the OpenSSL license (the "License").  You may not use
 @ this file except in compliance with the License.  You can obtain a copy
@@ -265,7 +265,7 @@ sha512_block_data_order:
 	teq	r9,#148
 
 	ldr	r12,[sp,#16+0]	@ c.lo
-#if __ARM_ARCH__>=7
+#ifdef	__thumb2__
 	it	eq			@ Thumb2 thing, sanity check in ARM
 #endif
 	orreq	r14,r14,#1
@@ -405,7 +405,7 @@ sha512_block_data_order:
 	teq	r9,#23
 
 	ldr	r12,[sp,#16+0]	@ c.lo
-#if __ARM_ARCH__>=7
+#ifdef	__thumb2__
 	it	eq			@ Thumb2 thing, sanity check in ARM
 #endif
 	orreq	r14,r14,#1
@@ -442,7 +442,7 @@ sha512_block_data_order:
 	adc	r6,r6,r4		@ h += T
 	tst	r14,#1
 	add	r14,r14,#8
-#if __ARM_ARCH__>=7
+#ifdef	__thumb2__
 	ittt	eq			@ Thumb2 thing, sanity check in ARM
 #endif
 	ldreq	r9,[sp,#184+0]
diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h
index 2f9817e43b..21dd8cc643 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h
@@ -102,12 +102,18 @@ extern "C" {
  * still won't see them if the library has been built to disable deprecated
  * functions.
  */
-#if defined(OPENSSL_NO_DEPRECATED)
-# define DECLARE_DEPRECATED(f)
-#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
-# define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
-#else
-# define DECLARE_DEPRECATED(f)   f;
+#ifndef DECLARE_DEPRECATED
+# if defined(OPENSSL_NO_DEPRECATED)
+#  define DECLARE_DEPRECATED(f)
+# else
+#  define DECLARE_DEPRECATED(f)   f;
+#  ifdef __GNUC__
+#   if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
+#    undef DECLARE_DEPRECATED
+#    define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
+#   endif
+#  endif
+# endif
 #endif
 
 #ifndef OPENSSL_FILE
diff --git a/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi b/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi
index fcb4548956..7344b58fb9 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi
+++ b/deps/openssl/config/archs/linux-armv4/asm/openssl.gypi
@@ -218,6 +218,7 @@
       'openssl/crypto/conf/conf_mall.c',
       'openssl/crypto/conf/conf_mod.c',
       'openssl/crypto/conf/conf_sap.c',
+      'openssl/crypto/conf/conf_ssl.c',
       'openssl/crypto/cpt_err.c',
       'openssl/crypto/cryptlib.c',
       'openssl/crypto/ct/ct_b64.c',
@@ -578,6 +579,7 @@
       'openssl/crypto/x509/x509_err.c',
       'openssl/crypto/x509/x509_ext.c',
       'openssl/crypto/x509/x509_lu.c',
+      'openssl/crypto/x509/x509_meth.c',
       'openssl/crypto/x509/x509_obj.c',
       'openssl/crypto/x509/x509_r2x.c',
       'openssl/crypto/x509/x509_req.c',