From 43d7766178e6696d009397d0e034b9cdaa9fa7da Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@kth.se>
Date: Fri, 23 Jun 2023 15:26:55 +0200
Subject: Fix support for NUL bytes in the keyfile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@kth.se>
---
 key2root-addkey.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/key2root-addkey.c b/key2root-addkey.c
index c9f62b3..5b3f1ee 100644
--- a/key2root-addkey.c
+++ b/key2root-addkey.c
@@ -164,6 +164,7 @@ main(int argc, char *argv[])
 #define HASH_PREFIX "$6$"
 	char generated_parameters[sizeof(HASH_PREFIX"$") + 16];
 	ssize_t r;
+	size_t i;
 
 	ARGBEGIN {
 	case 'r':
@@ -228,6 +229,9 @@ main(int argc, char *argv[])
 		}
 		key_len += (size_t)r;
 	}
+	for (i = 0; i < key_len; i++)
+		if (!key[i])
+			key[i] = 255;
 	key[key_len] = '\0';
 	hash = crypt(key, parameters);
 	if (!hash)
-- 
cgit v1.2.3-70-g09d2