* [ptxdist] [PATCH] openssl: Version bump. 3.1.2 -> 3.1.3
@ 2023-09-20 18:43 Christian Melki
2023-09-24 5:44 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2023-09-20 18:43 UTC (permalink / raw)
To: ptxdist
Minor changes.
https://github.com/openssl/openssl/compare/openssl-3.1.2...openssl-3.1.3
Plugs CVE:
CVE-2023-4807: POLY1305 MAC implementation corrupts XMM registers on Windows
* Forward port patches with line fixes. Applies cleanly.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
.../0001-debian-targets.patch | 0
patches/{openssl-3.1.2 => openssl-3.1.3}/0002-pic.patch | 0
...igure-allow-to-enable-ktls-if-target-does-not-st.patch | 8 ++++----
...0004-conf-Serialize-allocation-free-of-ssl_names.patch | 0
...igure-drop-fzero-call-used-regs-used-gpr-from-De.patch | 0
patches/{openssl-3.1.2 => openssl-3.1.3}/series | 0
rules/openssl.make | 4 ++--
7 files changed, 6 insertions(+), 6 deletions(-)
rename patches/{openssl-3.1.2 => openssl-3.1.3}/0001-debian-targets.patch (100%)
rename patches/{openssl-3.1.2 => openssl-3.1.3}/0002-pic.patch (100%)
rename patches/{openssl-3.1.2 => openssl-3.1.3}/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch (92%)
rename patches/{openssl-3.1.2 => openssl-3.1.3}/0004-conf-Serialize-allocation-free-of-ssl_names.patch (100%)
rename patches/{openssl-3.1.2 => openssl-3.1.3}/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch (100%)
rename patches/{openssl-3.1.2 => openssl-3.1.3}/series (100%)
diff --git a/patches/openssl-3.1.2/0001-debian-targets.patch b/patches/openssl-3.1.3/0001-debian-targets.patch
similarity index 100%
rename from patches/openssl-3.1.2/0001-debian-targets.patch
rename to patches/openssl-3.1.3/0001-debian-targets.patch
diff --git a/patches/openssl-3.1.2/0002-pic.patch b/patches/openssl-3.1.3/0002-pic.patch
similarity index 100%
rename from patches/openssl-3.1.2/0002-pic.patch
rename to patches/openssl-3.1.3/0002-pic.patch
diff --git a/patches/openssl-3.1.2/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch b/patches/openssl-3.1.3/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch
similarity index 92%
rename from patches/openssl-3.1.2/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch
rename to patches/openssl-3.1.3/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch
index 5d0181e23..60e2da3ef 100644
--- a/patches/openssl-3.1.2/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch
+++ b/patches/openssl-3.1.3/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch
@@ -28,10 +28,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
-index 8f8ac322887f..4ee919347f43 100644
+index aedfa370ca15..dfc3a431559a 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
-@@ -697,7 +697,7 @@ my %targets = (
+@@ -700,7 +700,7 @@ my %targets = (
shared_target => "linux-shared",
shared_cflag => "-fPIC",
shared_ldflag => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" },
@@ -41,10 +41,10 @@ index 8f8ac322887f..4ee919347f43 100644
"linux-latomic" => {
inherit_from => [ "linux-generic32" ],
diff --git a/Configure b/Configure
-index ab57c20737a5..9409137c92df 100755
+index 227e5daea228..e1531d59e517 100755
--- a/Configure
+++ b/Configure
-@@ -1702,7 +1702,7 @@ unless ($disabled{devcryptoeng}) {
+@@ -1699,7 +1699,7 @@ unless ($disabled{devcryptoeng}) {
unless ($disabled{ktls}) {
$config{ktls}="";
my $cc = $config{CROSS_COMPILE}.$config{CC};
diff --git a/patches/openssl-3.1.2/0004-conf-Serialize-allocation-free-of-ssl_names.patch b/patches/openssl-3.1.3/0004-conf-Serialize-allocation-free-of-ssl_names.patch
similarity index 100%
rename from patches/openssl-3.1.2/0004-conf-Serialize-allocation-free-of-ssl_names.patch
rename to patches/openssl-3.1.3/0004-conf-Serialize-allocation-free-of-ssl_names.patch
diff --git a/patches/openssl-3.1.2/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch b/patches/openssl-3.1.3/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch
similarity index 100%
rename from patches/openssl-3.1.2/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch
rename to patches/openssl-3.1.3/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch
diff --git a/patches/openssl-3.1.2/series b/patches/openssl-3.1.3/series
similarity index 100%
rename from patches/openssl-3.1.2/series
rename to patches/openssl-3.1.3/series
diff --git a/rules/openssl.make b/rules/openssl.make
index 598771f60..f368868be 100644
--- a/rules/openssl.make
+++ b/rules/openssl.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_OPENSSL) += openssl
#
# Paths and names
#
-OPENSSL_VERSION := 3.1.2
-OPENSSL_MD5 := 1d7861f969505e67b8677e205afd9ff4
+OPENSSL_VERSION := 3.1.3
+OPENSSL_MD5 := ece430df6d3158913df0950cc70ea2b2
OPENSSL := openssl-$(OPENSSL_VERSION)
OPENSSL_SUFFIX := tar.gz
OPENSSL_URL := \
--
2.34.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] openssl: Version bump. 3.1.2 -> 3.1.3
2023-09-20 18:43 [ptxdist] [PATCH] openssl: Version bump. 3.1.2 -> 3.1.3 Christian Melki
@ 2023-09-24 5:44 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2023-09-24 5:44 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 256edf9ccb7ec25d660e69cc4b99e43ab5b5c2a6.
Michael
[sent from post-receive hook]
On Sun, 24 Sep 2023 07:44:53 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Minor changes.
> https://github.com/openssl/openssl/compare/openssl-3.1.2...openssl-3.1.3
>
> Plugs CVE:
> CVE-2023-4807: POLY1305 MAC implementation corrupts XMM registers on Windows
>
> * Forward port patches with line fixes. Applies cleanly.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20230920184349.3919968-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/openssl-3.1.2/0001-debian-targets.patch b/patches/openssl-3.1.3/0001-debian-targets.patch
> similarity index 100%
> rename from patches/openssl-3.1.2/0001-debian-targets.patch
> rename to patches/openssl-3.1.3/0001-debian-targets.patch
> diff --git a/patches/openssl-3.1.2/0002-pic.patch b/patches/openssl-3.1.3/0002-pic.patch
> similarity index 100%
> rename from patches/openssl-3.1.2/0002-pic.patch
> rename to patches/openssl-3.1.3/0002-pic.patch
> diff --git a/patches/openssl-3.1.2/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch b/patches/openssl-3.1.3/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch
> similarity index 92%
> rename from patches/openssl-3.1.2/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch
> rename to patches/openssl-3.1.3/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch
> index 5d0181e23857..60e2da3efec3 100644
> --- a/patches/openssl-3.1.2/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch
> +++ b/patches/openssl-3.1.3/0003-Configure-allow-to-enable-ktls-if-target-does-not-st.patch
> @@ -28,10 +28,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
> -index 8f8ac322887f..4ee919347f43 100644
> +index aedfa370ca15..dfc3a431559a 100644
> --- a/Configurations/10-main.conf
> +++ b/Configurations/10-main.conf
> -@@ -697,7 +697,7 @@ my %targets = (
> +@@ -700,7 +700,7 @@ my %targets = (
> shared_target => "linux-shared",
> shared_cflag => "-fPIC",
> shared_ldflag => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" },
> @@ -41,10 +41,10 @@ index 8f8ac322887f..4ee919347f43 100644
> "linux-latomic" => {
> inherit_from => [ "linux-generic32" ],
> diff --git a/Configure b/Configure
> -index ab57c20737a5..9409137c92df 100755
> +index 227e5daea228..e1531d59e517 100755
> --- a/Configure
> +++ b/Configure
> -@@ -1702,7 +1702,7 @@ unless ($disabled{devcryptoeng}) {
> +@@ -1699,7 +1699,7 @@ unless ($disabled{devcryptoeng}) {
> unless ($disabled{ktls}) {
> $config{ktls}="";
> my $cc = $config{CROSS_COMPILE}.$config{CC};
> diff --git a/patches/openssl-3.1.2/0004-conf-Serialize-allocation-free-of-ssl_names.patch b/patches/openssl-3.1.3/0004-conf-Serialize-allocation-free-of-ssl_names.patch
> similarity index 100%
> rename from patches/openssl-3.1.2/0004-conf-Serialize-allocation-free-of-ssl_names.patch
> rename to patches/openssl-3.1.3/0004-conf-Serialize-allocation-free-of-ssl_names.patch
> diff --git a/patches/openssl-3.1.2/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch b/patches/openssl-3.1.3/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch
> similarity index 100%
> rename from patches/openssl-3.1.2/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch
> rename to patches/openssl-3.1.3/0005-Configure-drop-fzero-call-used-regs-used-gpr-from-De.patch
> diff --git a/patches/openssl-3.1.2/series b/patches/openssl-3.1.3/series
> similarity index 100%
> rename from patches/openssl-3.1.2/series
> rename to patches/openssl-3.1.3/series
> diff --git a/rules/openssl.make b/rules/openssl.make
> index 598771f6001b..f368868be0e9 100644
> --- a/rules/openssl.make
> +++ b/rules/openssl.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_OPENSSL) += openssl
> #
> # Paths and names
> #
> -OPENSSL_VERSION := 3.1.2
> -OPENSSL_MD5 := 1d7861f969505e67b8677e205afd9ff4
> +OPENSSL_VERSION := 3.1.3
> +OPENSSL_MD5 := ece430df6d3158913df0950cc70ea2b2
> OPENSSL := openssl-$(OPENSSL_VERSION)
> OPENSSL_SUFFIX := tar.gz
> OPENSSL_URL := \
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-24 5:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-20 18:43 [ptxdist] [PATCH] openssl: Version bump. 3.1.2 -> 3.1.3 Christian Melki
2023-09-24 5:44 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox