Skip to content

Commit 871eace

Browse files
RafaelGSSRafaelGSS
committed
deps: update archs files for quictls/openssl-3.0.3
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 $ git commit PR-URL: #43025 Refs: https://mta.openssl.org/pipermail/openssl-announce/2022-May/000223.html Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Beth Griggs <bgriggs@redhat.com>
1 parent 05fb807 commit 871eace

File tree

417 files changed

+5635
-1578
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

417 files changed

+5635
-1578
lines changed

‎deps/openssl/config/archs/BSD-x86/asm/configdata.pm

Lines changed: 64 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ our %config = (
156156
],
157157
"dynamic_engines" => "0",
158158
"ex_libs" => [],
159-
"full_version" => "3.0.2+quic",
159+
"full_version" => "3.0.3+quic",
160160
"includes" => [],
161161
"lflags" => [],
162162
"lib_defines" => [
@@ -203,10 +203,10 @@ our %config = (
203203
"openssl_sys_defines" => [],
204204
"openssldir" => "",
205205
"options" => "enable-ssl-trace enable-fips 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-ktls no-loadereng no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-trace no-ubsan no-unit-test no-uplink no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
206-
"patch" => "2",
206+
"patch" => "3",
207207
"perl_archname" => "x86_64-linux-gnu-thread-multi",
208208
"perl_cmd" => "/usr/bin/perl",
209-
"perl_version" => "5.28.1",
209+
"perl_version" => "5.30.0",
210210
"perlargv" => [
211211
"no-comp",
212212
"no-shared",
@@ -255,11 +255,11 @@ our %config = (
255255
"prerelease" => "",
256256
"processor" => "",
257257
"rc4_int" => "unsigned int",
258-
"release_date" => "15 Mar 2022",
258+
"release_date" => "3 May 2022",
259259
"shlib_version" => "81.3",
260260
"sourcedir" => ".",
261261
"target" => "BSD-x86",
262-
"version" => "3.0.2"
262+
"version" => "3.0.3"
263263
);
264264
our %target = (
265265
"AR" => "ar",
@@ -1243,6 +1243,9 @@ our %unified_info = (
12431243
"test/evp_libctx_test" => {
12441244
"noinst" => "1"
12451245
},
1246+
"test/evp_pkey_ctx_new_from_name" => {
1247+
"noinst" => "1"
1248+
},
12461249
"test/evp_pkey_dparams_test" => {
12471250
"noinst" => "1"
12481251
},
@@ -1288,6 +1291,9 @@ our %unified_info = (
12881291
"test/lhash_test" => {
12891292
"noinst" => "1"
12901293
},
1294+
"test/localetest" => {
1295+
"noinst" => "1"
1296+
},
12911297
"test/mdc2_internal_test" => {
12921298
"noinst" => "1"
12931299
},
@@ -2890,6 +2896,9 @@ our %unified_info = (
28902896
"doc/html/man3/OPENSSL_secure_malloc.html" => [
28912897
"doc/man3/OPENSSL_secure_malloc.pod"
28922898
],
2899+
"doc/html/man3/OPENSSL_strcasecmp.html" => [
2900+
"doc/man3/OPENSSL_strcasecmp.pod"
2901+
],
28932902
"doc/html/man3/OSSL_CMP_CTX_new.html" => [
28942903
"doc/man3/OSSL_CMP_CTX_new.pod"
28952904
],
@@ -5233,6 +5242,9 @@ our %unified_info = (
52335242
"doc/man/man3/OPENSSL_secure_malloc.3" => [
52345243
"doc/man3/OPENSSL_secure_malloc.pod"
52355244
],
5245+
"doc/man/man3/OPENSSL_strcasecmp.3" => [
5246+
"doc/man3/OPENSSL_strcasecmp.pod"
5247+
],
52365248
"doc/man/man3/OSSL_CMP_CTX_new.3" => [
52375249
"doc/man3/OSSL_CMP_CTX_new.pod"
52385250
],
@@ -7613,6 +7625,9 @@ our %unified_info = (
76137625
"libcrypto.a",
76147626
"test/libtestutil.a"
76157627
],
7628+
"test/evp_pkey_ctx_new_from_name" => [
7629+
"libcrypto"
7630+
],
76167631
"test/evp_pkey_dparams_test" => [
76177632
"libcrypto",
76187633
"test/libtestutil.a"
@@ -7677,6 +7692,10 @@ our %unified_info = (
76777692
"test/libtestutil.a" => [
76787693
"libcrypto"
76797694
],
7695+
"test/localetest" => [
7696+
"libcrypto",
7697+
"test/libtestutil.a"
7698+
],
76807699
"test/mdc2_internal_test" => [
76817700
"libcrypto.a",
76827701
"test/libtestutil.a"
@@ -8020,9 +8039,6 @@ our %unified_info = (
80208039
},
80218040
"apps/lib" => {
80228041
"deps" => [
8023-
"apps/lib/openssl-bin-cmp_mock_srv.o",
8024-
"apps/lib/cmp_client_test-bin-cmp_mock_srv.o",
8025-
"apps/lib/uitest-bin-apps_ui.o",
80268042
"apps/lib/libapps-lib-app_libctx.o",
80278043
"apps/lib/libapps-lib-app_params.o",
80288044
"apps/lib/libapps-lib-app_provider.o",
@@ -8040,7 +8056,10 @@ our %unified_info = (
80408056
"apps/lib/libapps-lib-s_cb.o",
80418057
"apps/lib/libapps-lib-s_socket.o",
80428058
"apps/lib/libapps-lib-tlssrp_depr.o",
8043-
"apps/lib/libtestutil-lib-opt.o"
8059+
"apps/lib/libtestutil-lib-opt.o",
8060+
"apps/lib/openssl-bin-cmp_mock_srv.o",
8061+
"apps/lib/cmp_client_test-bin-cmp_mock_srv.o",
8062+
"apps/lib/uitest-bin-apps_ui.o"
80448063
],
80458064
"products" => {
80468065
"bin" => [
@@ -10484,7 +10503,7 @@ our %unified_info = (
1048410503
"crypto/chacha/chacha-c64xplus.S" => [
1048510504
"crypto/chacha/asm/chacha-c64xplus.pl"
1048610505
],
10487-
"crypto/chacha/chacha-ia64.S" => [
10506+
"crypto/chacha/chacha-ia64.s" => [
1048810507
"crypto/chacha/asm/chacha-ia64.pl"
1048910508
],
1049010509
"crypto/chacha/chacha-ppc.s" => [
@@ -11804,6 +11823,9 @@ our %unified_info = (
1180411823
"doc/html/man3/OPENSSL_secure_malloc.html" => [
1180511824
"doc/man3/OPENSSL_secure_malloc.pod"
1180611825
],
11826+
"doc/html/man3/OPENSSL_strcasecmp.html" => [
11827+
"doc/man3/OPENSSL_strcasecmp.pod"
11828+
],
1180711829
"doc/html/man3/OSSL_CMP_CTX_new.html" => [
1180811830
"doc/man3/OSSL_CMP_CTX_new.pod"
1180911831
],
@@ -14147,6 +14169,9 @@ our %unified_info = (
1414714169
"doc/man/man3/OPENSSL_secure_malloc.3" => [
1414814170
"doc/man3/OPENSSL_secure_malloc.pod"
1414914171
],
14172+
"doc/man/man3/OPENSSL_strcasecmp.3" => [
14173+
"doc/man3/OPENSSL_strcasecmp.pod"
14174+
],
1415014175
"doc/man/man3/OSSL_CMP_CTX_new.3" => [
1415114176
"doc/man3/OSSL_CMP_CTX_new.pod"
1415214177
],
@@ -16435,6 +16460,7 @@ our %unified_info = (
1643516460
"doc/html/man3/OPENSSL_malloc.html",
1643616461
"doc/html/man3/OPENSSL_s390xcap.html",
1643716462
"doc/html/man3/OPENSSL_secure_malloc.html",
16463+
"doc/html/man3/OPENSSL_strcasecmp.html",
1643816464
"doc/html/man3/OSSL_CMP_CTX_new.html",
1643916465
"doc/html/man3/OSSL_CMP_HDR_get0_transactionID.html",
1644016466
"doc/html/man3/OSSL_CMP_ITAV_set0.html",
@@ -18500,6 +18526,10 @@ our %unified_info = (
1850018526
"include",
1850118527
"apps/include"
1850218528
],
18529+
"test/evp_pkey_ctx_new_from_name" => [
18530+
"include",
18531+
"apps/include"
18532+
],
1850318533
"test/evp_pkey_dparams_test" => [
1850418534
"include",
1850518535
"apps/include"
@@ -18687,6 +18717,10 @@ our %unified_info = (
1868718717
"apps/include",
1868818718
"."
1868918719
],
18720+
"test/localetest" => [
18721+
"include",
18722+
"apps/include"
18723+
],
1869018724
"test/mdc2_internal_test" => [
1869118725
".",
1869218726
"include",
@@ -19370,6 +19404,7 @@ our %unified_info = (
1937019404
"doc/man/man3/OPENSSL_malloc.3",
1937119405
"doc/man/man3/OPENSSL_s390xcap.3",
1937219406
"doc/man/man3/OPENSSL_secure_malloc.3",
19407+
"doc/man/man3/OPENSSL_strcasecmp.3",
1937319408
"doc/man/man3/OSSL_CMP_CTX_new.3",
1937419409
"doc/man/man3/OSSL_CMP_HDR_get0_transactionID.3",
1937519410
"doc/man/man3/OSSL_CMP_ITAV_set0.3",
@@ -19992,6 +20027,7 @@ our %unified_info = (
1999220027
"test/evp_fetch_prov_test",
1999320028
"test/evp_kdf_test",
1999420029
"test/evp_libctx_test",
20030+
"test/evp_pkey_ctx_new_from_name",
1999520031
"test/evp_pkey_dparams_test",
1999620032
"test/evp_pkey_provided_test",
1999720033
"test/evp_test",
@@ -20007,6 +20043,7 @@ our %unified_info = (
2000720043
"test/igetest",
2000820044
"test/keymgmt_internal_test",
2000920045
"test/lhash_test",
20046+
"test/localetest",
2001020047
"test/mdc2_internal_test",
2001120048
"test/mdc2test",
2001220049
"test/memleaktest",
@@ -26389,6 +26426,12 @@ our %unified_info = (
2638926426
"test/evp_libctx_test-bin-evp_libctx_test.o" => [
2639026427
"test/evp_libctx_test.c"
2639126428
],
26429+
"test/evp_pkey_ctx_new_from_name" => [
26430+
"test/evp_pkey_ctx_new_from_name-bin-evp_pkey_ctx_new_from_name.o"
26431+
],
26432+
"test/evp_pkey_ctx_new_from_name-bin-evp_pkey_ctx_new_from_name.o" => [
26433+
"test/evp_pkey_ctx_new_from_name.c"
26434+
],
2639226435
"test/evp_pkey_dparams_test" => [
2639326436
"test/evp_pkey_dparams_test-bin-evp_pkey_dparams_test.o"
2639426437
],
@@ -26578,6 +26621,12 @@ our %unified_info = (
2657826621
"test/testutil/libtestutil-lib-tests.o",
2657926622
"test/testutil/libtestutil-lib-testutil_init.o"
2658026623
],
26624+
"test/localetest" => [
26625+
"test/localetest-bin-localetest.o"
26626+
],
26627+
"test/localetest-bin-localetest.o" => [
26628+
"test/localetest.c"
26629+
],
2658126630
"test/mdc2_internal_test" => [
2658226631
"test/mdc2_internal_test-bin-mdc2_internal_test.o"
2658326632
],
@@ -27290,8 +27339,8 @@ unless (caller) {
2729027339
use File::Copy;
2729127340
use Pod::Usage;
2729227341

27293-
use lib '/home/hassaan/node/deps/openssl/openssl/util/perl';
27294-
use OpenSSL::fallback '/home/hassaan/node/deps/openssl/openssl/external/perl/MODULES.txt';
27342+
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
27343+
use OpenSSL::fallback '/home/rafaelgss/repos/os/node/deps/openssl/openssl/external/perl/MODULES.txt';
2729527344

2729627345
my $here = dirname($0);
2729727346

@@ -27318,7 +27367,7 @@ unless (caller) {
2731827367
);
2731927368

2732027369
use lib '.';
27321-
use lib '/home/hassaan/node/deps/openssl/openssl/Configurations';
27370+
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
2732227371
use gentemplate;
2732327372

2732427373
print 'Creating ',$buildfile_template,"\n";
@@ -27335,8 +27384,8 @@ unless (caller) {
2733527384

2733627385
my $prepend = <<'_____';
2733727386
use File::Spec::Functions;
27338-
use lib '/home/hassaan/node/deps/openssl/openssl/util/perl';
27339-
use lib '/home/hassaan/node/deps/openssl/openssl/Configurations';
27387+
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/util/perl';
27388+
use lib '/home/rafaelgss/repos/os/node/deps/openssl/openssl/Configurations';
2734027389
use lib '.';
2734127390
use platform;
2734227391
_____

‎deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
#define PLATFORM "platform: BSD-x86"
14-
#define DATE "built on: Wed Mar 16 04:51:37 2022 UTC"
14+
#define DATE "built on: Mon May 9 19:43:59 2022 UTC"
1515

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

‎deps/openssl/config/archs/BSD-x86/asm/include/openssl/crypto.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ int OPENSSL_hexstr2buf_ex(unsigned char *buf, size_t buf_n, size_t *buflen,
132132
const char *str, const char sep);
133133
unsigned char *OPENSSL_hexstr2buf(const char *str, long *buflen);
134134
int OPENSSL_hexchar2int(unsigned char c);
135+
int OPENSSL_strcasecmp(const char *s1, const char *s2);
136+
int OPENSSL_strncasecmp(const char *s1, const char *s2, size_t n);
135137

136138
# define OPENSSL_MALLOC_MAX_NELEMS(type) (((1U<<(sizeof(int)*8-1))-1)/sizeof(type))
137139

‎deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslv.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extern "C" {
2929
*/
3030
# define OPENSSL_VERSION_MAJOR 3
3131
# define OPENSSL_VERSION_MINOR 0
32-
# define OPENSSL_VERSION_PATCH 2
32+
# define OPENSSL_VERSION_PATCH 3
3333

3434
/*
3535
* Additional version information
@@ -74,21 +74,21 @@ extern "C" {
7474
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
7575
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
7676
*/
77-
# define OPENSSL_VERSION_STR "3.0.2"
78-
# define OPENSSL_FULL_VERSION_STR "3.0.2+quic"
77+
# define OPENSSL_VERSION_STR "3.0.3"
78+
# define OPENSSL_FULL_VERSION_STR "3.0.3+quic"
7979

8080
/*
8181
* SECTION 3: ADDITIONAL METADATA
8282
*
8383
* These strings are defined separately to allow them to be parsable.
8484
*/
85-
# define OPENSSL_RELEASE_DATE "15 Mar 2022"
85+
# define OPENSSL_RELEASE_DATE "3 May 2022"
8686

8787
/*
8888
* SECTION 4: BACKWARD COMPATIBILITY
8989
*/
9090

91-
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.2+quic 15 Mar 2022"
91+
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.3+quic 3 May 2022"
9292

9393
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
9494
# ifdef OPENSSL_VERSION_PRE_RELEASE

‎deps/openssl/config/archs/BSD-x86/asm/include/openssl/ssl.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1381,6 +1381,8 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
13811381
# define SSL_CTRL_GET_TMP_KEY 133
13821382
# define SSL_CTRL_GET_NEGOTIATED_GROUP 134
13831383
# define SSL_CTRL_SET_RETRY_VERIFY 136
1384+
# define SSL_CTRL_GET_VERIFY_CERT_STORE 137
1385+
# define SSL_CTRL_GET_CHAIN_CERT_STORE 138
13841386
# define SSL_CERT_SET_FIRST 1
13851387
# define SSL_CERT_SET_NEXT 2
13861388
# define SSL_CERT_SET_SERVER 3
@@ -1442,10 +1444,14 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
14421444
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
14431445
# define SSL_CTX_set1_verify_cert_store(ctx,st) \
14441446
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
1447+
# define SSL_CTX_get0_verify_cert_store(ctx,st) \
1448+
SSL_CTX_ctrl(ctx,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))
14451449
# define SSL_CTX_set0_chain_cert_store(ctx,st) \
14461450
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
14471451
# define SSL_CTX_set1_chain_cert_store(ctx,st) \
14481452
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
1453+
# define SSL_CTX_get0_chain_cert_store(ctx,st) \
1454+
SSL_CTX_ctrl(ctx,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))
14491455
# define SSL_set0_chain(s,sk) \
14501456
SSL_ctrl(s,SSL_CTRL_CHAIN,0,(char *)(sk))
14511457
# define SSL_set1_chain(s,sk) \
@@ -1468,10 +1474,15 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
14681474
SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
14691475
# define SSL_set1_verify_cert_store(s,st) \
14701476
SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
1477+
#define SSL_get0_verify_cert_store(s,st) \
1478+
SSL_ctrl(s,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))
14711479
# define SSL_set0_chain_cert_store(s,st) \
14721480
SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
14731481
# define SSL_set1_chain_cert_store(s,st) \
14741482
SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
1483+
#define SSL_get0_chain_cert_store(s,st) \
1484+
SSL_ctrl(s,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))
1485+
14751486
# define SSL_get1_groups(s, glist) \
14761487
SSL_ctrl(s,SSL_CTRL_GET_GROUPS,0,(int*)(glist))
14771488
# define SSL_CTX_set1_groups(ctx, glist, glistlen) \

‎deps/openssl/config/archs/BSD-x86/asm/include/openssl/x509.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by Makefile from include/openssl/x509.h.in
44
*
5-
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
66
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
77
*
88
* Licensed under the Apache License 2.0 (the "License"). You may not use
@@ -552,11 +552,11 @@ int X509_NAME_digest(const X509_NAME *data, const EVP_MD *type,
552552
X509 *X509_load_http(const char *url, BIO *bio, BIO *rbio, int timeout);
553553
X509_CRL *X509_CRL_load_http(const char *url, BIO *bio, BIO *rbio, int timeout);
554554
# ifndef OPENSSL_NO_DEPRECATED_3_0
555-
# include <openssl/ocsp.h> /* OCSP_REQ_CTX_nbio_d2i */
555+
# include <openssl/http.h> /* OSSL_HTTP_REQ_CTX_nbio_d2i */
556556
# define X509_http_nbio(rctx, pcert) \
557-
OCSP_REQ_CTX_nbio_d2i(rctx, pcert, ASN1_ITEM_rptr(X509))
557+
OSSL_HTTP_REQ_CTX_nbio_d2i(rctx, pcert, ASN1_ITEM_rptr(X509))
558558
# define X509_CRL_http_nbio(rctx, pcrl) \
559-
OCSP_REQ_CTX_nbio_d2i(rctx, pcrl, ASN1_ITEM_rptr(X509_CRL))
559+
OSSL_HTTP_REQ_CTX_nbio_d2i(rctx, pcrl, ASN1_ITEM_rptr(X509_CRL))
560560
# endif
561561

562562
# ifndef OPENSSL_NO_STDIO

0 commit comments

Comments
 (0)