|
 |
3f1a4d |
From d6c4429bbb09fae249d7b97b06a9346cdc99f962 Mon Sep 17 00:00:00 2001
|
|
|
3f1a4d |
From: Vojtech Trefny <vtrefny@redhat.com>
|
|
|
3f1a4d |
Date: Wed, 19 Dec 2018 09:36:30 +0100
|
|
|
3f1a4d |
Subject: [PATCH] Use cryptsetup to check LUKS2 label
|
|
|
3f1a4d |
|
|
|
3f1a4d |
libblkid on CentOS 7.6 doesn't support reading LUKS2 labels
|
|
|
3f1a4d |
---
|
|
|
3f1a4d |
tests/crypto_test.py | 7 +++++--
|
|
|
3f1a4d |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
3f1a4d |
|
|
|
3f1a4d |
diff --git a/tests/crypto_test.py b/tests/crypto_test.py
|
|
|
3f1a4d |
index 7320e74..b8aacee 100644
|
|
|
3f1a4d |
--- a/tests/crypto_test.py
|
|
|
3f1a4d |
+++ b/tests/crypto_test.py
|
|
|
3f1a4d |
@@ -148,8 +148,11 @@ class CryptoTestFormat(CryptoTestCase):
|
|
|
3f1a4d |
BlockDev.CryptoLUKSVersion.LUKS2, extra)
|
|
|
3f1a4d |
self.assertTrue(succ)
|
|
|
3f1a4d |
|
|
|
3f1a4d |
- _ret, label, _err = run_command("lsblk -oLABEL -n %s" % self.loop_dev)
|
|
|
3f1a4d |
- self.assertEqual(label, "blockdevLUKS")
|
|
|
3f1a4d |
+ _ret, out, err = run_command("cryptsetup luksDump %s" % self.loop_dev)
|
|
|
3f1a4d |
+ m = re.search(r"Label:\s*(\S+)\s*", out)
|
|
|
3f1a4d |
+ if not m or len(m.groups()) != 1:
|
|
|
3f1a4d |
+ self.fail("Failed to get label information from:\n%s %s" % (out, err))
|
|
|
3f1a4d |
+ self.assertEqual(m.group(1), "blockdevLUKS")
|
|
|
3f1a4d |
|
|
|
3f1a4d |
# different key derivation function
|
|
|
3f1a4d |
pbkdf = BlockDev.CryptoLUKSPBKDF(type="pbkdf2")
|
|
|
3f1a4d |
--
|
|
|
3f1a4d |
2.21.0
|
|
|
3f1a4d |
|