Skip to content

Commit

Permalink
deps: update archs files for OpenSSL-1.1.1q
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

PR-URL: nodejs/node#43692
Refs: https://mta.openssl.org/pipermail/openssl-announce/2022-July/000232.html
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Danielle Adams <adamzdanielle@gmail.com>
  • Loading branch information
@RafaelGSS @guangwong
RafaelGSS authored and guangwong committed Oct 10, 2022
1 parent 4d5b94a commit a245ef7
Show file tree
Hide file tree
Showing 143 changed files with 225 additions and 222 deletions.
4 changes: 2 additions & 2 deletions deps/openssl/config/archs/BSD-x86/asm/configdata.pm
View file
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1p+quic",
version_num => "0x1010110fL",
version => "1.1.1q+quic",
version_num => "0x1010111fL",
);

our %target = (
Expand Down
4 changes: 2 additions & 2 deletions deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aesni-x86.s
View file
Expand Up @@ -1927,7 +1927,7 @@ L077grandloop:
movdqu %xmm6,-32(%edi,%esi,1)
movdqu %xmm7,-16(%edi,%esi,1)
cmpl %eax,%esi
jb L077grandloop
jbe L077grandloop
L076short:
addl $96,%eax
subl %esi,%eax
Expand Down Expand Up @@ -2321,7 +2321,7 @@ L087grandloop:
pxor %xmm7,%xmm1
movdqu %xmm7,-16(%edi,%esi,1)
cmpl %eax,%esi
jb L087grandloop
jbe L087grandloop
L086short:
addl $96,%eax
subl %esi,%eax
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Wed Jun 22 14:29:13 2022 UTC"
#define DATE "built on: Tue Jul 5 15:02:24 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
View file
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1p+quic",
version_num => "0x1010110fL",
version => "1.1.1q+quic",
version_num => "0x1010111fL",
);

our %target = (
Expand Down
4 changes: 2 additions & 2 deletions deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aesni-x86.s
View file
Expand Up @@ -1927,7 +1927,7 @@ L077grandloop:
movdqu %xmm6,-32(%edi,%esi,1)
movdqu %xmm7,-16(%edi,%esi,1)
cmpl %eax,%esi
jb L077grandloop
jbe L077grandloop
L076short:
addl $96,%eax
subl %esi,%eax
Expand Down Expand Up @@ -2321,7 +2321,7 @@ L087grandloop:
pxor %xmm7,%xmm1
movdqu %xmm7,-16(%edi,%esi,1)
cmpl %eax,%esi
jb L087grandloop
jbe L087grandloop
L086short:
addl $96,%eax
subl %esi,%eax
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Wed Jun 22 14:29:15 2022 UTC"
#define DATE "built on: Tue Jul 5 15:02:26 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/no-asm/configdata.pm
View file
Expand Up @@ -110,8 +110,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1p+quic",
version_num => "0x1010110fL",
version => "1.1.1q+quic",
version_num => "0x1010111fL",
);

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

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Wed Jun 22 14:29:17 2022 UTC"
#define DATE "built on: Tue Jul 5 15:02:28 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/configdata.pm
View file
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1p+quic",
version_num => "0x1010110fL",
version => "1.1.1q+quic",
version_num => "0x1010111fL",
);

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

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Wed Jun 22 14:29:18 2022 UTC"
#define DATE "built on: Tue Jul 5 15:02:29 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
View file
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1p+quic",
version_num => "0x1010110fL",
version => "1.1.1q+quic",
version_num => "0x1010111fL",
);

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

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Wed Jun 22 14:29:23 2022 UTC"
#define DATE "built on: Tue Jul 5 15:02:34 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/no-asm/configdata.pm
View file
Expand Up @@ -110,8 +110,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1p+quic",
version_num => "0x1010110fL",
version => "1.1.1q+quic",
version_num => "0x1010111fL",
);

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

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Wed Jun 22 14:29:27 2022 UTC"
#define DATE "built on: Tue Jul 5 15:02:38 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
6 changes: 3 additions & 3 deletions deps/openssl/config/archs/VC-WIN32/asm/configdata.pm
View file
Expand Up @@ -115,8 +115,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN32",
tdirs => [ "ossl_shim" ],
version => "1.1.1p+quic",
version_num => "0x1010110fL",
version => "1.1.1q+quic",
version_num => "0x1010111fL",
);

