Skip to content

Commit 3361921

Browse files
hassaanphassaanp
committed
deps: update archs files for quictls/openssl-3.0.2+quic
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
1 parent e06c733 commit 3361921

File tree

601 files changed

+3887
-1607
lines changed

Some content is hidden

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

601 files changed

+3887
-1607
lines changed

‎deps/openssl/config/archs/BSD-x86/asm/apps/progs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by apps/progs.pl
44
*
5-
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
66
*
77
* Licensed under the Apache License 2.0 (the "License"). You may not use
88
* this file except in compliance with the License. You can obtain a copy

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

+40-12
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.1+quic",
159+
"full_version" => "3.0.2+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" => "1",
206+
"patch" => "2",
207207
"perl_archname" => "x86_64-linux-gnu-thread-multi",
208208
"perl_cmd" => "/usr/bin/perl",
209-
"perl_version" => "5.30.0",
209+
"perl_version" => "5.28.1",
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" => "14 Dec 2021",
258+
"release_date" => "15 Mar 2022",
259259
"shlib_version" => "81.3",
260260
"sourcedir" => ".",
261261
"target" => "BSD-x86",
262-
"version" => "3.0.1"
262+
"version" => "3.0.2"
263263
);
264264
our %target = (
265265
"AR" => "ar",
@@ -3556,6 +3556,9 @@ our %unified_info = (
35563556
"doc/html/man3/SSL_get_all_async_fds.html" => [
35573557
"doc/man3/SSL_get_all_async_fds.pod"
35583558
],
3559+
"doc/html/man3/SSL_get_certificate.html" => [
3560+
"doc/man3/SSL_get_certificate.pod"
3561+
],
35593562
"doc/html/man3/SSL_get_ciphers.html" => [
35603563
"doc/man3/SSL_get_ciphers.pod"
35613564
],
@@ -3655,6 +3658,9 @@ our %unified_info = (
36553658
"doc/html/man3/SSL_set_fd.html" => [
36563659
"doc/man3/SSL_set_fd.pod"
36573660
],
3661+
"doc/html/man3/SSL_set_retry_verify.html" => [
3662+
"doc/man3/SSL_set_retry_verify.pod"
3663+
],
36583664
"doc/html/man3/SSL_set_session.html" => [
36593665
"doc/man3/SSL_set_session.pod"
36603666
],
@@ -5893,6 +5899,9 @@ our %unified_info = (
58935899
"doc/man/man3/SSL_get_all_async_fds.3" => [
58945900
"doc/man3/SSL_get_all_async_fds.pod"
58955901
],
5902+
"doc/man/man3/SSL_get_certificate.3" => [
5903+
"doc/man3/SSL_get_certificate.pod"
5904+
],
58965905
"doc/man/man3/SSL_get_ciphers.3" => [
58975906
"doc/man3/SSL_get_ciphers.pod"
58985907
],
@@ -5992,6 +6001,9 @@ our %unified_info = (
59926001
"doc/man/man3/SSL_set_fd.3" => [
59936002
"doc/man3/SSL_set_fd.pod"
59946003
],
6004+
"doc/man/man3/SSL_set_retry_verify.3" => [
6005+
"doc/man3/SSL_set_retry_verify.pod"
6006+
],
59956007
"doc/man/man3/SSL_set_session.3" => [
59966008
"doc/man3/SSL_set_session.pod"
59976009
],
@@ -9729,10 +9741,10 @@ our %unified_info = (
97299741
},
97309742
"providers/fips" => {
97319743
"deps" => [
9744+
"providers/fips/fips-dso-fips_entry.o",
97329745
"providers/fips/libfips-lib-fipsprov.o",
97339746
"providers/fips/libfips-lib-self_test.o",
9734-
"providers/fips/libfips-lib-self_test_kats.o",
9735-
"providers/fips/fips-dso-fips_entry.o"
9747+
"providers/fips/libfips-lib-self_test_kats.o"
97369748
],
97379749
"products" => {
97389750
"dso" => [
@@ -12458,6 +12470,9 @@ our %unified_info = (
1245812470
"doc/html/man3/SSL_get_all_async_fds.html" => [
1245912471
"doc/man3/SSL_get_all_async_fds.pod"
1246012472
],
12473+
"doc/html/man3/SSL_get_certificate.html" => [
12474+
"doc/man3/SSL_get_certificate.pod"
12475+
],
1246112476
"doc/html/man3/SSL_get_ciphers.html" => [
1246212477
"doc/man3/SSL_get_ciphers.pod"
1246312478
],
@@ -12557,6 +12572,9 @@ our %unified_info = (
1255712572
"doc/html/man3/SSL_set_fd.html" => [
1255812573
"doc/man3/SSL_set_fd.pod"
1255912574
],
12575+
"doc/html/man3/SSL_set_retry_verify.html" => [
12576+
"doc/man3/SSL_set_retry_verify.pod"
12577+
],
1256012578
"doc/html/man3/SSL_set_session.html" => [
1256112579
"doc/man3/SSL_set_session.pod"
1256212580
],
@@ -14795,6 +14813,9 @@ our %unified_info = (
1479514813
"doc/man/man3/SSL_get_all_async_fds.3" => [
1479614814
"doc/man3/SSL_get_all_async_fds.pod"
1479714815
],
14816+
"doc/man/man3/SSL_get_certificate.3" => [
14817+
"doc/man3/SSL_get_certificate.pod"
14818+
],
1479814819
"doc/man/man3/SSL_get_ciphers.3" => [
1479914820
"doc/man3/SSL_get_ciphers.pod"
1480014821
],
@@ -14894,6 +14915,9 @@ our %unified_info = (
1489414915
"doc/man/man3/SSL_set_fd.3" => [
1489514916
"doc/man3/SSL_set_fd.pod"
1489614917
],
14918+
"doc/man/man3/SSL_set_retry_verify.3" => [
14919+
"doc/man3/SSL_set_retry_verify.pod"
14920+
],
1489714921
"doc/man/man3/SSL_set_session.3" => [
1489814922
"doc/man3/SSL_set_session.pod"
1489914923
],
@@ -16633,6 +16657,7 @@ our %unified_info = (
1663316657
"doc/html/man3/SSL_get0_peer_scts.html",
1663416658
"doc/html/man3/SSL_get_SSL_CTX.html",
1663516659
"doc/html/man3/SSL_get_all_async_fds.html",
16660+
"doc/html/man3/SSL_get_certificate.html",
1663616661
"doc/html/man3/SSL_get_ciphers.html",
1663716662
"doc/html/man3/SSL_get_client_random.html",
1663816663
"doc/html/man3/SSL_get_current_cipher.html",
@@ -16666,6 +16691,7 @@ our %unified_info = (
1666616691
"doc/html/man3/SSL_set_bio.html",
1666716692
"doc/html/man3/SSL_set_connect_state.html",
1666816693
"doc/html/man3/SSL_set_fd.html",
16694+
"doc/html/man3/SSL_set_retry_verify.html",
1666916695
"doc/html/man3/SSL_set_session.html",
1667016696
"doc/html/man3/SSL_set_shutdown.html",
1667116697
"doc/html/man3/SSL_set_verify_result.html",
@@ -19566,6 +19592,7 @@ our %unified_info = (
1956619592
"doc/man/man3/SSL_get0_peer_scts.3",
1956719593
"doc/man/man3/SSL_get_SSL_CTX.3",
1956819594
"doc/man/man3/SSL_get_all_async_fds.3",
19595+
"doc/man/man3/SSL_get_certificate.3",
1956919596
"doc/man/man3/SSL_get_ciphers.3",
1957019597
"doc/man/man3/SSL_get_client_random.3",
1957119598
"doc/man/man3/SSL_get_current_cipher.3",
@@ -19599,6 +19626,7 @@ our %unified_info = (
1959919626
"doc/man/man3/SSL_set_bio.3",
1960019627
"doc/man/man3/SSL_set_connect_state.3",
1960119628
"doc/man/man3/SSL_set_fd.3",
19629+
"doc/man/man3/SSL_set_retry_verify.3",
1960219630
"doc/man/man3/SSL_set_session.3",
1960319631
"doc/man/man3/SSL_set_shutdown.3",
1960419632
"doc/man/man3/SSL_set_verify_result.3",
@@ -27262,8 +27290,8 @@ unless (caller) {
2726227290
use File::Copy;
2726327291
use Pod::Usage;
2726427292

27265-
use lib '/node/deps/openssl/openssl/util/perl';
27266-
use OpenSSL::fallback '/node/deps/openssl/openssl/external/perl/MODULES.txt';
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';
2726727295

2726827296
my $here = dirname($0);
2726927297

@@ -27290,7 +27318,7 @@ unless (caller) {
2729027318
);
2729127319

2729227320
use lib '.';
27293-
use lib '/node/deps/openssl/openssl/Configurations';
27321+
use lib '/home/hassaan/node/deps/openssl/openssl/Configurations';
2729427322
use gentemplate;
2729527323

2729627324
print 'Creating ',$buildfile_template,"\n";
@@ -27307,8 +27335,8 @@ unless (caller) {
2730727335

2730827336
my $prepend = <<'_____';
2730927337
use File::Spec::Functions;
27310-
use lib '/node/deps/openssl/openssl/util/perl';
27311-
use lib '/node/deps/openssl/openssl/Configurations';
27338+
use lib '/home/hassaan/node/deps/openssl/openssl/util/perl';
27339+
use lib '/home/hassaan/node/deps/openssl/openssl/Configurations';
2731227340
use lib '.';
2731327341
use platform;
2731427342
_____

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

+1-1
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: Tue Dec 14 22:49:16 2021 UTC"
14+
#define DATE "built on: Wed Mar 16 04:51:37 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/bio.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by Makefile from include/openssl/bio.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
*
77
* Licensed under the Apache License 2.0 (the "License"). You may not use
88
* this file except in compliance with the License. You can obtain a copy
@@ -208,6 +208,8 @@ extern "C" {
208208
# define BIO_FLAGS_NONCLEAR_RST 0x400
209209
# define BIO_FLAGS_IN_EOF 0x800
210210

211+
/* the BIO FLAGS values 0x1000 to 0x4000 are reserved for internal KTLS flags */
212+
211213
typedef union bio_addr_st BIO_ADDR;
212214
typedef struct bio_addrinfo_st BIO_ADDRINFO;
213215

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by Makefile from include/openssl/crypto.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
@@ -124,7 +124,7 @@ int CRYPTO_atomic_load(uint64_t *val, uint64_t *ret, CRYPTO_RWLOCK *lock);
124124
size_t OPENSSL_strlcpy(char *dst, const char *src, size_t siz);
125125
size_t OPENSSL_strlcat(char *dst, const char *src, size_t siz);
126126
size_t OPENSSL_strnlen(const char *str, size_t maxlen);
127-
int OPENSSL_buf2hexstr_ex(char *str, size_t str_n, size_t *strlen,
127+
int OPENSSL_buf2hexstr_ex(char *str, size_t str_n, size_t *strlength,
128128
const unsigned char *buf, size_t buflen,
129129
const char sep);
130130
char *OPENSSL_buf2hexstr(const unsigned char *buf, long buflen);

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

+5-5
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 1
32+
# define OPENSSL_VERSION_PATCH 2
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.1"
78-
# define OPENSSL_FULL_VERSION_STR "3.0.1+quic"
77+
# define OPENSSL_VERSION_STR "3.0.2"
78+
# define OPENSSL_FULL_VERSION_STR "3.0.2+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 "14 Dec 2021"
85+
# define OPENSSL_RELEASE_DATE "15 Mar 2022"
8686

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

91-
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.1+quic 14 Dec 2021"
91+
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.2+quic 15 Mar 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

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by Makefile from include/openssl/ssl.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
* Copyright 2005 Nokia. All rights reserved.
88
*
@@ -1380,6 +1380,7 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
13801380
# define SSL_CTRL_GET_SIGNATURE_NID 132
13811381
# define SSL_CTRL_GET_TMP_KEY 133
13821382
# define SSL_CTRL_GET_NEGOTIATED_GROUP 134
1383+
# define SSL_CTRL_SET_RETRY_VERIFY 136
13831384
# define SSL_CERT_SET_FIRST 1
13841385
# define SSL_CERT_SET_NEXT 2
13851386
# define SSL_CERT_SET_SERVER 3
@@ -2202,6 +2203,8 @@ __owur int SSL_get_ex_data_X509_STORE_CTX_idx(void);
22022203
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_MAX_PIPELINES,m,NULL)
22032204
# define SSL_set_max_pipelines(ssl,m) \
22042205
SSL_ctrl(ssl,SSL_CTRL_SET_MAX_PIPELINES,m,NULL)
2206+
# define SSL_set_retry_verify(ssl) \
2207+
(SSL_ctrl(ssl,SSL_CTRL_SET_RETRY_VERIFY,0,NULL) > 0)
22052208

22062209
void SSL_CTX_set_default_read_buffer_len(SSL_CTX *ctx, size_t len);
22072210
void SSL_set_default_read_buffer_len(SSL *s, size_t len);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by apps/progs.pl
44
*
5-
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
66
*
77
* Licensed under the Apache License 2.0 (the "License"). You may not use
88
* this file except in compliance with the License. You can obtain a copy

‎deps/openssl/config/archs/BSD-x86/asm_avx2/apps/progs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by apps/progs.pl
44
*
5-
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
66
*
77
* Licensed under the Apache License 2.0 (the "License"). You may not use
88
* this file except in compliance with the License. You can obtain a copy

0 commit comments

Comments
 (0)