bin2hex/hex2bin: fix compilation

smuellerDD · smuellerDD · commit 72e55cb2b5ab · 2026-01-17T17:44:19.000+01:00
Signed-off-by: Stephan Mueller &lt;smueller@chronox.de&gt;
diff --git a/.github/workflows/asan-address-test.yml b/.github/workflows/asan-address-test.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Install meson
       run: |
         sudo apt-get update
-        sudo apt-get install -y meson
+        sudo apt-get install -y meson gnu-efi
     - name: Meson setup build
       run: meson setup build -Db_sanitize=address -Dslh_dsa_ascon_128s=enabled -Dslh_dsa_ascon_128f=enabled
     - name: Meson compile
diff --git a/.github/workflows/clang-scan.yml b/.github/workflows/clang-scan.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Install meson
       run: |
         sudo apt-get update
-        sudo apt-get install -y meson clang clang-tools
+        sudo apt-get install -y meson clang clang-tools gnu-efi
     - name: Meson setup
       run: CC=clang meson setup build -Dslh_dsa_ascon_128s=enabled -Dslh_dsa_ascon_128f=enabled
     - name: Clang Scanner
diff --git a/.github/workflows/fips-negative-tests.yml b/.github/workflows/fips-negative-tests.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Install meson
       run: |
         sudo apt-get update
-        sudo apt-get install -y meson
+        sudo apt-get install -y meson gnu-efi
     - name: Meson setup
       run: meson setup build -Dfips140_negative=enabled
     - name: Meson compile
diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Install meson
       run: brew install meson
     - name: Meson setup
-      run: meson setup build -Dslh_dsa_ascon_128s=enabled -Dslh_dsa_ascon_128f=enabled
+      run: meson setup build -Dslh_dsa_ascon_128s=enabled -Dslh_dsa_ascon_128f=enabled -Dsbsigntools=disabled
     - name: Meson compile
       run: meson compile -C build
     - name: Meson test
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -25,7 +25,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y meson
       - name: Meson setup
-        run: meson setup build -Dtests=disabled -Dslh_dsa_ascon_128s=enabled -Dslh_dsa_ascon_128f=enabled
+        run: meson setup build -Dtests=disabled -Dslh_dsa_ascon_128s=enabled -Dslh_dsa_ascon_128f=enabled -Dsbsigntools=disabled
       - name: Meson compile
         run: meson compile -C build
       - name: Meson install
diff --git a/.github/workflows/small-stack-test.yml b/.github/workflows/small-stack-test.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Install meson
       run: |
         sudo apt-get update
-        sudo apt-get install -y meson
+        sudo apt-get install -y meson gnu-efi
     - name: Meson setup
       run: meson setup build -Dsmall_stack=enabled -Dslh_dsa_ascon_128s=enabled -Dslh_dsa_ascon_128f=enabled
     - name: Meson compile
diff --git a/.github/workflows/timecop.yml b/.github/workflows/timecop.yml
@@ -18,6 +18,7 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y meson
         sudo apt-get install -y valgrind
+        sudo apt-get install -y gnu-efi
     - name: Meson setup build
       run: meson setup build -Dtimecop=enabled -Dslh_dsa_ascon_128s=enabled -Dslh_dsa_ascon_128f=enabled
     - name: Meson compile
diff --git a/.github/workflows/userspace-test.yml b/.github/workflows/userspace-test.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Install meson
       run: |
         sudo apt-get update
-        sudo apt-get install -y meson gcovr doxygen graphviz
+        sudo apt-get install -y meson gcovr doxygen graphviz gnu-efi
     - name: Meson setup
       run: meson setup build -Db_coverage=true -Dslh_dsa_ascon_128s=enabled -Dslh_dsa_ascon_128f=enabled -Dsecure_execution=enabled
     - name: Meson compile
diff --git a/.github/workflows/windows-test.yml b/.github/workflows/windows-test.yml
@@ -27,7 +27,7 @@ jobs:
         update: true
         install: git meson mingw-w64-${{matrix.env}}-meson mingw-w64-${{matrix.env}}-gcc
     - name: Meson setup
