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 23f27388777574d5a39bd200884b30eba00e5b7e..5f2608c3cf67a27665b7971f77d2919d0cee7937 100644 (file)
--- 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 d161575314b4d0040163113e5b757a2d5ecc1d6f..a0cd0690f1c95f18a5e16d9a71caff3d74f9aa7b 100644 (file)
--- 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 8e1f80509412182ec1beb20aa690a40300dce894..8f92c883d2ae1de07c85eefea7b3a6eaa089befd 100644 (file)
--- 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