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 6d1fa4ba9d3fdf5d36f98ba051aac6d903700046..02132e205a35b7208eaaa38facb3f0005e7fdea9 100644 (file)
--- 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);