From d8fe298446a244fd4c2c5d03471ffb3eebe80f47 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 4 May 2024 12:07:38 +0200 Subject: Merging debian version 5.6.0-1+deb12u1. Signed-off-by: Daniel Baumann --- .../0012-lib-dnssec-fix-imprecise-assertion.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 debian/patches/0012-lib-dnssec-fix-imprecise-assertion.patch (limited to 'debian/patches/0012-lib-dnssec-fix-imprecise-assertion.patch') diff --git a/debian/patches/0012-lib-dnssec-fix-imprecise-assertion.patch b/debian/patches/0012-lib-dnssec-fix-imprecise-assertion.patch new file mode 100644 index 0000000..8612afb --- /dev/null +++ b/debian/patches/0012-lib-dnssec-fix-imprecise-assertion.patch @@ -0,0 +1,22 @@ +From: =?utf-8?b?VmxhZGltw61yIMSMdW7DoXQ=?= +Date: Fri, 23 Feb 2024 09:33:21 +0100 +Subject: lib/dnssec: fix imprecise assertion + +It was no longer correct after commit cc5051b444130 (KeyTrap). +--- + lib/dnssec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/dnssec.c b/lib/dnssec.c +index 262570c..fcae473 100644 +--- a/lib/dnssec.c ++++ b/lib/dnssec.c +@@ -477,7 +477,7 @@ int kr_dnskeys_trusted(kr_rrset_validation_ctx_t *vctx, const knot_rdataset_t *s + ret = kr_svldr_rrset_with_key(keys, sigs, vctx, &key); + svldr_key_del(&key); + if (ret == 0 || ret == kr_error(E2BIG)) { +- kr_assert(vctx->result == 0); ++ kr_assert(vctx->result == ret); + return vctx->result; + } + } -- cgit v1.2.3