From e48ec659ca813f233769ff0752087c76a14442a9 Mon Sep 17 00:00:00 2001 From: Christoph Biedl Date: Mon, 10 Dec 2018 14:25:33 +0100 Subject: [PATCH] Relax content tests in test suite Starting with version 2.0.5, cryptsetup wipes the full LUKS header and fills unused sections with random data, this was introduced in commit commit c2bce3e93ecee41f661b589ee28f112eb538259e Author: Milan Broz Date: Sun Oct 14 13:11:50 2018 +0200 Wipe full header areas (including unused) during LUKS format. While this is the right thing to do, it breaks luksmeta tests. So relax them. Bug-Debian: https://bugs.debian.org/915256 Resolves: https://github.com/latchset/luksmeta/issues/6 --- test-lm-assumptions.c | 3 ++- test-lm-big.c | 4 ++-- test-lm-init.c | 4 ++-- test-lm-one.c | 4 ++-- test-lm-two.c | 8 ++++---- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/test-lm-assumptions.c b/test-lm-assumptions.c index d9ff20b..b4f293f 100644 --- a/test-lm-assumptions.c +++ b/test-lm-assumptions.c @@ -28,7 +28,8 @@ main(int argc, char *argv[]) /* Test the layout state. */ assert(test_layout((range_t[]) { { 0, 1024 }, /* LUKS header */ - END(1024), /* Rest of the file */ + { 1024, 3072, true }, /* Keyslot Area */ + { 0, 0 }, })); unlink(filename); diff --git a/test-lm-big.c b/test-lm-big.c index 6098e59..eb94d3b 100644 --- a/test-lm-big.c +++ b/test-lm-big.c @@ -111,7 +111,7 @@ main(int argc, char *argv[]) assert(test_layout((range_t[]) { { 0, 1024 }, /* LUKS header */ - { 1024, offset - 1024, true }, /* Keyslot Area */ + { 1024, 3072, true }, /* Keyslot Area */ { offset, 4096 }, /* luksmeta header */ { offset + 4096, 4096 }, /* luksmeta slot 0 */ { offset + 8192, 4096 }, /* luksmeta slot 0 (cont) */ @@ -127,7 +127,7 @@ main(int argc, char *argv[]) assert(test_layout((range_t[]) { { 0, 1024 }, /* LUKS header */ - { 1024, offset - 1024, true }, /* Keyslot Area */ + { 1024, 3072, true }, /* Keyslot Area */ { offset, 4096 }, /* luksmeta header */ END(offset + 4096), /* Rest of the file */ })); diff --git a/test-lm-init.c b/test-lm-init.c index 2a6cb45..b16d597 100644 --- a/test-lm-init.c +++ b/test-lm-init.c @@ -57,7 +57,7 @@ main(int argc, char *argv[]) /* Test the layout state. */ assert(test_layout((range_t[]) { { 0, 1024 }, /* LUKS header */ - { 1024, offset - 1024, true }, /* Keyslot Area */ + { 1024, 3072, true }, /* Keyslot Area */ { offset, 4096 }, /* luksmeta header */ END(offset + 4096), /* Rest of the file */ })); @@ -106,7 +106,7 @@ main(int argc, char *argv[]) assert(luksmeta_test(cd) == -ENOENT); assert(test_layout((range_t[]) { { 0, 1024 }, /* LUKS header */ - { 1024, offset - 1024, true }, /* Keyslot Area */ + { 1024, 3072, true }, /* Keyslot Area */ END(offset), /* Rest of the file */ })); diff --git a/test-lm-one.c b/test-lm-one.c index 8deb70a..18613e0 100644 --- a/test-lm-one.c +++ b/test-lm-one.c @@ -49,7 +49,7 @@ main(int argc, char *argv[]) /* Test the layout state. */ assert(test_layout((range_t[]) { { 0, 1024 }, /* LUKS header */ - { 1024, offset - 1024, true }, /* Keyslot Area */ + { 1024, 3072, true }, /* Keyslot Area */ { offset, 4096 }, /* luksmeta header */ { offset + 4096, 4096 }, /* luksmeta slot 0 */ END(offset + 8192), /* Rest of the file */ @@ -68,7 +68,7 @@ main(int argc, char *argv[]) /* Test the layout state. */ assert(test_layout((range_t[]) { { 0, 1024 }, /* LUKS header */ - { 1024, offset - 1024, true }, /* Keyslot Area */ + { 1024, 3072, true }, /* Keyslot Area */ { offset, 4096 }, /* luksmeta header */ END(offset + 4096), /* Rest of the file */ })); diff --git a/test-lm-two.c b/test-lm-two.c index 78fea5b..9f0b1c5 100644 --- a/test-lm-two.c +++ b/test-lm-two.c @@ -53,7 +53,7 @@ main(int argc, char *argv[]) assert(test_layout((range_t[]) { { 0, 1024 }, /* LUKS header */ - { 1024, offset - 1024, true }, /* Keyslot Area */ + { 1024, 3072, true }, /* Keyslot Area */ { offset, 4096 }, /* luksmeta header */ { offset + 4096, 4096 }, /* luksmeta slot 0 */ END(offset + 8192), /* Rest of the file */ @@ -70,7 +70,7 @@ main(int argc, char *argv[]) assert(test_layout((range_t[]) { { 0, 1024 }, /* LUKS header */ - { 1024, offset - 1024, true }, /* Keyslot Area */ + { 1024, 3072, true }, /* Keyslot Area */ { offset, 4096 }, /* luksmeta header */ { offset + 4096, 4096 }, /* luksmeta slot 0 */ { offset + 8192, 4096 }, /* luksmeta slot 1 */ @@ -88,7 +88,7 @@ main(int argc, char *argv[]) assert(luksmeta_wipe(cd, 0, UUID0) == 0); assert(test_layout((range_t[]) { { 0, 1024 }, /* LUKS header */ - { 1024, offset - 1024, true }, /* Keyslot Area */ + { 1024, 3072, true }, /* Keyslot Area */ { offset, 4096 }, /* luksmeta header */ { offset + 4096, 4096, true }, /* luksmeta slot 0 */ { offset + 8192, 4096 }, /* luksmeta slot 1 */ @@ -99,7 +99,7 @@ main(int argc, char *argv[]) assert(luksmeta_wipe(cd, 1, UUID1) == 0); assert(test_layout((range_t[]) { { 0, 1024 }, /* LUKS header */ - { 1024, offset - 1024, true }, /* Keyslot Area */ + { 1024, 3072, true }, /* Keyslot Area */ { offset, 4096 }, /* luksmeta header */ END(offset + 4096), /* Rest of the file */ })); -- 2.19.2