diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:04:57 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:04:57 +0000 |
commit | 98e63d18fe85b29517ae8fb21ca94f37c7972652 (patch) | |
tree | 8de3b229d6a3a5062acdb3a970cc3c60bed6c07f /distro | |
parent | Releasing progress-linux version 3.3.4-1.1~progress7.99u1. (diff) | |
download | knot-98e63d18fe85b29517ae8fb21ca94f37c7972652.tar.xz knot-98e63d18fe85b29517ae8fb21ca94f37c7972652.zip |
Merging upstream version 3.3.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'distro')
-rw-r--r-- | distro/pkg/el-7/04-revert-don-t-share-PKCS-11-private-keys.patch | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/distro/pkg/el-7/04-revert-don-t-share-PKCS-11-private-keys.patch b/distro/pkg/el-7/04-revert-don-t-share-PKCS-11-private-keys.patch index a13be90..d360433 100644 --- a/distro/pkg/el-7/04-revert-don-t-share-PKCS-11-private-keys.patch +++ b/distro/pkg/el-7/04-revert-don-t-share-PKCS-11-private-keys.patch @@ -16,12 +16,6 @@ diff --git a/src/knot/dnssec/zone-keys.c b/src/knot/dnssec/zone-keys.c index cd6bf0bb3..d5cccc759 100644 --- a/src/knot/dnssec/zone-keys.c +++ b/src/knot/dnssec/zone-keys.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2023 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz> -+/* Copyright (C) 2022 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by @@ -642,21 +642,6 @@ int zone_key_calculate_ds(zone_key_t *for_key, dnssec_key_digest_t digesttype, return ret; } |