From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 28 Jan 2026 08:56:31 +0000 (+0100)
Subject: daemon/quic: adapt to libknot 3.6
X-Git-Tag: v6.2.0~2^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=babf0e660c213b712b807f8ea39cebec46450672;p=thirdparty%2Fknot-resolver.git

daemon/quic: adapt to libknot 3.6

For reference see what we did for the non-quic code in:
d0375933 80cf9eb1 c8ea4c07 (all MR 1769)
---

diff --git a/daemon/quic_common.c b/daemon/quic_common.c
index 23f273887..5f2608c3c 100644
--- a/daemon/quic_common.c
+++ b/daemon/quic_common.c
@@ -3,7 +3,7 @@
  */
 #include <ngtcp2/ngtcp2.h>
 #include "contrib/openbsd/siphash.h"
-#include "libdnssec/random.h"
+#include "lib/dnssec.h"
 
 #include "quic_common.h"
 #include "quic_conn.h"
diff --git a/daemon/quic_conn.c b/daemon/quic_conn.c
index d16157531..a0cd0690f 100644
--- a/daemon/quic_conn.c
+++ b/daemon/quic_conn.c
@@ -6,8 +6,7 @@
 #include "network.h"
 #include "quic_common.h"
 #include "quic_stream.h"
-#include "libdnssec/random.h"
-#include "libdnssec/error.h"
+#include "lib/dnssec.h"
 #include "worker.h"
 
 #define EPHEMERAL_CERT_EXPIRATION_SECONDS_RENEW_BEFORE ((time_t)60*60*24*7)
@@ -354,9 +353,10 @@ static int conn_new_handler(ngtcp2_conn **pconn, const ngtcp2_path *path,
 		params.retry_scid_present = 1;
 	}
 
-	if (dnssec_random_buffer(params.stateless_reset_token,
-				NGTCP2_STATELESS_RESET_TOKENLEN) != DNSSEC_EOK) {
-		return kr_error(DNSSEC_ERROR);
+	int ret = dnssec_random_buffer(params.stateless_reset_token,
+					NGTCP2_STATELESS_RESET_TOKENLEN);
+	if (ret != KNOT_EOK) {
+		return kr_error(ret);
 	}
 
 	if (server) {
@@ -779,7 +779,7 @@ int quic_generate_secret(uint8_t *buf, size_t buflen)
 	}
 	uint8_t rand[16], hash[32];
 	int ret = dnssec_random_buffer(rand, sizeof(rand));
-	if (ret != DNSSEC_EOK) {
+	if (ret != KNOT_EOK) {
 		kr_log_error(DOQ, "Failed to init dnssec random buffer");
 		return kr_error(EINVAL);
 	}
diff --git a/daemon/quic_demux.c b/daemon/quic_demux.c
index 8e1f80509..8f92c883d 100644
--- a/daemon/quic_demux.c
+++ b/daemon/quic_demux.c
@@ -6,7 +6,7 @@
 #include "quic_common.h"
 #include "quic_conn.h"
 #include "quic_demux.h"
-#include "libdnssec/random.h"
+#include "lib/dnssec.h"
 #include <stdlib.h>
 
 /* Toggle sending retry for new connections. This is a way to validate the