Skip to content

Commit 314fdda

Browse files
jkunkeetargos
authored andcommitted
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: #27544 Reviewed-By: Shigeki Ohtsu <[email protected]> Reviewed-By: Sam Roberts <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Rich Trott <[email protected]>
1 parent 1757250 commit 314fdda

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ our %config = (
6363
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",
6464
perl_archname => "x86_64-linux-gnu-thread-multi",
6565
perl_cmd => "/usr/bin/perl",
66-
perl_version => "5.26.2",
66+
perl_version => "5.26.1",
6767
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "no-asm", "VC-WIN64-ARM" ],
6868
perlenv => {
6969
"AR" => undef,
@@ -127,7 +127,7 @@ our %target = (
127127
LDFLAGS => "/nologo /debug",
128128
MT => "mt",
129129
MTFLAGS => "-nologo",
130-
RANLIB => "CODE(0x56068388a9e8)",
130+
RANLIB => "CODE(0x5621ab3dd518)",
131131
RC => "rc",
132132
_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" ],
133133
aes_asm_src => "aes_core.c aes_cbc.c",

deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: VC-WIN64-ARM"
14-
#define DATE "built on: Thu Apr 25 23:07:51 2019 UTC"
14+
#define DATE "built on: Thu May 2 20:21:20 2019 UTC"
1515

1616
/*
1717
* Generate compiler_flags as an array of individual characters. This is a

deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ extern "C" {
2424
* OpenSSL was configured with the following options:
2525
*/
2626

27-
#ifndef OPENSSL_SYS_WIN32
28-
# define OPENSSL_SYS_WIN32 1
29-
#endif
3027
#ifndef OPENSSL_NO_COMP
3128
# define OPENSSL_NO_COMP
3229
#endif
@@ -190,14 +187,14 @@ extern "C" {
190187
* The following are cipher-specific, but are part of the public API.
191188
*/
192189
#if !defined(OPENSSL_SYS_UEFI)
193-
# define BN_LLONG
190+
# undef BN_LLONG
194191
/* Only one for the following should be defined */
195192
# undef SIXTY_FOUR_BIT_LONG
196-
# undef SIXTY_FOUR_BIT
197-
# define THIRTY_TWO_BIT
193+
# define SIXTY_FOUR_BIT
194+
# undef THIRTY_TWO_BIT
198195
#endif
199196

200-
#define RC4_INT unsigned int
197+
#define RC4_INT unsigned char
201198

202199
#ifdef __cplusplus
203200
}

0 commit comments

Comments
 (0)