Skip to content

Commit

Permalink
deps: update archs files for OpenSSL-1.1.n
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: #42348
Refs: https://mta.openssl.org/pipermail/openssl-announce/2022-March/000218.html
Reviewed-By: Antoine du Hamel <[email protected]>
Reviewed-By: Darshan Sen <[email protected]>
Reviewed-By: Joe Sepi <[email protected]>
  • Loading branch information
richardlau committed Mar 16, 2022
1 parent d574a1d commit c372ec2
Show file tree
Hide file tree
Showing 204 changed files with 278 additions and 342 deletions.
5 changes: 2 additions & 3 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.1m",
version_num => "0x101010dfL",
version => "1.1.1n",
version_num => "0x101010efL",
);

our %target = (
Expand Down Expand Up @@ -1272,7 +1272,6 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
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 Dec 14 17:17:34 2021 UTC"
#define DATE "built on: Tue Mar 15 17:23:36 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/include/progs.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand Down
5 changes: 2 additions & 3 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.1m",
version_num => "0x101010dfL",
version => "1.1.1n",
version_num => "0x101010efL",
);

our %target = (
Expand Down Expand Up @@ -1272,7 +1272,6 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
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 Dec 14 17:17:39 2021 UTC"
#define DATE "built on: Tue Mar 15 17:23:40 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand Down
5 changes: 2 additions & 3 deletions deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1m",
version_num => "0x101010dfL",
version => "1.1.1n",
version_num => "0x101010efL",
);

our %target = (
Expand Down Expand Up @@ -1270,7 +1270,6 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/no-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 Dec 14 17:17:43 2021 UTC"
#define DATE "built on: Tue Mar 15 17:23:44 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand Down
5 changes: 2 additions & 3 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.1m",
version_num => "0x101010dfL",
version => "1.1.1n",
version_num => "0x101010efL",
);

our %target = (
Expand Down Expand Up @@ -1281,7 +1281,6 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
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 Dec 14 17:17:46 2021 UTC"
#define DATE "built on: Tue Mar 15 17:23:47 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand Down
5 changes: 2 additions & 3 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.1m",
version_num => "0x101010dfL",
version => "1.1.1n",
version_num => "0x101010efL",
);

our %target = (
Expand Down Expand Up @@ -1281,7 +1281,6 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
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 Dec 14 17:17:57 2021 UTC"
#define DATE "built on: Tue Mar 15 17:23:58 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand Down
5 changes: 2 additions & 3 deletions deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1m",
version_num => "0x101010dfL",
version => "1.1.1n",
version_num => "0x101010efL",
);

our %target = (
Expand Down Expand Up @@ -1279,7 +1279,6 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
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 Dec 14 17:18:08 2021 UTC"
#define DATE "built on: Tue Mar 15 17:24:09 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand Down
7 changes: 3 additions & 4 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.1m",
version_num => "0x101010dfL",
version => "1.1.1n",
version_num => "0x101010efL",
);

our %target = (
Expand All @@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x5643d76e2960)",
RANLIB => "CODE(0x555555be37f0)",
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 Expand Up @@ -1303,7 +1303,6 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Tue Dec 14 17:22:13 2021 UTC"
#define DATE "built on: Tue Mar 15 17:28:15 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/asm/include/progs.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand Down
7 changes: 3 additions & 4 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.1m",
version_num => "0x101010dfL",
version => "1.1.1n",
version_num => "0x101010efL",
);

our %target = (
Expand All @@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x560b94561e00)",
RANLIB => "CODE(0x555555be2da0)",
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 Expand Up @@ -1303,7 +1303,6 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Tue Dec 14 17:22:17 2021 UTC"
#define DATE "built on: Tue Mar 15 17:28:19 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand Down
7 changes: 3 additions & 4 deletions deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN32",
tdirs => [ "ossl_shim" ],
version => "1.1.1m",
version_num => "0x101010dfL",
version => "1.1.1n",
version_num => "0x101010efL",
);

our %target = (
Expand All @@ -131,7 +131,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x5627d17e5620)",
RANLIB => "CODE(0x555555be4400)",
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 Expand Up @@ -1301,7 +1301,6 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Tue Dec 14 17:22:21 2021 UTC"
#define DATE "built on: Tue Mar 15 17:28:23 2022 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/no-asm/include/progs.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by apps/progs.pl
*
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand Down
7 changes: 3 additions & 4 deletions deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN64-ARM",
tdirs => [ "ossl_shim" ],
version => "1.1.1m",
version_num => "0x101010dfL",
version => "1.1.1n",
version_num => "0x101010efL",
);

our %target = (
Expand All @@ -128,7 +128,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x5610762514e0)",
RANLIB => "CODE(0x555555be41b0)",
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 Expand Up @@ -1295,7 +1295,6 @@ our %unified_info = (
],
"test/ec_internal_test" =>
[
"apps/libapps.a",
"libcrypto.a",
"test/libtestutil.a",
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: VC-WIN64-ARM"
#define DATE "built on: Tue Dec 14 17:22:23 2021 UTC"
#define DATE "built on: Tue Mar 15 17:28:25 2022 UTC"

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

0 comments on commit c372ec2

Please sign in to comment.