Skip to content

Commit

Permalink
deps: update archs files for OpenSSL-1.1.1i
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 gen-openssl
  $ 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: #36521
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
  • Loading branch information
MylesBorins authored and BethGriggs committed Dec 17, 2020
1 parent 2de2672 commit d62c650
Show file tree
Hide file tree
Showing 235 changed files with 2,134 additions and 546 deletions.
25 changes: 22 additions & 3 deletions deps/openssl/config/archs/BSD-x86/asm/configdata.pm
Expand Up @@ -62,7 +62,7 @@ our %config = (
options => "enable-ssl-trace no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace 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.1",
perl_version => "5.30.0",
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "BSD-x86" ],
perlenv => {
"AR" => undef,
Expand Down Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1g",
version_num => "0x1010107fL",
version => "1.1.1i",
version_num => "0x1010109fL",
);

our %target = (
Expand Down Expand Up @@ -1172,6 +1172,11 @@ our %unified_info = (
"libssl",
"test/libtestutil.a",
],
"test/cmactest" =>
[
"libcrypto.a",
"test/libtestutil.a",
],
"test/cmsapitest" =>
[
"libcrypto",
Expand Down Expand Up @@ -8990,6 +8995,11 @@ our %unified_info = (
[
"include",
],
"test/cmactest.o" =>
[
"include",
"apps/include",
],
"test/cmsapitest.o" =>
[
"include",
Expand Down Expand Up @@ -9567,6 +9577,7 @@ our %unified_info = (
"test/cipherlist_test",
"test/ciphername_test",
"test/clienthellotest",
"test/cmactest",
"test/cmsapitest",
"test/conf_include_test",
"test/constant_time_test",
Expand Down Expand Up @@ -14292,6 +14303,14 @@ our %unified_info = (
[
"test/clienthellotest.c",
],
"test/cmactest" =>
[
"test/cmactest.o",
],
"test/cmactest.o" =>
[
"test/cmactest.c",
],
"test/cmsapitest" =>
[
"test/cmsapitest.o",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Tue Apr 21 13:28:30 2020 UTC"
#define DATE "built on: Tue Dec 15 03:56:41 2020 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/opensslconf.h.in
*
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2016-2020 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 Expand Up @@ -114,6 +114,11 @@ extern "C" {
# undef DECLARE_DEPRECATED
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
# endif
# elif defined(__SUNPRO_C)
# if (__SUNPRO_C >= 0x5130)
# undef DECLARE_DEPRECATED
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
# endif
# endif
#endif

Expand Down
25 changes: 22 additions & 3 deletions deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm
Expand Up @@ -62,7 +62,7 @@ our %config = (
options => "enable-ssl-trace no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace 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.1",
perl_version => "5.30.0",
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "BSD-x86" ],
perlenv => {
"AR" => undef,
Expand Down Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1g",
version_num => "0x1010107fL",
version => "1.1.1i",
version_num => "0x1010109fL",
);

our %target = (
Expand Down Expand Up @@ -1172,6 +1172,11 @@ our %unified_info = (
"libssl",
"test/libtestutil.a",
],
"test/cmactest" =>
[
"libcrypto.a",
"test/libtestutil.a",
],
"test/cmsapitest" =>
[
"libcrypto",
Expand Down Expand Up @@ -8990,6 +8995,11 @@ our %unified_info = (
[
"include",
],
"test/cmactest.o" =>
[
"include",
"apps/include",
],
"test/cmsapitest.o" =>
[
"include",
Expand Down Expand Up @@ -9567,6 +9577,7 @@ our %unified_info = (
"test/cipherlist_test",
"test/ciphername_test",
"test/clienthellotest",
"test/cmactest",
"test/cmsapitest",
"test/conf_include_test",
"test/constant_time_test",
Expand Down Expand Up @@ -14292,6 +14303,14 @@ our %unified_info = (
[
"test/clienthellotest.c",
],
"test/cmactest" =>
[
"test/cmactest.o",
],
"test/cmactest.o" =>
[
"test/cmactest.c",
],
"test/cmsapitest" =>
[
"test/cmsapitest.o",
Expand Down
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Tue Apr 21 13:28:32 2020 UTC"
#define DATE "built on: Tue Dec 15 03:57:04 2020 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/opensslconf.h.in
*
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2016-2020 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 Expand Up @@ -114,6 +114,11 @@ extern "C" {
# undef DECLARE_DEPRECATED
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
# endif
# elif defined(__SUNPRO_C)
# if (__SUNPRO_C >= 0x5130)
# undef DECLARE_DEPRECATED
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
# endif
# endif
#endif

Expand Down
25 changes: 22 additions & 3 deletions deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm
Expand Up @@ -61,7 +61,7 @@ our %config = (
options => "enable-ssl-trace no-afalgeng no-asan no-asm no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace 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.1",
perl_version => "5.30.0",
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "no-asm", "BSD-x86" ],
perlenv => {
"AR" => undef,
Expand Down Expand Up @@ -110,8 +110,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1g",
version_num => "0x1010107fL",
version => "1.1.1i",
version_num => "0x1010109fL",
);

our %target = (
Expand Down Expand Up @@ -1170,6 +1170,11 @@ our %unified_info = (
"libssl",
"test/libtestutil.a",
],
"test/cmactest" =>
[
"libcrypto.a",
"test/libtestutil.a",
],
"test/cmsapitest" =>
[
"libcrypto",
Expand Down Expand Up @@ -8910,6 +8915,11 @@ our %unified_info = (
[
"include",
],
"test/cmactest.o" =>
[
"include",
"apps/include",
],
"test/cmsapitest.o" =>
[
"include",
Expand Down Expand Up @@ -9487,6 +9497,7 @@ our %unified_info = (
"test/cipherlist_test",
"test/ciphername_test",
"test/clienthellotest",
"test/cmactest",
"test/cmsapitest",
"test/conf_include_test",
"test/constant_time_test",
Expand Down Expand Up @@ -14147,6 +14158,14 @@ our %unified_info = (
[
"test/clienthellotest.c",
],
"test/cmactest" =>
[
"test/cmactest.o",
],
"test/cmactest.o" =>
[
"test/cmactest.c",
],
"test/cmsapitest" =>
[
"test/cmsapitest.o",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Tue Apr 21 13:28:34 2020 UTC"
#define DATE "built on: Tue Dec 15 03:57:28 2020 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/opensslconf.h.in
*
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2016-2020 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 Expand Up @@ -117,6 +117,11 @@ extern "C" {
# undef DECLARE_DEPRECATED
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
# endif
# elif defined(__SUNPRO_C)
# if (__SUNPRO_C >= 0x5130)
# undef DECLARE_DEPRECATED
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
# endif
# endif
#endif

Expand Down
25 changes: 22 additions & 3 deletions deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm
Expand Up @@ -62,7 +62,7 @@ our %config = (
options => "enable-ssl-trace no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace 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.1",
perl_version => "5.30.0",
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "BSD-x86_64" ],
perlenv => {
"AR" => undef,
Expand Down Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1g",
version_num => "0x1010107fL",
version => "1.1.1i",
version_num => "0x1010109fL",
);

our %target = (
Expand Down Expand Up @@ -1181,6 +1181,11 @@ our %unified_info = (
"libssl",
"test/libtestutil.a",
],
"test/cmactest" =>
[
"libcrypto.a",
"test/libtestutil.a",
],
"test/cmsapitest" =>
[
"libcrypto",
Expand Down Expand Up @@ -9084,6 +9089,11 @@ our %unified_info = (
[
"include",
],
"test/cmactest.o" =>
[
"include",
"apps/include",
],
"test/cmsapitest.o" =>
[
"include",
Expand Down Expand Up @@ -9661,6 +9671,7 @@ our %unified_info = (
"test/cipherlist_test",
"test/ciphername_test",
"test/clienthellotest",
"test/cmactest",
"test/cmsapitest",
"test/conf_include_test",
"test/constant_time_test",
Expand Down Expand Up @@ -14436,6 +14447,14 @@ our %unified_info = (
[
"test/clienthellotest.c",
],
"test/cmactest" =>
[
"test/cmactest.o",
],
"test/cmactest.o" =>
[
"test/cmactest.c",
],
"test/cmsapitest" =>
[
"test/cmsapitest.o",
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Tue Apr 21 13:28:35 2020 UTC"
#define DATE "built on: Tue Dec 15 03:57:32 2020 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by Makefile from include/openssl/opensslconf.h.in
*
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2016-2020 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 Expand Up @@ -114,6 +114,11 @@ extern "C" {
# undef DECLARE_DEPRECATED
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
# endif
# elif defined(__SUNPRO_C)
# if (__SUNPRO_C >= 0x5130)
# undef DECLARE_DEPRECATED
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
# endif
# endif
#endif

Expand Down

0 comments on commit d62c650

Please sign in to comment.