summaryrefslogtreecommitdiff
path: root/deps/openssl/config/archs/aix64-gcc/no-asm
diff options
context:
space:
mode:
Diffstat (limited to 'deps/openssl/config/archs/aix64-gcc/no-asm')
-rw-r--r--deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm109
-rw-r--r--deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h2
-rw-r--r--deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h18
-rw-r--r--deps/openssl/config/archs/aix64-gcc/no-asm/openssl.gypi2
4 files changed, 122 insertions, 9 deletions
diff --git a/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm
index 5e25c7b88b..0b737280d0 100644
--- a/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm
@@ -56,8 +56,8 @@ our %config = (
shlib_version_number => "1.1",
sourcedir => ".",
target => "aix64-gcc",
- version => "1.1.0h",
- version_num => "0x1010008fL",
+ version => "1.1.0i",
+ version_num => "0x1010009fL",
);
our %target = (
@@ -1078,6 +1078,10 @@ our %unified_info = (
[
"libcrypto",
],
+ "test/errtest" =>
+ [
+ "libcrypto",
+ ],
"test/evp_extra_test" =>
[
"libcrypto",
@@ -1244,10 +1248,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",
@@ -3934,6 +3950,12 @@ our %unified_info = (
"crypto/include",
"include",
],
+ "crypto/conf/conf_ssl.o" =>
+ [
+ ".",
+ "crypto/include",
+ "include",
+ ],
"crypto/cpt_err.o" =>
[
".",
@@ -6212,6 +6234,12 @@ our %unified_info = (
"crypto/include",
"include",
],
+ "crypto/x509/x509_meth.o" =>
+ [
+ ".",
+ "crypto/include",
+ "include",
+ ],
"crypto/x509/x509_obj.o" =>
[
".",
@@ -7199,6 +7227,10 @@ our %unified_info = (
[
"include",
],
+ "test/errtest.o" =>
+ [
+ "include",
+ ],
"test/evp_extra_test.o" =>
[
"include",
@@ -7393,10 +7425,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",
@@ -7552,6 +7597,7 @@ our %unified_info = (
"test/ecdsatest",
"test/ectest",
"test/enginetest",
+ "test/errtest",
"test/evp_extra_test",
"test/evp_test",
"test/exdatatest",
@@ -7592,7 +7638,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" =>
@@ -7974,6 +8023,9 @@ our %unified_info = (
"test/enginetest" =>
[
],
+ "test/errtest" =>
+ [
+ ],
"test/evp_extra_test" =>
[
],
@@ -8094,9 +8146,18 @@ our %unified_info = (
"test/verify_extra_test" =>
[
],
+ "test/versions" =>
+ [
+ ],
"test/wp_test" =>
[
],
+ "test/x509_dup_cert_test" =>
+ [
+ ],
+ "test/x509_time_test" =>
+ [
+ ],
"test/x509aux" =>
[
],
@@ -9085,6 +9146,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/aix64-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h
index 88cd72b844..21038f0e38 100644
--- a/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h
@@ -20,4 +20,4 @@ static const char cflags[] = {
'n','g','i','n','e','s','-','1','.','1','\\','"','"',' ','\0'
};
#define PLATFORM "platform: aix64-gcc"
-#define DATE "built on: Tue Apr 3 00:38:11 2018"
+#define DATE "built on: Tue Aug 14 23:12:59 2018"
diff --git a/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h
index d2aa623535..123e7f66ed 100644
--- a/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/aix64-gcc/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/aix64-gcc/no-asm/openssl.gypi b/deps/openssl/config/archs/aix64-gcc/no-asm/openssl.gypi
index 25974f0d08..4556667305 100644
--- a/deps/openssl/config/archs/aix64-gcc/no-asm/openssl.gypi
+++ b/deps/openssl/config/archs/aix64-gcc/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',