-      run: msys2 -c 'meson setup build -Dslh_dsa_ascon_128s=enabled -Dslh_dsa_ascon_128f=enabled'
+      run: msys2 -c 'meson setup build -Dslh_dsa_ascon_128s=enabled -Dslh_dsa_ascon_128f=enabled' -Dsbsigntools=disabled
     - name: Meson compile
       run: msys2 -c 'meson compile -C build'
     - name: Meson test
diff --git a/apps/src/hasher_app.c b/apps/src/hasher_app.c
@@ -160,7 +160,7 @@ static void hasher_bin2print(const uint8_t *bin, size_t binlen,
 	hex = calloc(1, hexlen);
 	if (!hex)
 		return;
-	bin2hex(bin, binlen, hex, hexlen - 1, 0);
+	lc_bin2hex(bin, binlen, hex, hexlen - 1, 0);
 	/* fipshmac does not want the file name :-( */
 	if (outfile != stdout)
 		fprintf(outfile, "%s", hex);
@@ -288,7 +288,7 @@ static int hasher(struct lc_hash_ctx *hash_ctx,
 		uint8_t compmd[64];
 
 		memset(compmd, 0, sizeof(compmd));
-		hex2bin(comphash, comphashlen, compmd, sizeof(compmd));
+		lc_hex2bin(comphash, comphashlen, compmd, sizeof(compmd));
 		if ((comphashlen != hashlen * 2) ||
 		    memcmp(compmd, md, hashlen)) {
 			ret = -EBADMSG;
diff --git a/apps/src/lc_x509_generator_checker.c b/apps/src/lc_x509_generator_checker.c
@@ -318,7 +318,7 @@ int apply_checks_x509(const struct lc_x509_certificate *x509,
 		    LC_X509_POL_FALSE) {
 			char buf[33] = { 0 };
 
-			bin2hex(x509->san_ip, x509->san_ip_len, buf,
+			lc_bin2hex(x509->san_ip, x509->san_ip_len, buf,
 				sizeof(buf) - 1, 1);
 
 			printf("SAN IP: names mismatch (expected %s, actual %s)\n",
@@ -333,7 +333,7 @@ int apply_checks_x509(const struct lc_x509_certificate *x509,
 		uint8_t exp_id_bin[32];
 		size_t exp_id_len = strlen(parsed_opts->skid);
 
-		hex2bin(parsed_opts->skid, exp_id_len, exp_id_bin,
+		lc_hex2bin(parsed_opts->skid, exp_id_len, exp_id_bin,
 			sizeof(exp_id_bin));
 
 		if (exp_id_len / 2 != x509->raw_skid_size) {
@@ -345,7 +345,7 @@ int apply_checks_x509(const struct lc_x509_certificate *x509,
 		if (memcmp(exp_id_bin, x509->raw_skid, x509->raw_skid_size)) {
 			char buf[65] = { 0 };
 
-			bin2hex(x509->raw_skid, x509->raw_skid_size, buf,
+			lc_bin2hex(x509->raw_skid, x509->raw_skid_size, buf,
 				sizeof(buf) - 1, 1);
 
 			printf("SKID: names mismatch (expected %s, actual %s)\n",
@@ -367,7 +367,7 @@ int apply_checks_x509(const struct lc_x509_certificate *x509,
 		uint8_t exp_id_bin[32];
 		size_t exp_id_len = strlen(parsed_opts->akid);
 
-		hex2bin(parsed_opts->akid, exp_id_len, exp_id_bin,
+		lc_hex2bin(parsed_opts->akid, exp_id_len, exp_id_bin,
 			sizeof(exp_id_bin));
 
 		if (exp_id_len / 2 != x509->raw_akid_size) {
@@ -379,7 +379,7 @@ int apply_checks_x509(const struct lc_x509_certificate *x509,
 		if (memcmp(exp_id_bin, x509->raw_akid, x509->raw_akid_size)) {
 			char buf[65] = { 0 };
 
-			bin2hex(x509->raw_akid, x509->raw_akid_size, buf,
+			lc_bin2hex(x509->raw_akid, x509->raw_akid_size, buf,
 				sizeof(buf) - 1, 1);
 
 			printf("AKID: names mismatch (expected %s, actual %s)\n",
@@ -692,7 +692,7 @@ int apply_checks_pkcs7(const struct lc_pkcs7_message *pkcs7_msg,
 		size_t exp_id_len = strlen(parsed_opts->skid);
 		int found = 0;
 
-		hex2bin(parsed_opts->skid, exp_id_len, exp_id_bin,
+		lc_hex2bin(parsed_opts->skid, exp_id_len, exp_id_bin,
 			sizeof(exp_id_bin));
 
 		for (sinfo = pkcs7_msg->list_head_sinfo; sinfo;
diff --git a/internal/api/binhexbin.h b/internal/api/binhexbin.h
@@ -20,22 +20,18 @@
 #ifndef _BINHEXBIN_H
 #define _BINHEXBIN_H
 
+#include "binhexbin_raw.h"
 #include "ext_headers_internal.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-
-void hex2bin(const char *hex, const size_t hexlen, uint8_t *bin,
-	     const size_t binlen);
 int hex2bin_alloc(const char *hex, const size_t hexlen, uint8_t **bin,
 		  size_t *binlen);
 int bin2hex_alloc(const uint8_t *bin, const size_t binlen, char **hex,
 		  size_t *hexlen);
 void bin2print(const unsigned char *bin, const size_t binlen, FILE *out,
 	       const char *explanation);
-void bin2hex(const uint8_t *bin, const size_t binlen, char *hex,
-	     const size_t hexlen, const int u);
 
 int bin2hex_html(const char *str, const size_t strlen, char *html,
 		 const size_t htmllen);
diff --git a/internal/api/binhexbin_raw.h b/internal/api/binhexbin_raw.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2026, Stephan Mueller <smueller@chronox.de>
+ *
+ * License: see LICENSE file in root directory
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+
+#ifndef BINHEXBIN_RAW_H
+#define BINHEXBIN_RAW_H
+
+#include "ext_headers_internal.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void lc_hex2bin(const char *hex, const size_t hexlen, uint8_t *bin,
+		const size_t binlen);
+void lc_bin2hex(const uint8_t *bin, const size_t binlen, char *hex,
+		const size_t hexlen, const int u);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BINHEXBIN_RAW_H */
diff --git a/internal/src/binhexbin.c b/internal/src/binhexbin.c
@@ -25,47 +25,6 @@
 
 #include "binhexbin.h"
 
-static uint8_t bin_char(const char hex)
-{
-	if (48 <= hex && 57 >= hex)
-		return (uint8_t)(hex - 48);
-	if (65 <= hex && 70 >= hex)
-		return (uint8_t)(hex - 55);
-	if (97 <= hex && 102 >= hex)
-		return (uint8_t)(hex - 87);
-	return 0;
-}
-
-/*
- * Convert hex representation into binary string
- * @hex input buffer with hex representation
- * @hexlen length of hex
- * @bin output buffer with binary data
- * @binlen length of already allocated bin buffer (should be at least
- *	   half of hexlen -- if not, only a fraction of hexlen is converted)
- */
-void hex2bin(const char *hex, const size_t hexlen, uint8_t *bin,
-	     const size_t binlen)
-{
-	size_t i;
-	size_t chars = (binlen > (hexlen / 2)) ? (hexlen / 2) : binlen;
-
-	/*
-	 * handle odd-length of strings where the first digit is the least
-	 * significant nibble
-	 */
-	if (hexlen & 1) {
-		bin[0] = bin_char(hex[0]);
-		bin++;
-		hex++;
-	}
-
-	for (i = 0; i < chars; i++) {
-		bin[i] = (uint8_t)(bin_char(hex[(i * 2)]) << 4);
-		bin[i] |= bin_char(hex[((i * 2) + 1)]);
-	}
-}
-
 /*
  * Allocate sufficient space for binary representation of hex
  * and convert hex into bin
@@ -93,56 +52,12 @@ int hex2bin_alloc(const char *hex, const size_t hexlen, uint8_t **bin,
 	if (!out)
 		return -errno;
 
-	hex2bin(hex, hexlen, out, outlen);
+	lc_hex2bin(hex, hexlen, out, outlen);
 	*bin = out;
 	*binlen = outlen;
 	return 0;
 }
 
-#if 0
-static const char hex_char_map_l[] = { '0', '1', '2', '3', '4', '5', '6', '7',
-				       '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-static const char hex_char_map_u[] = { '0', '1', '2', '3', '4', '5', '6', '7',
-				       '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-static char hex_char(unsigned int bin, int u)
-{
-	if (bin < sizeof(hex_char_map_l))
-		return (u) ? hex_char_map_u[bin] : hex_char_map_l[bin];
-	return 'X';
-}
-#else
-static char hex_char(unsigned int bin, const int u)
-{
-	if (bin < 10)
-		return (char)(bin + 0x30);
-	else if (bin < 16)
-		return (char)(bin + 0x57 - (unsigned int)(!!u * 0x20));
-
-	return 0x78;
-}
-#endif
-
-/*
- * Convert binary string into hex representation
- * @bin input buffer with binary data
- * @binlen length of bin
- * @hex output buffer to store hex data
- * @hexlen length of already allocated hex buffer (should be at least
- *	   twice binlen -- if not, only a fraction of binlen is converted)
- * @u case of hex characters (0=>lower case, 1=>upper case)
- */
-void bin2hex(const uint8_t *bin, const size_t binlen, char *hex,
-	     const size_t hexlen, const int u)
-{
-	size_t i = 0;
-	size_t chars = (binlen > (hexlen / 2)) ? (hexlen / 2) : binlen;
-
-	for (i = 0; i < chars; i++) {
-		hex[(i * 2)] = hex_char((bin[i] >> 4), u);
-		hex[((i * 2) + 1)] = hex_char((bin[i] & 0x0f), u);
-	}
-}
-
 /*
  * Allocate sufficient space for hex representation of bin
  * and convert bin into hex
@@ -170,7 +85,7 @@ int bin2hex_alloc(const uint8_t *bin, const size_t binlen, char **hex,
 	if (!out)
 		return -errno;
 
-	bin2hex(bin, binlen, out, outlen, 0);
+	lc_bin2hex(bin, binlen, out, outlen, 0);
 	*hex = out;
 	*hexlen = outlen;
 	return 0;
@@ -189,7 +104,7 @@ void bin2print(const unsigned char *bin, const size_t binlen, FILE *out,
 		hex = calloc(1, hexlen);
 		if (!hex)
 			return;
-		bin2hex(bin, binlen, hex, hexlen - 1, 0);
+		lc_bin2hex(bin, binlen, hex, hexlen - 1, 0);
 	}
 	if (explanation)
 		fprintf(out, "%s = ", explanation);
@@ -261,7 +176,7 @@ static int _bin2hex_html(const unsigned char *str, size_t strlen, char *html,
 				html++;
 				htmllen--;
 
-				bin2hex(str, 1, html, htmllen, 1);
+				lc_bin2hex(str, 1, html, htmllen, 1);
 				str++;
 				strlen--;
 				html += 2;
diff --git a/internal/src/binhexbin_raw.c b/internal/src/binhexbin_raw.c
diff --git a/internal/src/meson.build b/internal/src/meson.build
diff --git a/internal/src/uuid.c b/internal/src/uuid.c
diff --git a/linux_kernel/Kbuild.basics b/linux_kernel/Kbuild.basics
diff --git a/meson.build b/meson.build
