From ca3f2cf3b772f8e187e980acc0652c81bc922d87 Mon Sep 17 00:00:00 2001 From: Jon Kunkee Date: Thu, 2 May 2019 13:26:02 -0700 Subject: deps: regenerate OpenSSL configs with fixed tooling This change contains the results of running `make` in `deps/openssl/config` (based on information in deps/openssl/config/README.md) then reverting changes not in the VC-WIN64-ARM directory. This leverages a preceding change that fixes a cross-configuration file reuse bug that only impacts VC-WIN64-ARM. PR-URL: https://github.com/nodejs/node/pull/27544 Reviewed-By: Shigeki Ohtsu Reviewed-By: Sam Roberts Reviewed-By: James M Snell Reviewed-By: Rich Trott --- deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm | 4 ++-- .../config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h | 2 +- .../archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h | 11 ++++------- 3 files changed, 7 insertions(+), 10 deletions(-) (limited to 'deps/openssl') diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm index 28fe829fa6..4e9b505384 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm @@ -63,7 +63,7 @@ our %config = ( options => "enable-ssl-trace no-afalgeng no-asan no-asm no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic", perl_archname => "x86_64-linux-gnu-thread-multi", perl_cmd => "/usr/bin/perl", - perl_version => "5.26.2", + perl_version => "5.26.1", perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "no-asm", "VC-WIN64-ARM" ], perlenv => { "AR" => undef, @@ -127,7 +127,7 @@ our %target = ( LDFLAGS => "/nologo /debug", MT => "mt", MTFLAGS => "-nologo", - RANLIB => "CODE(0x56068388a9e8)", + RANLIB => "CODE(0x5621ab3dd518)", RC => "rc", _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/50-win-onecore.conf", "Configurations/shared-info.pl" ], aes_asm_src => "aes_core.c aes_cbc.c", diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h index 6d2f6f74e2..33dafba74b 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: VC-WIN64-ARM" -#define DATE "built on: Thu Apr 25 23:07:51 2019 UTC" +#define DATE "built on: Thu May 2 20:21:20 2019 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h index 48cd14288a..8e89c3c501 100644 --- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h +++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h @@ -24,9 +24,6 @@ extern "C" { * OpenSSL was configured with the following options: */ -#ifndef OPENSSL_SYS_WIN32 -# define OPENSSL_SYS_WIN32 1 -#endif #ifndef OPENSSL_NO_COMP # define OPENSSL_NO_COMP #endif @@ -190,14 +187,14 @@ extern "C" { * The following are cipher-specific, but are part of the public API. */ #if !defined(OPENSSL_SYS_UEFI) -# define BN_LLONG +# undef BN_LLONG /* Only one for the following should be defined */ # undef SIXTY_FOUR_BIT_LONG -# undef SIXTY_FOUR_BIT -# define THIRTY_TWO_BIT +# define SIXTY_FOUR_BIT +# undef THIRTY_TWO_BIT #endif -#define RC4_INT unsigned int +#define RC4_INT unsigned char #ifdef __cplusplus } -- cgit v1.2.3