rpms/libreswan
6
0
Fork 0
Code Issues Pull Requests Releases Activity

showhostkey: fix regression after RHEL-68047

Browse Source 
Resolves: RHEL-70842
Signed-off-by: Daiki Ueno <dueno@redhat.com>
This commit is contained in:
Daiki Ueno 2025-01-14 21:37:32 +09:00
parent 94e69a2eea
commit 80133d96b9
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libreswan-4.15-rereadsecrets.patch
View File

@ -1,4 +1,4 @@
From 7ed158f258e544854e793fa6bd02e86d008f1b92 Mon Sep 17 00:00:00 2001 From 5d20ce318199d3d525c8503ffc3242a90117a944 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <dueno@redhat.com> From: Daiki Ueno <dueno@redhat.com>
Date: Sat, 23 Nov 2024 10:18:03 +0900 Date: Sat, 23 Nov 2024 10:18:03 +0900
Subject: [PATCH 1/2] secrets: allocate secret_pubkey_stuff separately from Subject: [PATCH 1/2] secrets: allocate secret_pubkey_stuff separately from
@ -13,8 +13,8 @@ Signed-off-by: Daiki Ueno <dueno@redhat.com>
lib/libswan/secrets.c | 32 ++++++++++--------- lib/libswan/secrets.c | 32 ++++++++++---------
programs/pluto/ikev2_eap.c | 2 +- programs/pluto/ikev2_eap.c | 2 +-
programs/pluto/keys.c | 6 ++-- programs/pluto/keys.c | 6 ++--
programs/showhostkey/showhostkey.c | 31 ++++++++++-------- programs/showhostkey/showhostkey.c | 32 +++++++++++--------
8 files changed, 55 insertions(+), 50 deletions(-) 8 files changed, 56 insertions(+), 50 deletions(-)
diff --git a/include/secrets.h b/include/secrets.h diff --git a/include/secrets.h b/include/secrets.h
index 971f559da7..38906bf6ba 100644 index 971f559da7..38906bf6ba 100644
@ -320,7 +320,7 @@ index 81e506556a..37f2408ae3 100644
c->name, type->name); c->name, type->name);
return pks; return pks;
diff --git a/programs/showhostkey/showhostkey.c b/programs/showhostkey/showhostkey.c diff --git a/programs/showhostkey/showhostkey.c b/programs/showhostkey/showhostkey.c
index 8f40b67a62..d873177068 100644 index 8f40b67a62..7b003365dd 100644
--- a/programs/showhostkey/showhostkey.c --- a/programs/showhostkey/showhostkey.c
+++ b/programs/showhostkey/showhostkey.c +++ b/programs/showhostkey/showhostkey.c
@@ -172,14 +172,14 @@ static void print(struct secret_stuff *pks, @@ -172,14 +172,14 @@ static void print(struct secret_stuff *pks,
@ -404,7 +404,7 @@ index 8f40b67a62..d873177068 100644
.kind = type->private_key_kind, .kind = type->private_key_kind,
.line = 0, .line = 0,
- .u.pubkey.private_key = SECKEY_CopyPrivateKey(private_key), /* add reference */ - .u.pubkey.private_key = SECKEY_CopyPrivateKey(private_key), /* add reference */
+ .u.pubkey = &pubkey, + .u.pubkey = clone_thing(pubkey, "pubkey"),
}; };
- type->extract_pubkey_content(&pks.u.pubkey.content, pubk, ckaid_nss); - type->extract_pubkey_content(&pks.u.pubkey.content, pubk, ckaid_nss);
@ -412,7 +412,7 @@ index 8f40b67a62..d873177068 100644
/* /*
* Only count private keys that get processed. * Only count private keys that get processed.
*/ */
@@ -513,8 +516,8 @@ static struct secret_stuff *foreach_nss_private_key(secret_eval func, @@ -513,8 +516,9 @@ static struct secret_stuff *foreach_nss_private_key(secret_eval func,
break; break;
} }
@ -420,14 +420,15 @@ index 8f40b67a62..d873177068 100644
- type->free_pubkey_content(&pks.u.pubkey.content); - type->free_pubkey_content(&pks.u.pubkey.content);
+ SECKEY_DestroyPrivateKey(pks.u.pubkey->private_key); /* destory reference */ + SECKEY_DestroyPrivateKey(pks.u.pubkey->private_key); /* destory reference */
+ type->free_pubkey_content(&pks.u.pubkey->content); + type->free_pubkey_content(&pks.u.pubkey->content);
+ pfreeany(pks.u.pubkey);
if (ret < 0) { if (ret < 0) {
break; break;
-- --
2.47.0 2.47.1
From 8f0fc5ccf7f770e027f8266f7f825a24f88f150e Mon Sep 17 00:00:00 2001 From b4102e2243a6513897502113dfbf90fc4ff36323 Mon Sep 17 00:00:00 2001
From: Andrew Cagney <cagney@gnu.org> From: Andrew Cagney <cagney@gnu.org>
Date: Fri, 8 Nov 2024 17:45:53 -0500 Date: Fri, 8 Nov 2024 17:45:53 -0500
Subject: [PATCH 2/2] crypto: refcnt struct secret_pubkey_stuff when passing to Subject: [PATCH 2/2] crypto: refcnt struct secret_pubkey_stuff when passing to
@ -589,5 +590,5 @@ index 388f57c611..08edf412ee 100644
pfreeany(*task); pfreeany(*task);
} }
-- --
2.47.0 2.47.1

5
libreswan.spec
View File

@ -31,7 +31,7 @@ Name: libreswan
Summary: Internet Key Exchange (IKEv1 and IKEv2) implementation for IPsec Summary: Internet Key Exchange (IKEv1 and IKEv2) implementation for IPsec
# version is generated in the release script # version is generated in the release script
Version: 4.15 Version: 4.15
Release: %{?prever:0.}7%{?prever:.%{prever}}%{?dist} Release: %{?prever:0.}8%{?prever:.%{prever}}%{?dist}
License: GPLv2 License: GPLv2
Url: https://libreswan.org/ Url: https://libreswan.org/
Source0: https://download.libreswan.org/%{?prever:development/}%{name}-%{version}%{?prever}.tar.gz Source0: https://download.libreswan.org/%{?prever:development/}%{name}-%{version}%{?prever}.tar.gz
@ -200,6 +200,9 @@ certutil -N -d sql:$tmpdir --empty-password
%doc %{_mandir}/*/* %doc %{_mandir}/*/*
%changelog %changelog
* Tue Jan 14 2025 Daiki Ueno <dueno@redhat.com> - 4.15-8
- showhostkey: fix regression after RHEL-68047 (RHEL-70842)
* Tue Dec 17 2024 Daiki Ueno <dueno@redhat.com> - 4.15-7 * Tue Dec 17 2024 Daiki Ueno <dueno@redhat.com> - 4.15-7
- Remove libreswan-4.15-whack-fd-refcount.patch (RHEL-61461) - Remove libreswan-4.15-whack-fd-refcount.patch (RHEL-61461)