From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.99]:53802 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726522AbfHLR6q (ORCPT ); Mon, 12 Aug 2019 13:58:46 -0400 From: Eric Biggers Subject: [RFC PATCH 2/9] common/encrypt: add helper functions that wrap new xfs_io commands Date: Mon, 12 Aug 2019 10:58:02 -0700 Message-Id: <20190812175809.34810-3-ebiggers@kernel.org> In-Reply-To: <20190812175809.34810-1-ebiggers@kernel.org> References: <20190812175809.34810-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-fscrypt-owner@vger.kernel.org To: fstests@vger.kernel.org Cc: linux-fscrypt@vger.kernel.org List-ID: From: Eric Biggers Wrap the new xfs_io commands 'add_enckey', 'rm_enckey', and 'enckey_status' with helper functions. Also add _user_do_get_encpolicy(), so that all encryption xfs_io commands have a _user_do() version. Signed-off-by: Eric Biggers --- common/encrypt | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/common/encrypt b/common/encrypt index 7bbe1936..a086e80f 100644 --- a/common/encrypt +++ b/common/encrypt @@ -261,6 +261,71 @@ _get_encpolicy() $XFS_IO_PROG -c "get_encpolicy $*" "$file" } +_user_do_get_encpolicy() +{ + local file=$1 + shift + + _user_do "$XFS_IO_PROG -c \"get_encpolicy $*\" \"$file\"" +} + +# Add an encryption key to the given filesystem. +_add_enckey() +{ + local mnt=$1 + local raw_key=$2 + shift 2 + + echo -ne "$raw_key" | $XFS_IO_PROG -c "add_enckey $*" "$mnt" +} + +_user_do_add_enckey() +{ + local mnt=$1 + local raw_key=$2 + shift 2 + + _user_do "echo -ne \"$raw_key\" | $XFS_IO_PROG -c \"add_enckey $*\" \"$mnt\"" +} + +# Remove the given encryption key from the given filesystem. +_rm_enckey() +{ + local mnt=$1 + local keyspec=$2 + shift 2 + + $XFS_IO_PROG -c "rm_enckey $* $keyspec" "$mnt" +} + +_user_do_rm_enckey() +{ + local mnt=$1 + local keyspec=$2 + shift 2 + + _user_do "$XFS_IO_PROG -c \"rm_enckey $* $keyspec\" \"$mnt\"" +} + +# Get the status of the given encryption key on the given filesystem. +_enckey_status() +{ + local mnt=$1 + local keyspec=$2 + shift 2 + + $XFS_IO_PROG -c "enckey_status $* $keyspec" "$mnt" +} + +_user_do_enckey_status() +{ + local mnt=$1 + local keyspec=$2 + shift 2 + + _user_do "$XFS_IO_PROG -c \"enckey_status $* $keyspec\" \"$mnt\"" +} + # Retrieve the encryption nonce of the given inode as a hex string. The nonce # was randomly generated by the filesystem and isn't exposed directly to # userspace. But it can be read using the filesystem's debugging tools. -- 2.23.0.rc1.153.gdeed80330f-goog