commit 9e45a5732bd38d703ad8f055c2c16ea519607cf9
author Guillaume Solignac <gsoligna@cisco.com> Thu Apr 20 17:59:22 2023 +0200
committer Damjan Marion <dmarion@0xa5.net> Mon May 13 14:57:50 2024 +0000
tree f5c95837385bd2a676212104063809e4af2cd984
parent 9d5fed08aed0567db210b394773051dc1dc8defa

wireguard: use clib helpers for endianness

In some cases, the Linux helpers for endianness conversion are not
present. We use clib helpers to fix this.

Type: fix

Signed-off-by: Guillaume Solignac <gsoligna@cisco.com>
Change-Id: I4d21fb5edae6fa6413b10f298a84ff4b88bda5db
Signed-off-by: Pierre Pfister <ppfister@cisco.com>
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

src/plugins/wireguard/wireguard_chachapoly.c

diff --git a/src/plugins/wireguard/wireguard_chachapoly.c b/src/plugins/wireguard/wireguard_chachapoly.c
index 0dd7908..ad644ff 100644
--- a/src/plugins/wireguard/wireguard_chachapoly.c
+++ b/src/plugins/wireguard/wireguard_chachapoly.c
@@ -72,11 +72,11 @@
   u64 h_nonce;
 
   clib_memcpy (&h_nonce, nonce + 16, sizeof (h_nonce));
-  h_nonce = le64toh (h_nonce);
+  h_nonce = clib_little_to_host_u64 (h_nonce);
   hchacha20 (derived_key, nonce, key);
 
   for (i = 0; i < (sizeof (derived_key) / sizeof (derived_key[0])); i++)
-    (derived_key[i]) = htole32 ((derived_key[i]));
+    (derived_key[i]) = clib_host_to_little_u32 ((derived_key[i]));
 
   uint32_t key_idx;
 
@@ -102,11 +102,11 @@
   u64 h_nonce;
 
   clib_memcpy (&h_nonce, nonce + 16, sizeof (h_nonce));
-  h_nonce = le64toh (h_nonce);
+  h_nonce = clib_little_to_host_u64 (h_nonce);
   hchacha20 (derived_key, nonce, key);
 
   for (i = 0; i < (sizeof (derived_key) / sizeof (derived_key[0])); i++)
-    (derived_key[i]) = htole32 ((derived_key[i]));
+    (derived_key[i]) = clib_host_to_little_u32 ((derived_key[i]));
 
   uint32_t key_idx;
 

src/plugins/wireguard/wireguard_noise.c

diff --git a/src/plugins/wireguard/wireguard_noise.c b/src/plugins/wireguard/wireguard_noise.c
index 5fe2e44..c3f28f4 100644
--- a/src/plugins/wireguard/wireguard_noise.c
+++ b/src/plugins/wireguard/wireguard_noise.c
@@ -751,8 +751,8 @@
   unix_nanosec &= REJECT_INTERVAL_MASK;
 
   /* https://cr.yp.to/libtai/tai64.html */
-  sec = htobe64 (0x400000000000000aULL + unix_sec);
-  nsec = htobe32 (unix_nanosec);
+  sec = clib_host_to_big_u64 (0x400000000000000aULL + unix_sec);
+  nsec = clib_host_to_big_u32 (unix_nanosec);
 
   /* memcpy to output buffer, assuming output could be unaligned. */
   clib_memcpy (output, &sec, sizeof (sec));