From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Thu, 18 Oct 2018 14:37:07 +0000 (+0200)
Subject: mkfs.ubifs: Accept 0x prefix for key descriptor
X-Git-Tag: v2.1.0~19
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=82e9055c49a6bceff3e32757cb4c0f10f46468ae;p=mtd-utils.git

mkfs.ubifs: Accept 0x prefix for key descriptor

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Signed-off-by: Richard Weinberger <richard@nod.at>
---

diff --git a/ubifs-utils/mkfs.ubifs/fscrypt.c b/ubifs-utils/mkfs.ubifs/fscrypt.c
index 6d1fa4b..02132e2 100644
--- a/ubifs-utils/mkfs.ubifs/fscrypt.c
+++ b/ubifs-utils/mkfs.ubifs/fscrypt.c
@@ -165,6 +165,9 @@ static int parse_key_descriptor(const char *desc, __u8 *dst)
 {
 	int i, hi, lo;
 
+	if (desc[0] == '0' && (desc[1] == 'x' || desc[1] == 'X'))
+		desc += 2;
+
 	for (i = 0; i < FS_KEY_DESCRIPTOR_SIZE; ++i) {
 		if (!desc[i * 2] || !desc[i * 2 + 1]) {
 			err_msg("key descriptor '%s' is too short", desc);