Skip to content

Commit

Permalink
deps: update archs files for OpenSSL-1.1.1s
Browse files Browse the repository at this point in the history
After an OpenSSL source update, all the config files need to be
regenerated and committed by:
   $ make -C deps/openssl/config
   $ git add deps/openssl/config/archs
   $ git add deps/openssl/openssl/include/crypto/bn_conf.h
   $ git add deps/openssl/openssl/include/crypto/dso_conf.h
   $ git add deps/openssl/openssl/include/openssl/opensslconf.h
   $ git commit
  • Loading branch information
RafaelGSS committed Nov 1, 2022
1 parent c915fcf commit 179a289
Show file tree
Hide file tree
Showing 141 changed files with 409 additions and 406 deletions.
4 changes: 2 additions & 2 deletions deps/openssl/config/archs/BSD-x86/asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1q",
version_num => "0x1010111fL",
version => "1.1.1s",
version_num => "0x1010113fL",
);

our %target = (
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Tue Jul 5 12:23:50 2022 UTC"
#define DATE "built on: Tue Nov 1 20:54:06 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
4 changes: 2 additions & 2 deletions deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1q",
version_num => "0x1010111fL",
version => "1.1.1s",
version_num => "0x1010113fL",
);

our %target = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Tue Jul 5 12:23:52 2022 UTC"
#define DATE "built on: Tue Nov 1 20:54:08 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
10 changes: 5 additions & 5 deletions deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ our @EXPORT = qw(%config %target %disabled %withargs %unified_info @disablables)
our %config = (
AR => "ar",
ARFLAGS => [ "r" ],
CC => "cc",
CC => "gcc",
CFLAGS => [ "-Wall -O3 -fomit-frame-pointer" ],
CPPDEFINES => [ ],
CPPFLAGS => [ ],
Expand Down Expand Up @@ -50,7 +50,7 @@ our %config = (
lib_defines => [ "OPENSSL_PIC" ],
libdir => "",
major => "1",
makedepprog => "\$(CROSS_COMPILE)cc",
makedepprog => "\$(CROSS_COMPILE)gcc",
minor => "1.1",
openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
openssl_api_defines => [ ],
Expand All @@ -69,7 +69,7 @@ our %config = (
"AS" => undef,
"ASFLAGS" => undef,
"BUILDFILE" => undef,
"CC" => undef,
"CC" => "gcc",
"CFLAGS" => undef,
"CPP" => undef,
"CPPDEFINES" => undef,
Expand Down Expand Up @@ -110,8 +110,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1q",
version_num => "0x1010111fL",
version => "1.1.1s",
version_num => "0x1010113fL",
);

our %target = (
Expand Down
18 changes: 9 additions & 9 deletions deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Tue Jul 5 12:23:54 2022 UTC"
#define DATE "built on: Tue Nov 1 20:54:10 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
* workaround for the situation where CFLAGS gets too long for a C90 string
* literal
*/
static const char compiler_flags[] = {
'c','o','m','p','i','l','e','r',':',' ','c','c',' ','-','f','P',
'I','C',' ','-','p','t','h','r','e','a','d',' ','-','W','a','l',
'l',' ','-','O','3',' ','-','f','o','m','i','t','-','f','r','a',
'm','e','-','p','o','i','n','t','e','r',' ','-','D','L','_','E',
'N','D','I','A','N',' ','-','D','O','P','E','N','S','S','L','_',
'P','I','C',' ','-','D','_','T','H','R','E','A','D','_','S','A',
'F','E',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ',
'-','D','N','D','E','B','U','G','\0'
'c','o','m','p','i','l','e','r',':',' ','g','c','c',' ','-','f',
'P','I','C',' ','-','p','t','h','r','e','a','d',' ','-','W','a',
'l','l',' ','-','O','3',' ','-','f','o','m','i','t','-','f','r',
'a','m','e','-','p','o','i','n','t','e','r',' ','-','D','L','_',
'E','N','D','I','A','N',' ','-','D','O','P','E','N','S','S','L',
'_','P','I','C',' ','-','D','_','T','H','R','E','A','D','_','S',
'A','F','E',' ','-','D','_','R','E','E','N','T','R','A','N','T',
' ','-','D','N','D','E','B','U','G','\0'
};
4 changes: 2 additions & 2 deletions deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1q",
version_num => "0x1010111fL",
version => "1.1.1s",
version_num => "0x1010113fL",
);

our %target = (
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Tue Jul 5 12:23:56 2022 UTC"
#define DATE "built on: Tue Nov 1 20:54:11 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
4 changes: 2 additions & 2 deletions deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1q",
version_num => "0x1010111fL",
version => "1.1.1s",
version_num => "0x1010113fL",
);

our %target = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Tue Jul 5 12:24:00 2022 UTC"
#define DATE "built on: Tue Nov 1 20:54:15 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
10 changes: 5 additions & 5 deletions deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ our @EXPORT = qw(%config %target %disabled %withargs %unified_info @disablables)
our %config = (
AR => "ar",
ARFLAGS => [ "r" ],
CC => "cc",
CC => "gcc",
CFLAGS => [ "-Wall -O3" ],
CPPDEFINES => [ ],
CPPFLAGS => [ ],
Expand Down Expand Up @@ -50,7 +50,7 @@ our %config = (
lib_defines => [ "OPENSSL_PIC" ],
libdir => "",
major => "1",
makedepprog => "\$(CROSS_COMPILE)cc",
makedepprog => "\$(CROSS_COMPILE)gcc",
minor => "1.1",
openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
openssl_api_defines => [ ],
Expand All @@ -69,7 +69,7 @@ our %config = (
"AS" => undef,
"ASFLAGS" => undef,
"BUILDFILE" => undef,
"CC" => undef,
"CC" => "gcc",
"CFLAGS" => undef,
"CPP" => undef,
"CPPDEFINES" => undef,
Expand Down Expand Up @@ -110,8 +110,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1q",
version_num => "0x1010111fL",
version => "1.1.1s",
version_num => "0x1010113fL",
);

our %target = (
Expand Down
16 changes: 8 additions & 8 deletions deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Tue Jul 5 12:24:04 2022 UTC"
#define DATE "built on: Tue Nov 1 20:54:19 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
* workaround for the situation where CFLAGS gets too long for a C90 string
* literal
*/
static const char compiler_flags[] = {
'c','o','m','p','i','l','e','r',':',' ','c','c',' ','-','f','P',
'I','C',' ','-','p','t','h','r','e','a','d',' ','-','W','a','l',
'l',' ','-','O','3',' ','-','D','L','_','E','N','D','I','A','N',
' ','-','D','O','P','E','N','S','S','L','_','P','I','C',' ','-',
'D','_','T','H','R','E','A','D','_','S','A','F','E',' ','-','D',
'_','R','E','E','N','T','R','A','N','T',' ','-','D','N','D','E',
'B','U','G','\0'
'c','o','m','p','i','l','e','r',':',' ','g','c','c',' ','-','f',
'P','I','C',' ','-','p','t','h','r','e','a','d',' ','-','W','a',
'l','l',' ','-','O','3',' ','-','D','L','_','E','N','D','I','A',
'N',' ','-','D','O','P','E','N','S','S','L','_','P','I','C',' ',
'-','D','_','T','H','R','E','A','D','_','S','A','F','E',' ','-',
'D','_','R','E','E','N','T','R','A','N','T',' ','-','D','N','D',
'E','B','U','G','\0'
};
6 changes: 3 additions & 3 deletions deps/openssl/config/archs/VC-WIN32/asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN32",
tdirs => [ "ossl_shim" ],
version => "1.1.1q",
version_num => "0x1010111fL",
version => "1.1.1s",
version_num => "0x1010113fL",
);

our %target = (
Expand All @@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55acb1e571e0)",
RANLIB => "CODE(0x56195c50e670)",
RC => "rc",
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",
Expand Down
48 changes: 24 additions & 24 deletions deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,35 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Tue Jul 5 12:25:50 2022 UTC"
#define DATE "built on: Tue Nov 1 20:55:56 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
* workaround for the situation where CFLAGS gets too long for a C90 string
* literal
*/
static const char compiler_flags[] = {
'c','o','m','p','i','l','e','r',':',' ','c','c',' ','/','Z','i',
' ','/','F','d','o','s','s','l','_','s','t','a','t','i','c','.',
'p','d','b',' ',' ','-','D','O','P','E','N','S','S','L','_','I',
'A','3','2','_','S','S','E','2',' ','-','D','L','_','E','N','D',
'I','A','N',' ','-','D','O','P','E','N','S','S','L','_','P','I',
'C',' ','-','D','O','P','E','N','S','S','L','_','C','P','U','I',
'D','_','O','B','J',' ','-','D','O','P','E','N','S','S','L','_',
'B','N','_','A','S','M','_','P','A','R','T','_','W','O','R','D',
'S',' ','-','D','O','P','E','N','S','S','L','_','I','A','3','2',
'_','S','S','E','2',' ','-','D','O','P','E','N','S','S','L','_',
'B','N','_','A','S','M','_','M','O','N','T',' ','-','D','O','P',
'E','N','S','S','L','_','B','N','_','A','S','M','_','G','F','2',
'm',' ','-','D','S','H','A','1','_','A','S','M',' ','-','D','S',
'H','A','2','5','6','_','A','S','M',' ','-','D','S','H','A','5',
'1','2','_','A','S','M',' ','-','D','R','C','4','_','A','S','M',
' ','-','D','M','D','5','_','A','S','M',' ','-','D','R','M','D',
'1','6','0','_','A','S','M',' ','-','D','A','E','S','_','A','S',
'M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-','D',
'W','H','I','R','L','P','O','O','L','_','A','S','M',' ','-','D',
'G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P','_',
'N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D','P',
'A','D','L','O','C','K','_','A','S','M',' ','-','D','P','O','L',
'Y','1','3','0','5','_','A','S','M','\0'
'c','o','m','p','i','l','e','r',':',' ','g','c','c',' ','/','Z',
'i',' ','/','F','d','o','s','s','l','_','s','t','a','t','i','c',
'.','p','d','b',' ',' ','-','D','O','P','E','N','S','S','L','_',
'I','A','3','2','_','S','S','E','2',' ','-','D','L','_','E','N',
'D','I','A','N',' ','-','D','O','P','E','N','S','S','L','_','P',
'I','C',' ','-','D','O','P','E','N','S','S','L','_','C','P','U',
'I','D','_','O','B','J',' ','-','D','O','P','E','N','S','S','L',
'_','B','N','_','A','S','M','_','P','A','R','T','_','W','O','R',
'D','S',' ','-','D','O','P','E','N','S','S','L','_','I','A','3',
'2','_','S','S','E','2',' ','-','D','O','P','E','N','S','S','L',
'_','B','N','_','A','S','M','_','M','O','N','T',' ','-','D','O',
'P','E','N','S','S','L','_','B','N','_','A','S','M','_','G','F',
'2','m',' ','-','D','S','H','A','1','_','A','S','M',' ','-','D',
'S','H','A','2','5','6','_','A','S','M',' ','-','D','S','H','A',
'5','1','2','_','A','S','M',' ','-','D','R','C','4','_','A','S',
'M',' ','-','D','M','D','5','_','A','S','M',' ','-','D','R','M',
'D','1','6','0','_','A','S','M',' ','-','D','A','E','S','_','A',
'S','M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-',
'D','W','H','I','R','L','P','O','O','L','_','A','S','M',' ','-',
'D','G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P',
'_','N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D',
'P','A','D','L','O','C','K','_','A','S','M',' ','-','D','P','O',
'L','Y','1','3','0','5','_','A','S','M','\0'
};
6 changes: 3 additions & 3 deletions deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN32",
tdirs => [ "ossl_shim" ],
version => "1.1.1q",
version_num => "0x1010111fL",
version => "1.1.1s",
version_num => "0x1010113fL",
);

our %target = (
Expand All @@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55866dbe4280)",
RANLIB => "CODE(0x5594e19e1210)",
RC => "rc",
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",
Expand Down
48 changes: 24 additions & 24 deletions deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,35 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Tue Jul 5 12:25:52 2022 UTC"
#define DATE "built on: Tue Nov 1 20:55:57 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
* workaround for the situation where CFLAGS gets too long for a C90 string
* literal
*/
static const char compiler_flags[] = {
'c','o','m','p','i','l','e','r',':',' ','c','c',' ','/','Z','i',
' ','/','F','d','o','s','s','l','_','s','t','a','t','i','c','.',
'p','d','b',' ',' ','-','D','O','P','E','N','S','S','L','_','I',
'A','3','2','_','S','S','E','2',' ','-','D','L','_','E','N','D',
'I','A','N',' ','-','D','O','P','E','N','S','S','L','_','P','I',
'C',' ','-','D','O','P','E','N','S','S','L','_','C','P','U','I',
'D','_','O','B','J',' ','-','D','O','P','E','N','S','S','L','_',
'B','N','_','A','S','M','_','P','A','R','T','_','W','O','R','D',
'S',' ','-','D','O','P','E','N','S','S','L','_','I','A','3','2',
'_','S','S','E','2',' ','-','D','O','P','E','N','S','S','L','_',
'B','N','_','A','S','M','_','M','O','N','T',' ','-','D','O','P',
'E','N','S','S','L','_','B','N','_','A','S','M','_','G','F','2',
'm',' ','-','D','S','H','A','1','_','A','S','M',' ','-','D','S',
'H','A','2','5','6','_','A','S','M',' ','-','D','S','H','A','5',
'1','2','_','A','S','M',' ','-','D','R','C','4','_','A','S','M',
' ','-','D','M','D','5','_','A','S','M',' ','-','D','R','M','D',
'1','6','0','_','A','S','M',' ','-','D','A','E','S','_','A','S',
'M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-','D',
'W','H','I','R','L','P','O','O','L','_','A','S','M',' ','-','D',
'G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P','_',
'N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D','P',
'A','D','L','O','C','K','_','A','S','M',' ','-','D','P','O','L',
'Y','1','3','0','5','_','A','S','M','\0'
'c','o','m','p','i','l','e','r',':',' ','g','c','c',' ','/','Z',
'i',' ','/','F','d','o','s','s','l','_','s','t','a','t','i','c',
'.','p','d','b',' ',' ','-','D','O','P','E','N','S','S','L','_',
'I','A','3','2','_','S','S','E','2',' ','-','D','L','_','E','N',
'D','I','A','N',' ','-','D','O','P','E','N','S','S','L','_','P',
'I','C',' ','-','D','O','P','E','N','S','S','L','_','C','P','U',
'I','D','_','O','B','J',' ','-','D','O','P','E','N','S','S','L',
'_','B','N','_','A','S','M','_','P','A','R','T','_','W','O','R',
'D','S',' ','-','D','O','P','E','N','S','S','L','_','I','A','3',
'2','_','S','S','E','2',' ','-','D','O','P','E','N','S','S','L',
'_','B','N','_','A','S','M','_','M','O','N','T',' ','-','D','O',
'P','E','N','S','S','L','_','B','N','_','A','S','M','_','G','F',
'2','m',' ','-','D','S','H','A','1','_','A','S','M',' ','-','D',
'S','H','A','2','5','6','_','A','S','M',' ','-','D','S','H','A',
'5','1','2','_','A','S','M',' ','-','D','R','C','4','_','A','S',
'M',' ','-','D','M','D','5','_','A','S','M',' ','-','D','R','M',
'D','1','6','0','_','A','S','M',' ','-','D','A','E','S','_','A',
'S','M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-',
'D','W','H','I','R','L','P','O','O','L','_','A','S','M',' ','-',
'D','G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P',
'_','N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D',
'P','A','D','L','O','C','K','_','A','S','M',' ','-','D','P','O',
'L','Y','1','3','0','5','_','A','S','M','\0'
};
Loading

0 comments on commit 179a289

Please sign in to comment.