diff --git a/CVE-2022-23094.patch b/CVE-2022-23094.patch deleted file mode 100644 index 8ad5e67f5b511992a4b584e2fc224a49876d3d05..0000000000000000000000000000000000000000 --- a/CVE-2022-23094.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/programs/pluto/ikev1.c b/programs/pluto/ikev1.c -index 9f4847874d..f7413f3594 100644 ---- a/programs/pluto/ikev1.c -+++ b/programs/pluto/ikev1.c -@@ -2103,7 +2103,9 @@ void process_packet_tail(struct msg_digest *md) - diag_t d = pbs_in_struct(&md->message_pbs, &isakmp_ignore_desc, - &pd->payload, sizeof(pd->payload), &pd->pbs); - if (d != NULL) { -- llog_diag(RC_LOG, st->st_logger, &d, "%s", ""); -+ llog_diag(RC_LOG, -+ st != NULL ? st->st_logger : md->md_logger, -+ &d, "%s", ""); - LOG_PACKET(RC_LOG_SERIOUS, - "%smalformed payload in packet", - excuse); -@@ -2172,7 +2174,9 @@ void process_packet_tail(struct msg_digest *md) - &pd->payload, sizeof(pd->payload), - &pd->pbs); - if (d != NULL) { -- llog_diag(RC_LOG, st->st_logger, &d, "%s", ""); -+ llog_diag(RC_LOG, -+ st != NULL ? st->st_logger : md->md_logger, -+ &d, "%s", ""); - LOG_PACKET(RC_LOG_SERIOUS, - "%smalformed payload in packet", - excuse); diff --git a/CVE-2023-23009.patch b/CVE-2023-23009.patch deleted file mode 100644 index 65d64d38e82923340159f650644e29b4e158724d..0000000000000000000000000000000000000000 --- a/CVE-2023-23009.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/programs/pluto/ikev2_ts.c b/programs/pluto/ikev2_ts.c -index 3f7519ca38..f06c40ba46 100644 ---- a/programs/pluto/ikev2_ts.c -+++ b/programs/pluto/ikev2_ts.c -@@ -437,6 +437,11 @@ static bool v2_parse_tss(struct payload_digest *const ts_pd, - d = pbs_in_struct(&ts_pd->pbs, &ikev2_ts_header_desc, - &ts_h, sizeof(ts_h), &ts_body_pbs); - -+ if (d != NULL) { -+ llog_diag(RC_LOG, logger, &d, "%s", ""); -+ return false; -+ } -+ - switch (ts_h.isath_type) { - case IKEv2_TS_IPV4_ADDR_RANGE: - case IKEv2_TS_IPV6_ADDR_RANGE: diff --git a/libreswan-4.5.tar.gz b/libreswan-4.11.tar.gz similarity index 32% rename from libreswan-4.5.tar.gz rename to libreswan-4.11.tar.gz index 9201095512940a6bab816fdd94f822fbde23383e..6229d057eef44edf00b3474c91fd3db283e8758e 100644 Binary files a/libreswan-4.5.tar.gz and b/libreswan-4.11.tar.gz differ diff --git a/libreswan.spec b/libreswan.spec index 9157455c46b26b1bba3a24274ac892c60d38291c..6ef59a36c4965a5c43373c4f3153c3b60069d9f0 100644 --- a/libreswan.spec +++ b/libreswan.spec @@ -25,8 +25,8 @@ Name: libreswan Summary: IKE implementation for IPsec with IKEv1 and IKEv2 support -Version: 4.5 -Release: 3 +Version: 4.11 +Release: 1 License: GPLv2 Url: https://libreswan.org/ Source0: https://download.libreswan.org/%{name}-%{version}.tar.gz @@ -34,10 +34,6 @@ Source1: https://download.libreswan.org/cavs/ikev1_dsa.fax.bz2 Source2: https://download.libreswan.org/cavs/ikev1_psk.fax.bz2 Source3: https://download.libreswan.org/cavs/ikev2.fax.bz2 Source4: openeuler-libreswan-sysctl.conf -#https://libreswan.org/security/CVE-2022-23094/ -Patch0: CVE-2022-23094.patch -#https://libreswan.org/security/CVE-2023-23009/ -Patch1: CVE-2023-23009.patch BuildRequires: audit-libs-devel BuildRequires: bison @@ -107,6 +103,9 @@ sed -i '/config setup/a\\t# Specifies a directory forNSS database files\n\tnssdi sed -i '/ipsec --checknss/s/$/ --nssdir \/etc\/ipsec.d/' ./initsystems/systemd/ipsec.service.in +linux_variant=`sed -n -e 's/"//g' -e 's/^ID_LIKE=//p' -e 's/^ID=//p' /etc/os-release` +sed -i "s/filter fedora/filter fedora $linux_variant/" mk/defaults/linux.mk + %build make %{?_smp_mflags} \ OPTIMIZE_CFLAGS="%{optflags}" \ @@ -191,6 +190,9 @@ certutil -N -d sql:$tmpdir --empty-password %attr(0644,root,root) %doc %{_mandir}/*/* %changelog +* Tue May 30 2023 wangkai <13474090681@163.com> - 4.11-1 +- Update to 4.11 for fix CVE-2023-30570 + * Tue Mar 07 2023 yaoxin - 4.5-3 - Fix CVE-2023-23009