summaryrefslogtreecommitdiff
path: root/deps/openssl/config/archs/VC-WIN64A/no-asm
diff options
context:
space:
mode:
authorShigeki Ohtsu <ohtsu@ohtsu.org>2018-08-14 23:14:19 +0900
committerRod Vagg <rod@vagg.org>2018-08-16 11:52:38 +1000
commiteaa0ad97872ac1becf437c14909afe7a01b77364 (patch)
tree00403152ff5b9186061f99e0e4635706a2ce1dcf /deps/openssl/config/archs/VC-WIN64A/no-asm
parent45b9f5df6ff1548f01ed646ebee75e3f0873cefd (diff)
downloadandroid-node-v8-eaa0ad97872ac1becf437c14909afe7a01b77364.tar.gz
android-node-v8-eaa0ad97872ac1becf437c14909afe7a01b77364.tar.bz2
android-node-v8-eaa0ad97872ac1becf437c14909afe7a01b77364.zip
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>
Diffstat (limited to 'deps/openssl/config/archs/VC-WIN64A/no-asm')
-rw-r--r--deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm111
-rw-r--r--deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h2
-rw-r--r--deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h18
-rw-r--r--deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi2
4 files changed, 123 insertions, 10 deletions
diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm
index b7918f728d..909baa1016 100644
--- a/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm
@@ -56,8 +56,8 @@ our %config = (
shlib_version_number => "1.1",
sourcedir => ".",
target => "VC-WIN64A",
- version => "1.1.0h",
- version_num => "0x1010008fL",
+ version => "1.1.0i",
+ version_num => "0x1010009fL",
);
our %target = (
@@ -1100,6 +1100,10 @@ our %unified_info = (
[
"libcrypto",
],
+ "test/errtest" =>
+ [
+ "libcrypto",
+ ],
"test/evp_extra_test" =>
[
"libcrypto",
@@ -1266,10 +1270,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",
@@ -3962,6 +3978,12 @@ our %unified_info = (
"crypto/include",
"include",
],
+ "crypto/conf/conf_ssl.o" =>
+ [
+ ".",
+ "crypto/include",
+ "include",
+ ],
"crypto/cpt_err.o" =>
[
".",
@@ -6246,6 +6268,12 @@ our %unified_info = (
"crypto/include",
"include",
],
+ "crypto/x509/x509_meth.o" =>
+ [
+ ".",
+ "crypto/include",
+ "include",
+ ],
"crypto/x509/x509_obj.o" =>
[
".",
@@ -7233,6 +7261,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",
"include",
+ "test",
".",
],
"test/threadstest.o" =>
@@ -7427,10 +7459,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",
@@ -7586,6 +7631,7 @@ our %unified_info = (
"test/ecdsatest",
"test/ectest",
"test/enginetest",
+ "test/errtest",
"test/evp_extra_test",
"test/evp_test",
"test/exdatatest",
@@ -7626,7 +7672,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" =>
@@ -7965,6 +8014,9 @@ our %unified_info = (
"test/enginetest" =>
[
],
+ "test/errtest" =>
+ [
+ ],
"test/evp_extra_test" =>
[
],
@@ -8085,9 +8137,18 @@ our %unified_info = (
"test/verify_extra_test" =>
[
],
+ "test/versions" =>
+ [
+ ],
"test/wp_test" =>
[
],
+ "test/x509_dup_cert_test" =>
+ [
+ ],
+ "test/x509_time_test" =>
+ [
+ ],
"test/x509aux" =>
[
],
@@ -9081,6 +9142,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",
@@ -10525,6 +10590,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",
@@ -11044,6 +11113,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",
@@ -11404,6 +11474,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",
@@ -12407,6 +12478,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",
@@ -12756,6 +12836,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",
@@ -12764,6 +12852,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/VC-WIN64A/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h
index 12173ecb40..c255115fe5 100644
--- a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h
@@ -9,4 +9,4 @@ static const char cflags[] = {
'c','o','m','p','i','l','e','r',':',' ','c','c','\0'
};
#define PLATFORM "platform: "
-#define DATE "built on: Tue Apr 3 00:38:58 2018"
+#define DATE "built on: Tue Aug 14 23:13:46 2018"
diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h
index dfe71f8c60..097c8ae7bf 100644
--- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h
@@ -108,12 +108,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/VC-WIN64A/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi
index 54cef95adb..d9f65b4a87 100644
--- a/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi
+++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/openssl.gypi
@@ -219,6 +219,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',
@@ -579,6 +580,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',
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-12 10:02:02 +0000