Thanks, applied as 011684dd0bd5e265ec308a319acec10578ebc24f. Michael
[sent from post-receive hook] On Thu, 12 Sep 2024 14:12:15 +0200, Christian Melki <[email protected]> wrote: > Minor security fix release. > https://github.com/openssl/openssl/blob/master/CHANGES.md#openssl-33 > > Plugs CVEs: > CVE-2024-6119 - Possible denial of service in X.509 name checks > CVE-2024-5535 - SSL_select_next_proto buffer overread > > * OpenSSL moved permanently redirect to github. New releases > are not available any more at the old URLs. > Add yet another URL to github. > > * Forward patches. Applies cleanly with a slight > rework of offset. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/patches/openssl-3.3.1/0001-debian-targets.patch > b/patches/openssl-3.3.2/0001-debian-targets.patch > similarity index 100% > rename from patches/openssl-3.3.1/0001-debian-targets.patch > rename to patches/openssl-3.3.2/0001-debian-targets.patch > diff --git a/patches/openssl-3.3.1/0002-pic.patch > b/patches/openssl-3.3.2/0002-pic.patch > similarity index 100% > rename from patches/openssl-3.3.1/0002-pic.patch > rename to patches/openssl-3.3.2/0002-pic.patch > diff --git > a/patches/openssl-3.3.1/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch > > b/patches/openssl-3.3.2/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch > similarity index 93% > rename from > patches/openssl-3.3.1/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch > rename to > patches/openssl-3.3.2/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch > index 0c49d752ece0..561cca3b6987 100644 > --- > a/patches/openssl-3.3.1/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch > +++ > b/patches/openssl-3.3.2/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch > @@ -28,7 +28,7 @@ Signed-off-by: Michael Olbrich <[email protected]> > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf > -index c9db9aac28eb..d5ea4737494f 100644 > +index cba57b41273f..7fa3eeae412f 100644 > --- a/Configurations/10-main.conf > +++ b/Configurations/10-main.conf > @@ -693,7 +693,7 @@ my %targets = ( > @@ -41,10 +41,10 @@ index c9db9aac28eb..d5ea4737494f 100644 > "linux-latomic" => { > inherit_from => [ "linux-generic32" ], > diff --git a/Configure b/Configure > -index 3b6617c17719..eeb36812ae0f 100755 > +index 238152b2901b..3c7e04a082eb 100755 > --- a/Configure > +++ b/Configure > -@@ -1778,7 +1778,7 @@ unless ($disabled{devcryptoeng}) { > +@@ -1777,7 +1777,7 @@ unless ($disabled{devcryptoeng}) { > unless ($disabled{ktls}) { > $config{ktls}=""; > my $cc = $config{CROSS_COMPILE}.$config{CC}; > diff --git > a/patches/openssl-3.3.1/0004-conf-Serialize-allocation-free-of-ssl_names.patch > > b/patches/openssl-3.3.2/0004-conf-Serialize-allocation-free-of-ssl_names.patch > similarity index 100% > rename from > patches/openssl-3.3.1/0004-conf-Serialize-allocation-free-of-ssl_names.patch > rename to > patches/openssl-3.3.2/0004-conf-Serialize-allocation-free-of-ssl_names.patch > diff --git > a/patches/openssl-3.3.1/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch > > b/patches/openssl-3.3.2/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch > similarity index 100% > rename from > patches/openssl-3.3.1/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch > rename to > patches/openssl-3.3.2/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch > diff --git a/patches/openssl-3.3.1/series b/patches/openssl-3.3.2/series > similarity index 100% > rename from patches/openssl-3.3.1/series > rename to patches/openssl-3.3.2/series > diff --git a/rules/openssl.make b/rules/openssl.make > index 066437c9bb88..b8ca897ab58b 100644 > --- a/rules/openssl.make > +++ b/rules/openssl.make > @@ -16,11 +16,12 @@ PACKAGES-$(PTXCONF_OPENSSL) += openssl > # > # Paths and names > # > -OPENSSL_VERSION := 3.3.1 > -OPENSSL_MD5 := 8a4342b399c18f870ca6186299195984 > +OPENSSL_VERSION := 3.3.2 > +OPENSSL_MD5 := 015fca2692596560b6fe8a2d8fecd84b > OPENSSL := openssl-$(OPENSSL_VERSION) > OPENSSL_SUFFIX := tar.gz > OPENSSL_URL := \ > + > https://github.com/openssl/openssl/releases/download/$(OPENSSL)/$(OPENSSL).$(OPENSSL_SUFFIX) > \ > https://www.openssl.org/source/$(OPENSSL).$(OPENSSL_SUFFIX) \ > https://www.openssl.org/source/old/$(basename > $(OPENSSL_VERSION))/$(OPENSSL).$(OPENSSL_SUFFIX) > OPENSSL_SOURCE := $(SRCDIR)/$(OPENSSL).$(OPENSSL_SUFFIX)
