Blame SOURCES/Improve-error-message-when-bind-is-given-an-invalid-.patch
|
 |
ef20f4 |
From 02f17448e379c92745f8203f47e5de0725b1c1b6 Mon Sep 17 00:00:00 2001
|
|
|
ef20f4 |
From: Sergio Correia <scorreia@redhat.com>
|
|
|
ef20f4 |
Date: Fri, 18 Oct 2019 09:04:22 -0300
|
|
|
ef20f4 |
Subject: [PATCH] Improve error message when bind is given an invalid PIN
|
|
|
ef20f4 |
|
|
|
ef20f4 |
---
|
|
|
ef20f4 |
src/luks/clevis-luks-bind | 7 ++++++-
|
|
|
ef20f4 |
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
ef20f4 |
|
|
|
ef20f4 |
diff --git a/src/luks/clevis-luks-bind b/src/luks/clevis-luks-bind
|
|
|
ef20f4 |
index 7aae2ea..1b5caf2 100755
|
|
|
ef20f4 |
--- a/src/luks/clevis-luks-bind
|
|
|
ef20f4 |
+++ b/src/luks/clevis-luks-bind
|
|
|
ef20f4 |
@@ -19,6 +19,8 @@
|
|
|
ef20f4 |
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
ef20f4 |
#
|
|
|
ef20f4 |
|
|
|
ef20f4 |
+. clevis-luks-common-functions
|
|
|
ef20f4 |
+
|
|
|
ef20f4 |
SUMMARY="Binds a LUKS device using the specified policy"
|
|
|
ef20f4 |
UUID=cb6e8904-81ff-40da-a84a-07ab9ab5715e
|
|
|
ef20f4 |
|
|
|
ef20f4 |
@@ -68,6 +70,9 @@ fi
|
|
|
ef20f4 |
if ! PIN=${@:$((OPTIND++)):1} || [ -z "$PIN" ]; then
|
|
|
ef20f4 |
echo "Did not specify a pin!" >&2
|
|
|
ef20f4 |
usage
|
|
|
ef20f4 |
+elif ! EXE=$(findexe clevis-encrypt-"${PIN}"); then
|
|
|
ef20f4 |
+ echo "'$PIN' is not a valid pin!" >&2
|
|
|
ef20f4 |
+ usage
|
|
|
ef20f4 |
fi
|
|
|
ef20f4 |
|
|
|
ef20f4 |
if ! CFG=${@:$((OPTIND++)):1} || [ -z "$CFG" ]; then
|
|
|
ef20f4 |
@@ -142,4 +147,4 @@ else
|
|
|
ef20f4 |
cryptsetup luksRemoveKey "$DEV" <<<"$key"
|
|
|
ef20f4 |
exit 1
|
|
|
ef20f4 |
fi
|
|
|
ef20f4 |
-fi
|
|
|
ef20f4 |
\ No newline at end of file
|
|
|
ef20f4 |
+fi
|
|
|
ef20f4 |
--
|
|
|
ef20f4 |
2.21.0
|
|
|
ef20f4 |
|