diff mbox series

[31/42] mkfs.ubifs: Accept 0x prefix for key descriptor

Message ID	20181018143718.26298-32-richard@nod.at
State	Accepted
Delegated to:	David Oberhollenzer
Headers	show Return-Path: <linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> From: Richard Weinberger <richard@nod.at> To: linux-mtd@lists.infradead.org Subject: [PATCH 31/42] mkfs.ubifs: Accept 0x prefix for key descriptor Date: Thu, 18 Oct 2018 16:37:07 +0200 Message-Id: <20181018143718.26298-32-richard@nod.at> In-Reply-To: <20181018143718.26298-1-richard@nod.at> References: <20181018143718.26298-1-richard@nod.at> MIME-Version: 1.0 summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 T_SPF_PERMERROR SPF: test of record failed (permerror) Precedence: list Cc: Richard Weinberger <richard@nod.at>, david.oberhollenzer@sigma-star.at Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" <linux-mtd-bounces@lists.infradead.org> Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org
Series	mtd-utils: Add fscrypt support to mkfs.ubifs \| expand [00/42] mtd-utils: Add fscrypt support to mkfs.ubifs [01/42] Import latest ubifs-media.h [02/42] common: Add round functions [03/42] mkfs.ubifs: Add crypto helper functions [04/42] mkfs.ubifs: Implement UBIFS_FLG_DOUBLE_HASH [05/42] mkfs.ubifs: Make r5 hash binary string aware [06/42] mkfs.ubifs: Add fscrypto defines [07/42] mkfs.ubifs: Add basic fscrypto functions [08/42] mkfs.ubifs: Implement UBIFS_FLG_ENCRYPTION [09/42] mkfs.ubifs: Implement basic fscrypto context passing [10/42] mkfs.ubifs: Implement fscrypto context store as xattr [11/42] mkfs.ubifs: Store directory name len in the temporary index [12/42] mkfs.ubifs: Implement filename encryption [13/42] mkfs.ubifs: Add dummy setup for crypto [14/42] mkfs.ubifs: Pass source/dest key len to key derive function [15/42] mkfs.ubifs: Add encrypted symlink support [16/42] mkfs.ubifs: Implement file contents encryption [17/42] mkfs.ubifs: Move symlink data encryption to helper function [18/42] mkfs.ubifs: Make sure we catch nodes that should or should not have name [19/42] mkfs.ubifs: Free all index entry names [20/42] mkfs.ubifs: Seperate path encryption from symlink encryption helper [21/42] mkfs.ubifs: Cleanup add_dent_node, user path encryption helper [22/42] mkfs.ubifs: Replace constant values with parameters in init_fscrypt_context [23/42] mkfs.ubifs: Make encryption dependend on (not-yet-existant) command line options [24/42] mkfs.ubifs: Get key descriptor from command line and master key from file [25/42] mkfs.ubifs: Specify padding policy via command line [26/42] mkfs.ubifs: Initial support for encryption command lines [27/42] mkfs.ubifs: Remove cipher implementations from public header [28/42] mkfs.ubifs: Move fscrypt definitions and functions out of mkfs.ubifs.c [29/42] mkfs.ubifs: Cleanup over-long lines [30/42] mkfs.ubifs: Check length of master key [31/42] mkfs.ubifs: Accept 0x prefix for key descriptor [32/42] mkfs.ubifs: Correctly use iv lengths in aes-cts mode [33/42] mkfs.ubifs: Enable Cipher selection [34/42] mkfs.ubifs: Use correct sizes for keys and hash lengths [35/42] mkfs.ubifs: Fixup AES-XTS mode [36/42] mkfs.ubifs: Compute encryption key descriptor automatically [37/42] mkfs.ubifs: Fix key descriptor printing [38/42] mkfs.ubifs: More fscryptctl compatibility [39/42] mkfs.ubifs: Move RAND_poll to crypto.c [40/42] mkfs.ubifs: Enable support for building without crypto [41/42] mkfs.ubifs: Print key descriptor only when generated [42/42] mkfs.ubifs: Use AES-256-XTS as default

Commit Message

Richard Weinberger Oct. 18, 2018, 2:37 p.m. UTC

From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 ubifs-utils/mkfs.ubifs/fscrypt.c | 3 +++
 1 file changed, 3 insertions(+)

diff mbox series

Patch

diff --git a/ubifs-utils/mkfs.ubifs/fscrypt.c b/ubifs-utils/mkfs.ubifs/fscrypt.c
index 6d1fa4ba9d3f..02132e205a35 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);