From 54171dfdd311cd51ac458e27e10d9aae3e6ec8e8 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 31 Jan 2019 16:32:11 +0100 Subject: [PATCH] Fix api-test to detect kernel without needed crypto module for tcrypt test. --- tests/api-test.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/api-test.c b/tests/api-test.c index 22f1c511..55cd3421 100644 --- a/tests/api-test.c +++ b/tests/api-test.c @@ -283,7 +283,7 @@ static int _setup(void) _system(" [ ! -e " VALID_HEADER " ] && xz -dk " VALID_HEADER ".xz", 1); /* Prepare tcrypt images */ - _system(" [ ! -d tcrypt-images ] && tar xJf tcrypt-images.tar.xz 2>/dev/null", 1); + _system("tar xJf tcrypt-images.tar.xz 2>/dev/null", 1); _system("modprobe dm-crypt", 0); _system("modprobe dm-verity", 0); @@ -1746,7 +1746,12 @@ static void TcryptTest(void) OK_(crypt_init(&cd, tcrypt_dev2)); params.keyfiles = NULL; params.keyfiles_count = 0; - OK_(crypt_load(cd, CRYPT_TCRYPT, ¶ms)); + r = crypt_load(cd, CRYPT_TCRYPT, ¶ms); + if (r < 0) { + printf("WARNING: cannot use non-AES encryption, skipping test.\n"); + crypt_free(cd); + return; + } OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, NULL, 0, CRYPT_ACTIVATE_READONLY)); crypt_free(cd);