deps: upgrade openssl sources to quictls/openssl-3.0.14+quic1 · nodejs/node@48d643f · GitHub
Skip to content

Commit 48d643f

Browse files
nodejs-github-botmarco-ippolito
authored andcommitted
deps: upgrade openssl sources to quictls/openssl-3.0.14+quic1
PR-URL: #54336 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
1 parent d3441ff commit 48d643f

158 files changed

Lines changed: 2303 additions & 800 deletions

File tree

Some content is hidden

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

deps/openssl/openssl/CHANGES.md

Lines changed: 70 additions & 1 deletion

deps/openssl/openssl/CONTRIBUTING.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Development is done on GitHub in the [openssl/openssl] repository.
99

1010
[openssl/openssl]: <https://github.com/openssl/openssl>
1111

12-
To request new a feature, ask a question, or report a bug,
12+
To request a new feature, ask a question, or report a bug,
1313
please open an [issue on GitHub](https://github.com/openssl/openssl/issues).
1414

1515
To submit a patch or implement a new feature, please open a
@@ -67,7 +67,8 @@ guidelines:
6767
often. We do not accept merge commits, you will have to remove them
6868
(usually by rebasing) before it will be acceptable.
6969
70-
4. Code provided should follow our [coding style] and compile without warnings.
70+
4. Code provided should follow our [coding style] and [documentation policy]
71+
and compile without warnings.
7172
There is a [Perl tool](util/check-format.pl) that helps
7273
finding code formatting mistakes and other coding style nits.
7374
Where `gcc` or `clang` is available, you should use the
@@ -77,6 +78,7 @@ guidelines:
7778
whenever a PR is created or updated by committers.
7879
7980
[coding style]: https://www.openssl.org/policies/technical/coding-style.html
81+
[documentation policy]: https://openssl.org/policies/technical/documentation-policy.html
8082
8183
5. When at all possible, code contributions should include tests. These can
8284
either be added to an existing test, or completely new. Please see

deps/openssl/openssl/Configurations/10-main.conf

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,14 @@ my %targets = (
784784
asm_arch => 'aarch64',
785785
perlasm_scheme => "linux64",
786786
},
787-
787+
"linux-arm64ilp32-clang" => { # clang config abi by --target
788+
inherit_from => [ "linux-generic32" ],
789+
CC => "clang",
790+
CXX => "clang++",
791+
bn_ops => "SIXTY_FOUR_BIT RC4_CHAR",
792+
asm_arch => 'aarch64',
793+
perlasm_scheme => "linux64",
794+
},
788795
"linux-mips32" => {
789796
# Configure script adds minimally required -march for assembly
790797
# support, if no -march was specified at command line.

deps/openssl/openssl/Configurations/15-ios.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ my %targets = (
4949
#
5050
"iphoneos-cross" => {
5151
inherit_from => [ "ios-common" ],
52-
cflags => add("-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common"),
52+
cflags => add("-isysroot \"\$(CROSS_TOP)/SDKs/\$(CROSS_SDK)\" -fno-common"),
5353
},
5454
"ios-cross" => {
5555
inherit_from => [ "ios-xcrun" ],
5656
CC => "cc",
57-
cflags => add("-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK)"),
57+
cflags => add("-isysroot \"\$(CROSS_TOP)/SDKs/\$(CROSS_SDK)\""),
5858
},
5959
"ios64-cross" => {
6060
inherit_from => [ "ios64-xcrun" ],
6161
CC => "cc",
62-
cflags => add("-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK)"),
62+
cflags => add("-isysroot \"\$(CROSS_TOP)/SDKs/\$(CROSS_SDK)\""),
6363
},
6464
);

deps/openssl/openssl/Configurations/unix-Makefile.tmpl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
sub dependmagic {
2222
my $target = shift;
2323

24-
return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target";
24+
return "$target: build_generated\n\t\"\$(MAKE)\" depend && \"\$(MAKE)\" _$target\n_$target";
2525
}
2626

2727
our $COLUMNS = $ENV{COLUMNS};
@@ -527,7 +527,7 @@ all: build_sw build_docs
527527
528528
test: tests
529529
{- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep link-utils
530-
$(MAKE) run_tests
530+
"$(MAKE)" run_tests
531531
run_tests: FORCE
532532
@ : {- output_off() if $disabled{tests}; "" -}
533533
( SRCTOP=$(SRCDIR) \
@@ -542,7 +542,7 @@ run_tests: FORCE
542542
543543
list-tests:
544544
@ : {- output_off() if $disabled{tests}; "" -}
545-
$(MAKE) run_tests TESTS=list
545+
"$(MAKE)" run_tests TESTS=list
546546
@ : {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}
547547
@echo "Tests are not supported with your chosen Configure options"
548548
@ : {- output_on() if !$disabled{tests}; "" -}
@@ -1193,12 +1193,12 @@ providers/fips.module.sources.new: configdata.pm
11931193
cd sources-tmp \
11941194
&& $$srcdir/Configure --banner=Configured enable-fips -O0 \
11951195
&& ./configdata.pm --query 'get_sources("providers/fips")' > sources1 \
1196-
&& $(MAKE) -sj 4 build_generated providers/fips.so \
1196+
&& "$(MAKE)" -sj 4 build_generated providers/fips.so \
11971197
&& find . -name '*.d' | xargs cat > dep1 \
1198-
&& $(MAKE) distclean \
1198+
&& "$(MAKE)" distclean \
11991199
&& $$srcdir/Configure --banner=Configured enable-fips no-asm -O0 \
12001200
&& ./configdata.pm --query 'get_sources("providers/fips")' > sources2 \
1201-
&& $(MAKE) -sj 4 build_generated providers/fips.so \
1201+
&& "$(MAKE)" -sj 4 build_generated providers/fips.so \
12021202
&& find . -name '*.d' | xargs cat > dep2 \
12031203
&& cat sources1 sources2 \
12041204
| grep -v ' : \\$$' | grep -v util/providers.num \
@@ -1332,7 +1332,7 @@ ordinals: build_generated
13321332
$(SSLHEADERS)
13331333
13341334
test_ordinals:
1335-
$(MAKE) run_tests TESTS=test_ordinals
1335+
"$(MAKE)" run_tests TESTS=test_ordinals
13361336
13371337
tags TAGS: FORCE
13381338
rm -f TAGS tags

deps/openssl/openssl/Configure

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /usr/bin/env perl
22
# -*- mode: perl; -*-
3-
# Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved.
3+
# Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved.
44
#
55
# Licensed under the Apache License 2.0 (the "License"). You may not use
66
# this file except in compliance with the License. You can obtain a copy
@@ -405,6 +405,7 @@ my @disablables = (
405405
"asan",
406406
"asm",
407407
"async",
408+
"atexit",
408409
"autoalginit",
409410
"autoerrinit",
410411
"autoload-config",

deps/openssl/openssl/FAQ.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

deps/openssl/openssl/INSTALL.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ Setting the FIPS HMAC key
480480

481481
As part of its self-test validation, the FIPS module must verify itself
482482
by performing a SHA-256 HMAC computation on itself. The default key is
483-
the SHA256 value of "the holy handgrenade of antioch" and is sufficient
483+
the SHA256 value of "holy hand grenade of antioch" and is sufficient
484484
for meeting the FIPS requirements.
485485

486486
To change the key to a different value, use this flag. The value should
@@ -546,6 +546,13 @@ be used even with this option.
546546

547547
Do not build support for async operations.
548548

549+
### no-atexit
550+
551+
Do not use `atexit()` in libcrypto builds.
552+
553+
`atexit()` has varied semantics between platforms and can cause SIGSEGV in some
554+
circumstances. This option disables the atexit registration of OPENSSL_cleanup.
555+
549556
### no-autoalginit
550557

551558
Don't automatically load all supported ciphers and digests.

deps/openssl/openssl/NEWS.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,18 @@ OpenSSL Releases
1818
OpenSSL 3.0
1919
-----------
2020

21+
### Major changes between OpenSSL 3.0.13 and OpenSSL 3.0.14 [4 Jun 2024]
22+
23+
* Fixed potential use after free after SSL_free_buffers() is called
24+
([CVE-2024-4741])
25+
26+
* Fixed an issue where checking excessively long DSA keys or parameters may
27+
be very slow
28+
([CVE-2024-4603])
29+
30+
* Fixed unbounded memory growth with session handling in TLSv1.3
31+
([CVE-2024-2511])
32+
2133
### Major changes between OpenSSL 3.0.12 and OpenSSL 3.0.13 [30 Jan 2024]
2234

2335
* Fixed PKCS12 Decoding crashes
@@ -1470,6 +1482,9 @@ OpenSSL 0.9.x
14701482

14711483
<!-- Links -->
14721484

1485+
[CVE-2024-4741]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-4741
1486+
[CVE-2024-4603]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-4603
1487+
[CVE-2024-2511]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-2511
14731488
[CVE-2024-0727]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-0727
14741489
[CVE-2023-6237]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-6237
14751490
[CVE-2023-6129]: https://www.openssl.org/news/vulnerabilities.html#CVE-2023-6129

deps/openssl/openssl/NOTES-NONSTOP.md

Lines changed: 4 additions & 1 deletion

0 commit comments

Comments
 (0)