our %target = (
Expand All @@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55f74fc75f60)",
RANLIB => "CODE(0x559678e64ef8)",
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
4 changes: 2 additions & 2 deletions deps/openssl/config/archs/VC-WIN32/asm/crypto/aes/aesni-x86.asm
View file
Expand Up @@ -1918,7 +1918,7 @@ db 102,15,56,220,249
movdqu [esi*1+edi-32],xmm6
movdqu [esi*1+edi-16],xmm7
cmp esi,eax
jb NEAR L$077grandloop
jbe NEAR L$077grandloop
L$076short:
add eax,96
sub eax,esi
Expand Down Expand Up @@ -2311,7 +2311,7 @@ db 102,15,56,222,249
pxor xmm1,xmm7
movdqu [esi*1+edi-16],xmm7
cmp esi,eax
jb NEAR L$087grandloop
jbe NEAR L$087grandloop
L$086short:
add eax,96
sub eax,esi
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Wed Jun 22 14:31:08 2022 UTC"
#define DATE "built on: Tue Jul 5 15:04:18 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
6 changes: 3 additions & 3 deletions deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm
View file
Expand Up @@ -115,8 +115,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN32",
tdirs => [ "ossl_shim" ],
version => "1.1.1p+quic",
version_num => "0x1010110fL",
version => "1.1.1q+quic",
version_num => "0x1010111fL",
);

our %target = (
Expand All @@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x564a9aef1e50)",
RANLIB => "CODE(0x563ad0697608)",
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
4 changes: 2 additions & 2 deletions deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/aes/aesni-x86.asm
View file
Expand Up @@ -1918,7 +1918,7 @@ db 102,15,56,220,249
movdqu [esi*1+edi-32],xmm6
movdqu [esi*1+edi-16],xmm7
cmp esi,eax
jb NEAR L$077grandloop
jbe NEAR L$077grandloop
L$076short:
add eax,96
sub eax,esi
Expand Down Expand Up @@ -2311,7 +2311,7 @@ db 102,15,56,222,249
pxor xmm1,xmm7
movdqu [esi*1+edi-16],xmm7
cmp esi,eax
jb NEAR L$087grandloop
jbe NEAR L$087grandloop
L$086short:
add eax,96
sub eax,esi
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Wed Jun 22 14:31:10 2022 UTC"
#define DATE "built on: Tue Jul 5 15:04:20 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
6 changes: 3 additions & 3 deletions deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm
View file
Expand Up @@ -114,8 +114,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN32",
tdirs => [ "ossl_shim" ],
version => "1.1.1p+quic",
version_num => "0x1010110fL",
version => "1.1.1q+quic",
version_num => "0x1010111fL",
);

our %target = (
Expand All @@ -131,7 +131,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55e8b2f30290)",
RANLIB => "CODE(0x556fff3f0a98)",
RC => "rc",
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
aes_asm_src => "aes_core.c aes_cbc.c",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Wed Jun 22 14:31:11 2022 UTC"
#define DATE "built on: Tue Jul 5 15:04:22 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
6 changes: 3 additions & 3 deletions deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm
View file
Expand Up @@ -113,8 +113,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN64-ARM",
tdirs => [ "ossl_shim" ],
version => "1.1.1p+quic",
version_num => "0x1010110fL",
version => "1.1.1q+quic",
version_num => "0x1010111fL",
);

our %target = (
Expand All @@ -128,7 +128,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55b44517aff0)",
RANLIB => "CODE(0x55ace5816308)",
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",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: VC-WIN64-ARM"
#define DATE "built on: Wed Jun 22 14:31:12 2022 UTC"
#define DATE "built on: Tue Jul 5 15:04:23 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
6 changes: 3 additions & 3 deletions deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm
View file
Expand Up @@ -116,8 +116,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN64A",
tdirs => [ "ossl_shim" ],
version => "1.1.1p+quic",
version_num => "0x1010110fL",
version => "1.1.1q+quic",
version_num => "0x1010111fL",
);

our %target = (
Expand All @@ -133,7 +133,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55a873bfbd30)",
RANLIB => "CODE(0x56273ae20468)",
RC => "rc",
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.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_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Wed Jun 22 14:30:57 2022 UTC"
#define DATE "built on: Tue Jul 5 15:04:08 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
6 changes: 3 additions & 3 deletions deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm
View file
Expand Up @@ -116,8 +116,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN64A",
tdirs => [ "ossl_shim" ],
version => "1.1.1p+quic",
version_num => "0x1010110fL",
version => "1.1.1q+quic",
version_num => "0x1010111fL",
);

our %target = (
Expand All @@ -133,7 +133,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x5582b4046e90)",
RANLIB => "CODE(0x562ee243ee48)",
RC => "rc",
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.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_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Wed Jun 22 14:31:02 2022 UTC"
#define DATE "built on: Tue Jul 5 15:04:13 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
6 changes: 3 additions & 3 deletions deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm
View file
Expand Up @@ -115,8 +115,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN64A",
tdirs => [ "ossl_shim" ],
version => "1.1.1p+quic",
version_num => "0x1010110fL",
version => "1.1.1q+quic",
version_num => "0x1010111fL",
);

our %target = (
Expand All @@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x5592573f1210)",
RANLIB => "CODE(0x5639f0faa118)",
RC => "rc",
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
aes_asm_src => "aes_core.c aes_cbc.c",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Wed Jun 22 14:31:07 2022 UTC"
#define DATE "built on: Tue Jul 5 15:04:17 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down

0 comments on commit a245ef7

Please sign in to comment.