From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Wed, 2 Jul 2025 07:39:20 +0000 (+0200)
Subject: Also use new dns_random(void *, size_t) for client cookie
X-Git-Tag: rec-5.3.0-alpha2~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F15763%2Fhead;p=thirdparty%2Fpdns.git

Also use new dns_random(void *, size_t) for client cookie

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>
---

diff --git a/pdns/ednscookies.cc b/pdns/ednscookies.cc
index c390865ef7..96178998f1 100644
--- a/pdns/ednscookies.cc
+++ b/pdns/ednscookies.cc
@@ -148,12 +148,9 @@ bool EDNSCookiesOpt::shouldRefresh() const
 
 void EDNSCookiesOpt::makeClientCookie()
 {
-  uint32_t lower = dns_random_uint32();
-  uint32_t upper = dns_random_uint32();
-  client = string();
-  client.resize(sizeof(lower) + sizeof(upper));
-  memcpy(client.data(), &lower, sizeof(lower));
-  memcpy(&client.at(sizeof(lower)), &upper, sizeof(upper));
+  const size_t clientCookieSize = 8;
+  client.resize(clientCookieSize);
+  dns_random(client.data(), clientCookieSize);
 }
 
 bool EDNSCookiesOpt::makeServerCookie([[maybe_unused]] const string& secret, [[maybe_unused]] const ComboAddress& source)