X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tests%2Fapi-test.c;h=81501ebea9c3f411fe628eca28d2e768d98bca67;hb=322b430a2589cdc7985e98a14ec12322b91c9d5e;hp=7fd85c2fcf2f2e5f957723cb169d3b10034b5d10;hpb=ad21d48762fa70838d4ab4fbe8fe2a2e8a4dcef1;p=platform%2Fupstream%2Fcryptsetup.git diff --git a/tests/api-test.c b/tests/api-test.c index 7fd85c2..81501eb 100644 --- a/tests/api-test.c +++ b/tests/api-test.c @@ -1,8 +1,9 @@ /* * cryptsetup library API check functions * - * Copyright (C) 2009-2013 Red Hat, Inc. All rights reserved. - * Copyright (C) 2009-2014, Milan Broz + * Copyright (C) 2009-2020 Red Hat, Inc. All rights reserved. + * Copyright (C) 2009-2020 Milan Broz + * Copyright (C) 2016-2020 Ondrej Kozina * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,22 +20,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include #include #include #include #include -#include #include -#include #include #include -#include -#include +#include +#include +#include "api_test.h" #include "luks.h" #include "libcryptsetup.h" -#include "utils_loop.h" #define DMDIR "/dev/mapper/" @@ -57,6 +55,7 @@ #define EVL_HEADER_2 "evil_hdr-payload_overwrite" #define EVL_HEADER_3 "evil_hdr-stripes_payload_dmg" #define EVL_HEADER_4 "evil_hdr-small_luks_device" +#define EVL_HEADER_5 "evil_hdr-keyslot_overlap" #define VALID_HEADER "valid_header_file" #define BACKUP_FILE "csetup_backup_file" #define IMAGE1 "compatimage.img" @@ -69,6 +68,7 @@ #define KEY2 "0123456789abcdef" #define PASSPHRASE "blabla" +#define PASSPHRASE1 "albalb" #define DEVICE_TEST_UUID "12345678-1234-1234-1234-123456789abc" @@ -76,70 +76,21 @@ #define DEVICE_CHAR "/dev/zero" #define THE_LFILE_TEMPLATE "cryptsetup-tstlp.XXXXXX" -#define SECTOR_SHIFT 9L -#define SECTOR_SIZE 512 -#define TST_LOOP_FILE_SIZE (((1<<20)*50)>>SECTOR_SHIFT) -#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) -#define DIV_ROUND_UP_MODULO(n,d) (DIV_ROUND_UP(n,d)*(d)) #define LUKS_PHDR_SIZE_B 1024 -static int _debug = 0; -static int _verbose = 1; static int _fips_mode = 0; -static int _quit = 0; - -static char global_log[4096]; -static int global_lines = 0; - static char *DEVICE_1 = NULL; static char *DEVICE_2 = NULL; static char *DEVICE_3 = NULL; -static char *THE_LOOP_DEV = NULL; static char *tmp_file_1 = NULL; static char *test_loop_file = NULL; -static uint64_t t_dev_offset = 0; -static int _system(const char*, int); +struct crypt_device *cd = NULL, *cd2 = NULL; // Helpers -static int device_size(const char *device, uint64_t *size) -{ - int devfd, r = 0; - - devfd = open(device, O_RDONLY); - if(devfd == -1) - return -EINVAL; - - if (ioctl(devfd, BLKGETSIZE64, size) < 0) - r = -EINVAL; - close(devfd); - return r; -} - -static int fips_mode(void) -{ - int fd; - char buf = 0; - - if (access("/etc/system-fips", F_OK)) - return 0; - - fd = open("/proc/sys/crypto/fips_enabled", O_RDONLY); - - if (fd < 0) - return 0; - - if (read(fd, &buf, 1) != 1) - buf = '0'; - - close(fd); - - return (buf == '1'); -} - static int get_luks_offsets(int metadata_device, size_t keylength, unsigned int alignpayload_sec, @@ -151,14 +102,18 @@ static int get_luks_offsets(int metadata_device, uint64_t current_sector; uint32_t sectors_per_stripes_set; - if (!keylength) + if (!keylength) { + if (r_header_size) + *r_header_size = 0; + if (r_payload_offset) + *r_payload_offset = 0; return -1; + } sectors_per_stripes_set = DIV_ROUND_UP(keylength*LUKS_STRIPES, SECTOR_SIZE); - printf("sectors_per_stripes %" PRIu32 "\n", sectors_per_stripes_set); current_sector = DIV_ROUND_UP_MODULO(DIV_ROUND_UP(LUKS_PHDR_SIZE_B, SECTOR_SIZE), LUKS_ALIGN_KEYSLOTS / SECTOR_SIZE); - for(i=0;i < (LUKS_NUMKEYS - 1);i++) + for (i=0; i < (LUKS_NUMKEYS - 1); i++) current_sector = DIV_ROUND_UP_MODULO(current_sector + sectors_per_stripes_set, LUKS_ALIGN_KEYSLOTS / SECTOR_SIZE); if (r_header_size) @@ -178,170 +133,41 @@ static int get_luks_offsets(int metadata_device, return 0; } -/* - * Creates dm-linear target over the test loop device. Offset is held in - * global variables so that size can be tested whether it fits into remaining - * size of the loop device or not - */ -static int create_dmdevice_over_loop(const char *dm_name, const uint64_t size) -{ - char cmd[128]; - int r; - uint64_t r_size; - - if(device_size(THE_LOOP_DEV, &r_size) < 0 || r_size <= t_dev_offset || !size) - return -1; - if ((r_size - t_dev_offset) < size) { - printf("No enough space on backing loop device\n."); - return -2; - } - snprintf(cmd, sizeof(cmd), - "dmsetup create %s --table \"0 %" PRIu64 " linear %s %" PRIu64 "\"", - dm_name, size, THE_LOOP_DEV, t_dev_offset); - if (!(r = _system(cmd, 1))) { - t_dev_offset += size; - } - return r; -} - -// TODO some utility to remove dmdevice over the loop file - -// Get key from kernel dm mapping table using dm-ioctl -static int _get_key_dm(const char *name, char *buffer, unsigned int buffer_size) -{ - struct dm_task *dmt; - struct dm_info dmi; - uint64_t start, length; - char *target_type, *key, *params; - void *next = NULL; - int r = -EINVAL; - - if (!(dmt = dm_task_create(DM_DEVICE_TABLE))) - goto out; - if (!dm_task_set_name(dmt, name)) - goto out; - if (!dm_task_run(dmt)) - goto out; - if (!dm_task_get_info(dmt, &dmi)) - goto out; - if (!dmi.exists) - goto out; - - next = dm_get_next_target(dmt, next, &start, &length, &target_type, ¶ms); - if (!target_type || strcmp(target_type, "crypt") != 0) - goto out; - - (void)strsep(¶ms, " "); /* rcipher */ - key = strsep(¶ms, " "); - - if (buffer_size <= strlen(key)) - goto out; - - strncpy(buffer, key, buffer_size); - r = 0; -out: - if (dmt) - dm_task_destroy(dmt); - - return r; -} - -static int _prepare_keyfile(const char *name, const char *passphrase, int size) -{ - int fd, r; - - fd = open(name, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR|S_IWUSR); - if (fd != -1) { - r = write(fd, passphrase, size); - close(fd); - } else - r = 0; - - return r == size ? 0 : 1; -} - static void _remove_keyfiles(void) { remove(KEYFILE1); remove(KEYFILE2); } -// Decode key from its hex representation -static int crypt_decode_key(char *key, const char *hex, unsigned int size) -{ - char buffer[3]; - char *endp; - unsigned int i; - - buffer[2] = '\0'; - - for (i = 0; i < size; i++) { - buffer[0] = *hex++; - buffer[1] = *hex++; - - key[i] = (unsigned char)strtoul(buffer, &endp, 16); - - if (endp != &buffer[2]) - return -1; - } - - if (*hex != '\0') - return -1; +#if HAVE_DECL_DM_TASK_RETRY_REMOVE +#define DM_RETRY "--retry " +#else +#define DM_RETRY "" +#endif - return 0; -} +#define DM_NOSTDERR " 2>/dev/null" -static void cmdLineLog(int level, const char *msg) +static void _cleanup_dmdevices(void) { - strncat(global_log, msg, sizeof(global_log) - strlen(global_log)); - global_lines++; -} + struct stat st; -static void new_log(int level, const char *msg, void *usrptr) -{ - if (_debug) - printf("LOG: %s", msg); - cmdLineLog(level, msg); -} + if (!stat(DMDIR H_DEVICE, &st)) + _system("dmsetup remove " DM_RETRY H_DEVICE DM_NOSTDERR, 0); -static void reset_log(void) -{ - memset(global_log, 0, sizeof(global_log)); - global_lines = 0; -} + if (!stat(DMDIR H_DEVICE_WRONG, &st)) + _system("dmsetup remove " DM_RETRY H_DEVICE_WRONG DM_NOSTDERR, 0); -static int _system(const char *command, int warn) -{ - int r; - if (_debug) - printf("Running system: %s\n", command); - if ((r=system(command)) < 0 && warn) - printf("System command failed: %s", command); - return r; -} + if (!stat(DMDIR L_DEVICE_0S, &st)) + _system("dmsetup remove " DM_RETRY L_DEVICE_0S DM_NOSTDERR, 0); -static void _cleanup_dmdevices(void) -{ - struct stat st; + if (!stat(DMDIR L_DEVICE_1S, &st)) + _system("dmsetup remove " DM_RETRY L_DEVICE_1S DM_NOSTDERR, 0); - if (!stat(DMDIR H_DEVICE, &st)) { - _system("dmsetup remove " H_DEVICE, 0); - } - if (!stat(DMDIR H_DEVICE_WRONG, &st)) { - _system("dmsetup remove " H_DEVICE_WRONG, 0); - } - if (!stat(DMDIR L_DEVICE_0S, &st)) { - _system("dmsetup remove " L_DEVICE_0S, 0); - } - if (!stat(DMDIR L_DEVICE_1S, &st)) { - _system("dmsetup remove " L_DEVICE_1S, 0); - } - if (!stat(DMDIR L_DEVICE_WRONG, &st)) { - _system("dmsetup remove " L_DEVICE_WRONG, 0); - } - if (!stat(DMDIR L_DEVICE_OK, &st)) { - _system("dmsetup remove " L_DEVICE_OK, 0); - } + if (!stat(DMDIR L_DEVICE_WRONG, &st)) + _system("dmsetup remove " DM_RETRY L_DEVICE_WRONG DM_NOSTDERR, 0); + + if (!stat(DMDIR L_DEVICE_OK, &st)) + _system("dmsetup remove " DM_RETRY L_DEVICE_OK DM_NOSTDERR, 0); t_dev_offset = 0; } @@ -350,44 +176,50 @@ static void _cleanup(void) { struct stat st; + CRYPT_FREE(cd); + CRYPT_FREE(cd2); + //_system("udevadm settle", 0); if (!stat(DMDIR CDEVICE_1, &st)) - _system("dmsetup remove " CDEVICE_1, 0); + _system("dmsetup remove " DM_RETRY CDEVICE_1 DM_NOSTDERR, 0); if (!stat(DMDIR CDEVICE_2, &st)) - _system("dmsetup remove " CDEVICE_2, 0); + _system("dmsetup remove " DM_RETRY CDEVICE_2 DM_NOSTDERR, 0); if (!stat(DEVICE_EMPTY, &st)) - _system("dmsetup remove " DEVICE_EMPTY_name, 0); + _system("dmsetup remove " DM_RETRY DEVICE_EMPTY_name DM_NOSTDERR, 0); if (!stat(DEVICE_ERROR, &st)) - _system("dmsetup remove " DEVICE_ERROR_name, 0); + _system("dmsetup remove " DM_RETRY DEVICE_ERROR_name DM_NOSTDERR, 0); _cleanup_dmdevices(); - if (crypt_loop_device(THE_LOOP_DEV)) - crypt_loop_detach(THE_LOOP_DEV); + if (loop_device(THE_LOOP_DEV)) + loop_detach(THE_LOOP_DEV); - if (crypt_loop_device(DEVICE_1)) - crypt_loop_detach(DEVICE_1); + if (loop_device(DEVICE_1)) + loop_detach(DEVICE_1); - if (crypt_loop_device(DEVICE_2)) - crypt_loop_detach(DEVICE_2); + if (loop_device(DEVICE_2)) + loop_detach(DEVICE_2); - if (crypt_loop_device(DEVICE_3)) - crypt_loop_detach(DEVICE_3); + if (loop_device(DEVICE_3)) + loop_detach(DEVICE_3); _system("rm -f " IMAGE_EMPTY, 0); _system("rm -f " IMAGE1, 0); - remove(test_loop_file); - remove(tmp_file_1); + if (test_loop_file) + remove(test_loop_file); + if (tmp_file_1) + remove(tmp_file_1); remove(EVL_HEADER_1); remove(EVL_HEADER_2); remove(EVL_HEADER_3); remove(EVL_HEADER_4); + remove(EVL_HEADER_5); remove(VALID_HEADER); remove(BACKUP_FILE); @@ -417,16 +249,8 @@ static int _setup(void) if (_system(cmd, 1)) return 1; - if (!THE_LOOP_DEV) - THE_LOOP_DEV = crypt_loop_get_device(); - if (!THE_LOOP_DEV) { - printf("Cannot find free loop device.\n"); - return 1; - } - if (crypt_loop_device(THE_LOOP_DEV)) { - fd = crypt_loop_attach(THE_LOOP_DEV, test_loop_file, 0, 0, &ro); - close(fd); - } + fd = loop_attach(&THE_LOOP_DEV, test_loop_file, 0, 0, &ro); + close(fd); tmp_file_1 = strdup(THE_LFILE_TEMPLATE); if ((fd=mkstemp(tmp_file_1)) == -1) { @@ -441,49 +265,32 @@ static int _setup(void) _system("dmsetup create " DEVICE_EMPTY_name " --table \"0 10000 zero\"", 1); _system("dmsetup create " DEVICE_ERROR_name " --table \"0 10000 error\"", 1); - if (!DEVICE_1) - DEVICE_1 = crypt_loop_get_device(); - if (!DEVICE_1) { - printf("Cannot find free loop device.\n"); - return 1; - } - if (crypt_loop_device(DEVICE_1)) { - _system(" [ ! -e " IMAGE1 " ] && bzip2 -dk " IMAGE1 ".bz2", 1); - fd = crypt_loop_attach(DEVICE_1, IMAGE1, 0, 0, &ro); - close(fd); - } - if (!DEVICE_2) - DEVICE_2 = crypt_loop_get_device(); - if (!DEVICE_2) { - printf("Cannot find free loop device.\n"); - return 1; - } - if (crypt_loop_device(DEVICE_2)) { - _system("dd if=/dev/zero of=" IMAGE_EMPTY " bs=1M count=4 2>/dev/null", 1); - fd = crypt_loop_attach(DEVICE_2, IMAGE_EMPTY, 0, 0, &ro); - close(fd); - } - if (!DEVICE_3) - DEVICE_3 = crypt_loop_get_device(); - if (!DEVICE_3) { - printf("Cannot find free loop device.\n"); - return 1; - } + + _system(" [ ! -e " IMAGE1 " ] && xz -dk " IMAGE1 ".xz", 1); + fd = loop_attach(&DEVICE_1, IMAGE1, 0, 0, &ro); + close(fd); + + _system("dd if=/dev/zero of=" IMAGE_EMPTY " bs=1M count=10 2>/dev/null", 1); + fd = loop_attach(&DEVICE_2, IMAGE_EMPTY, 0, 0, &ro); + close(fd); + /* Keymaterial offset is less than 8 sectors */ - _system(" [ ! -e " EVL_HEADER_1 " ] && bzip2 -dk " EVL_HEADER_1 ".bz2", 1); + _system(" [ ! -e " EVL_HEADER_1 " ] && xz -dk " EVL_HEADER_1 ".xz", 1); /* keymaterial offset aims into payload area */ - _system(" [ ! -e " EVL_HEADER_2 " ] && bzip2 -dk " EVL_HEADER_2 ".bz2", 1); - /* keymaterial offset is valid, number of stripes causes payload area to be overwriten */ - _system(" [ ! -e " EVL_HEADER_3 " ] && bzip2 -dk " EVL_HEADER_3 ".bz2", 1); + _system(" [ ! -e " EVL_HEADER_2 " ] && xz -dk " EVL_HEADER_2 ".xz", 1); + /* keymaterial offset is valid, number of stripes causes payload area to be overwritten */ + _system(" [ ! -e " EVL_HEADER_3 " ] && xz -dk " EVL_HEADER_3 ".xz", 1); /* luks device header for data and header on same device. payloadOffset is greater than * device size (crypt_load() test) */ - _system(" [ ! -e " EVL_HEADER_4 " ] && bzip2 -dk " EVL_HEADER_4 ".bz2", 1); + _system(" [ ! -e " EVL_HEADER_4 " ] && xz -dk " EVL_HEADER_4 ".xz", 1); + /* two keyslots with same offset (overlapping keyslots) */ + _system(" [ ! -e " EVL_HEADER_5 " ] && xz -dk " EVL_HEADER_5 ".xz", 1); /* valid header: payloadOffset=4096, key_size=32, * volume_key = bb21158c733229347bd4e681891e213d94c685be6a5b84818afe7a78a6de7a1a */ - _system(" [ ! -e " VALID_HEADER " ] && bzip2 -dk " VALID_HEADER ".bz2", 1); + _system(" [ ! -e " VALID_HEADER " ] && xz -dk " VALID_HEADER ".xz", 1); /* Prepare tcrypt images */ - _system(" [ ! -d tcrypt-images ] && tar xjf tcrypt-images.tar.bz2 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); @@ -492,75 +299,14 @@ static int _setup(void) if (_debug) printf("FIPS MODE: %d\n", _fips_mode); - return 0; -} - -static void check_ok(int status, int line, const char *func) -{ - char buf[256]; - - if (status) { - crypt_get_error(buf, sizeof(buf)); - printf("FAIL line %d [%s]: code %d, %s\n", line, func, status, buf); - _cleanup(); - exit(-1); - } -} - -static void check_ko(int status, int line, const char *func) -{ - char buf[256]; - - memset(buf, 0, sizeof(buf)); - crypt_get_error(buf, sizeof(buf)); - if (status >= 0) { - printf("FAIL line %d [%s]: code %d, %s\n", line, func, status, buf); - _cleanup(); - exit(-1); - } else if (_verbose) - printf(" => errno %d, errmsg: %s\n", status, buf); -} - -static void check_equal(int line, const char *func, int64_t x, int64_t y) -{ - printf("FAIL line %d [%s]: expected equal values differs: %" - PRIi64 " != %" PRIi64 "\n", line, func, x, y); - _cleanup(); - exit(-1); -} + /* Use default log callback */ + crypt_set_log_callback(NULL, &global_log_callback, NULL); -static void xlog(const char *msg, const char *tst, const char *func, int line, const char *txt) -{ - if (_verbose) { - if (txt) - printf(" [%s,%s:%d] %s [%s]\n", msg, func, line, tst, txt); - else - printf(" [%s,%s:%d] %s\n", msg, func, line, tst); - } - if (_quit) { - if (_verbose) - printf("Interrupted by a signal.\n"); - _cleanup(); - exit(-1); - } + return 0; } -/* crypt_device context must be "cd" to parse error properly here */ -#define OK_(x) do { xlog("(success)", #x, __FUNCTION__, __LINE__, NULL); \ - check_ok((x), __LINE__, __FUNCTION__); \ - } while(0) -#define FAIL_(x, y) do { xlog("(fail) ", #x, __FUNCTION__, __LINE__, y); \ - check_ko((x), __LINE__, __FUNCTION__); \ - } while(0) -#define EQ_(x, y) do { int64_t _x = (x), _y = (y); \ - xlog("(equal) ", #x " == " #y, __FUNCTION__, __LINE__, NULL); \ - if (_x != _y) check_equal(__LINE__, __FUNCTION__, _x, _y); \ - } while(0) -#define RUN_(x, y) do { printf("%s: %s\n", #x, (y)); x(); } while (0) - static void AddDevicePlain(void) { - struct crypt_device *cd; struct crypt_params_plain params = { .hash = "sha1", .skip = 0, @@ -584,7 +330,7 @@ static void AddDevicePlain(void) FAIL_(crypt_init(&cd, DEVICE_WRONG), "nonexistent device name "); FAIL_(crypt_init(&cd, DEVICE_CHAR), "character device as backing device"); OK_(crypt_init(&cd, tmp_file_1)); - crypt_free(cd); + CRYPT_FREE(cd); // test crypt_format, crypt_get_cipher, crypt_get_cipher_mode, crypt_get_volume_key_size OK_(crypt_init(&cd,DEVICE_1)); @@ -604,7 +350,7 @@ static void AddDevicePlain(void) // crypt_set_uuid() FAIL_(crypt_set_uuid(cd,DEVICE_1_UUID),"can't set uuid to plain device"); - crypt_free(cd); + CRYPT_FREE(cd); // default is "plain" hash - no password hash OK_(crypt_init(&cd, DEVICE_1)); @@ -613,10 +359,10 @@ static void AddDevicePlain(void) OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0)); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); // test boundaries in offset parameter - device_size(DEVICE_1,&size); + t_device_size(DEVICE_1,&size); params.hash = NULL; // zero sectors length params.offset = size >> SECTOR_SHIFT; @@ -628,17 +374,17 @@ static void AddDevicePlain(void) EQ_(crypt_status(cd, CDEVICE_1), CRYPT_INACTIVE); // data part of crypt device is of 1 sector size params.offset = (size >> SECTOR_SHIFT) - 1; - crypt_free(cd); + CRYPT_FREE(cd); OK_(crypt_init(&cd, DEVICE_1)); OK_(crypt_format(cd, CRYPT_PLAIN, cipher, cipher_mode, NULL, NULL, key_size, ¶ms)); OK_(crypt_activate_by_passphrase(cd, CDEVICE_1, CRYPT_ANY_SLOT, passphrase, strlen(passphrase), 0)); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); snprintf(path, sizeof(path), "%s/%s", crypt_get_dir(), CDEVICE_1); - if (device_size(path, &r_size) >= 0) + if (t_device_size(path, &r_size) >= 0) EQ_(r_size>>SECTOR_SHIFT, 1); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); // size > device_size params.offset = 0; @@ -647,7 +393,7 @@ static void AddDevicePlain(void) OK_(crypt_format(cd, CRYPT_PLAIN, cipher, cipher_mode, NULL, NULL, key_size, ¶ms)); FAIL_(crypt_activate_by_passphrase(cd, CDEVICE_1, CRYPT_ANY_SLOT, passphrase, strlen(passphrase), 0),"Device too small"); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_INACTIVE); - crypt_free(cd); + CRYPT_FREE(cd); // offset == device_size (autodetect size) params.offset = (size >> SECTOR_SHIFT); @@ -656,7 +402,7 @@ static void AddDevicePlain(void) OK_(crypt_format(cd, CRYPT_PLAIN, cipher, cipher_mode, NULL, NULL, key_size, ¶ms)); FAIL_(crypt_activate_by_passphrase(cd, CDEVICE_1, CRYPT_ANY_SLOT, passphrase, strlen(passphrase), 0),"Device too small"); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_INACTIVE); - crypt_free(cd); + CRYPT_FREE(cd); // offset == device_size (user defined size) params.offset = (size >> SECTOR_SHIFT); @@ -665,7 +411,7 @@ static void AddDevicePlain(void) OK_(crypt_format(cd, CRYPT_PLAIN, cipher, cipher_mode, NULL, NULL, key_size, ¶ms)); FAIL_(crypt_activate_by_passphrase(cd, CDEVICE_1, CRYPT_ANY_SLOT, passphrase, strlen(passphrase), 0),"Device too small"); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_INACTIVE); - crypt_free(cd); + CRYPT_FREE(cd); // offset+size > device_size params.offset = 42; @@ -674,7 +420,7 @@ static void AddDevicePlain(void) OK_(crypt_format(cd, CRYPT_PLAIN, cipher, cipher_mode, NULL, NULL, key_size, ¶ms)); FAIL_(crypt_activate_by_passphrase(cd, CDEVICE_1, CRYPT_ANY_SLOT, passphrase, strlen(passphrase), 0),"Offset and size are beyond device real size"); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_INACTIVE); - crypt_free(cd); + CRYPT_FREE(cd); // offset+size == device_size params.offset = 42; @@ -683,11 +429,11 @@ static void AddDevicePlain(void) OK_(crypt_format(cd, CRYPT_PLAIN, cipher, cipher_mode, NULL, NULL, key_size, ¶ms)); OK_(crypt_activate_by_passphrase(cd, CDEVICE_1, CRYPT_ANY_SLOT, passphrase, strlen(passphrase), 0)); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); - if (!device_size(path, &r_size)) + if (!t_device_size(path, &r_size)) EQ_((r_size >> SECTOR_SHIFT),params.size); OK_(crypt_deactivate(cd,CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); params.hash = "sha1"; params.offset = 0; params.size = 0; @@ -709,13 +455,19 @@ static void AddDevicePlain(void) close(fd); OK_(crypt_deactivate(cd, CDEVICE_1)); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_INACTIVE); - crypt_free(cd); + CRYPT_FREE(cd); // crypt_init_by_name_and_header OK_(crypt_init(&cd,DEVICE_1)); OK_(crypt_format(cd, CRYPT_PLAIN, cipher, cipher_mode, NULL, NULL, key_size, ¶ms)); OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0)); - crypt_free(cd); + CRYPT_FREE(cd); + + // init with detached header is not supported + OK_(crypt_init_data_device(&cd, DEVICE_2, DEVICE_1)); + FAIL_(crypt_format(cd, CRYPT_PLAIN, cipher, cipher_mode, NULL, NULL, key_size, ¶ms), + "can't use plain with separate metadata device"); + CRYPT_FREE(cd); FAIL_(crypt_init_by_name_and_header(&cd, CDEVICE_1, H_DEVICE),"can't init plain device by header device"); OK_(crypt_init_by_name(&cd, CDEVICE_1)); @@ -725,7 +477,7 @@ static void AddDevicePlain(void) EQ_(params.skip, crypt_get_iv_offset(cd)); EQ_(params.offset, crypt_get_data_offset(cd)); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); OK_(crypt_init(&cd,DEVICE_1)); OK_(crypt_format(cd,CRYPT_PLAIN,cipher,cipher_mode,NULL,NULL,key_size,¶ms)); @@ -734,6 +486,7 @@ static void AddDevicePlain(void) // crypt_set_data_device FAIL_(crypt_set_data_device(cd,H_DEVICE),"can't set data device for plain device"); + NULL_(crypt_get_metadata_device_name(cd)); // crypt_get_type OK_(strcmp(crypt_get_type(cd),CRYPT_PLAIN)); @@ -743,7 +496,7 @@ static void AddDevicePlain(void) // crypt_resize() OK_(crypt_resize(cd,CDEVICE_1,size>>SECTOR_SHIFT)); // same size - if (!device_size(path,&r_size)) + if (!t_device_size(path,&r_size)) EQ_(r_size, size); // size overlaps @@ -752,14 +505,14 @@ static void AddDevicePlain(void) // resize ok OK_(crypt_resize(cd,CDEVICE_1, 123)); - if (!device_size(path,&r_size)) + if (!t_device_size(path,&r_size)) EQ_(r_size>>SECTOR_SHIFT, 123); OK_(crypt_resize(cd,CDEVICE_1,0)); // full size (autodetect) - if (!device_size(path,&r_size)) + if (!t_device_size(path,&r_size)) EQ_(r_size, size); OK_(crypt_deactivate(cd,CDEVICE_1)); EQ_(crypt_status(cd,CDEVICE_1),CRYPT_INACTIVE); - crypt_free(cd); + CRYPT_FREE(cd); // offset tests OK_(crypt_init(&cd,DEVICE_1)); @@ -767,32 +520,32 @@ static void AddDevicePlain(void) params.size = (size>>SECTOR_SHIFT) - params.offset - 10; OK_(crypt_format(cd,CRYPT_PLAIN,cipher,cipher_mode,NULL,NULL,key_size,¶ms)); OK_(crypt_activate_by_volume_key(cd,CDEVICE_1,key,key_size,0)); - if (!device_size(path,&r_size)) + if (!t_device_size(path,&r_size)) EQ_(r_size>>SECTOR_SHIFT, params.size); // resize to fill remaining capacity OK_(crypt_resize(cd,CDEVICE_1,params.size + 10)); - if (!device_size(path,&r_size)) + if (!t_device_size(path,&r_size)) EQ_(r_size>>SECTOR_SHIFT, params.size + 10); // 1 sector beyond real size FAIL_(crypt_resize(cd,CDEVICE_1,params.size + 11), "new device size overlaps backing device"); // with respect to offset - if (!device_size(path,&r_size)) + if (!t_device_size(path,&r_size)) EQ_(r_size>>SECTOR_SHIFT, params.size + 10); EQ_(crypt_status(cd,CDEVICE_1),CRYPT_ACTIVE); fd = open(path, O_RDONLY); + NOTFAIL_(fd, "Bad loop device."); close(fd); - OK_(fd < 0); // resize to minimal size OK_(crypt_resize(cd,CDEVICE_1, 1)); // minimal device size - if (!device_size(path,&r_size)) + if (!t_device_size(path,&r_size)) EQ_(r_size>>SECTOR_SHIFT, 1); // use size of backing device (autodetect with respect to offset) OK_(crypt_resize(cd,CDEVICE_1,0)); - if (!device_size(path,&r_size)) + if (!t_device_size(path,&r_size)) EQ_(r_size>>SECTOR_SHIFT, (size >> SECTOR_SHIFT)- 42); OK_(crypt_deactivate(cd,CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); params.size = 0; params.offset = 0; @@ -807,16 +560,14 @@ static void AddDevicePlain(void) EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); // retrieve volume key check - if (!_fips_mode) { - memset(key2, 0, key_size); - key_size--; - // small buffer - FAIL_(crypt_volume_key_get(cd, CRYPT_ANY_SLOT, key2, &key_size, passphrase, strlen(passphrase)), "small buffer"); - key_size++; - OK_(crypt_volume_key_get(cd, CRYPT_ANY_SLOT, key2, &key_size, passphrase, strlen(passphrase))); - - OK_(memcmp(key, key2, key_size)); - } + memset(key2, 0, key_size); + key_size--; + // small buffer + FAIL_(crypt_volume_key_get(cd, CRYPT_ANY_SLOT, key2, &key_size, passphrase, strlen(passphrase)), "small buffer"); + key_size++; + OK_(crypt_volume_key_get(cd, CRYPT_ANY_SLOT, key2, &key_size, passphrase, strlen(passphrase))); + OK_(memcmp(key, key2, key_size)); + OK_(strcmp(cipher, crypt_get_cipher(cd))); OK_(strcmp(cipher_mode, crypt_get_cipher_mode(cd))); EQ_((int)key_size, crypt_get_volume_key_size(cd)); @@ -824,17 +575,20 @@ static void AddDevicePlain(void) OK_(crypt_deactivate(cd, CDEVICE_1)); // now with keyfile - OK_(_prepare_keyfile(KEYFILE1, KEY1, strlen(KEY1))); - OK_(_prepare_keyfile(KEYFILE2, KEY2, strlen(KEY2))); + OK_(prepare_keyfile(KEYFILE1, KEY1, strlen(KEY1))); + OK_(prepare_keyfile(KEYFILE2, KEY2, strlen(KEY2))); FAIL_(crypt_activate_by_keyfile(cd, NULL, CRYPT_ANY_SLOT, KEYFILE1, 0, 0), "cannot verify key with plain"); EQ_(0, crypt_activate_by_keyfile(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, 0, 0)); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); OK_(crypt_deactivate(cd, CDEVICE_1)); FAIL_(crypt_activate_by_keyfile_offset(cd, NULL, CRYPT_ANY_SLOT, KEYFILE1, 0, strlen(KEY1) + 1, 0), "cannot seek"); + FAIL_(crypt_activate_by_keyfile_device_offset(cd, NULL, CRYPT_ANY_SLOT, KEYFILE1, 0, strlen(KEY1) + 1, 0), "cannot seek"); EQ_(0, crypt_activate_by_keyfile_offset(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, 0, 0, 0)); OK_(crypt_deactivate(cd, CDEVICE_1)); + EQ_(0, crypt_activate_by_keyfile_device_offset(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, 0, 0, 0)); + OK_(crypt_deactivate(cd, CDEVICE_1)); _remove_keyfiles(); - crypt_free(cd); + CRYPT_FREE(cd); OK_(crypt_init(&cd,DEVICE_1)); OK_(crypt_format(cd,CRYPT_PLAIN,cipher,cipher_mode,NULL,NULL,key_size,¶ms)); @@ -847,33 +601,19 @@ static void AddDevicePlain(void) EQ_(crypt_keyslot_status(cd, 0), CRYPT_SLOT_INVALID); _remove_keyfiles(); - crypt_free(cd); -} - -#define CALLBACK_ERROR "calback_error xyz" -static int pass_callback_err(const char *msg, char *buf, size_t length, void *usrptr) -{ - struct crypt_device *cd = usrptr; - - assert(cd); - assert(length); - assert(msg); - - crypt_log(cd, CRYPT_LOG_ERROR, CALLBACK_ERROR); - return -EINVAL; + CRYPT_FREE(cd); } -static int pass_callback_ok(const char *msg, char *buf, size_t length, void *usrptr) +static int new_messages = 0; +static void new_log(int level, const char *msg, void *usrptr) { - assert(length); - assert(msg); - strcpy(buf, PASSPHRASE); - return strlen(buf); + if (level == CRYPT_LOG_ERROR) + new_messages++; + global_log_callback(level, msg, usrptr); } static void CallbacksTest(void) { - struct crypt_device *cd; struct crypt_params_plain params = { .hash = "sha1", .skip = 0, @@ -884,50 +624,24 @@ static void CallbacksTest(void) const char *cipher = "aes"; const char *cipher_mode = "cbc-essiv:sha256"; const char *passphrase = PASSPHRASE; - char buf1[256] = {0}, buf2[256] = {0}; OK_(crypt_init(&cd, DEVICE_1)); + new_messages = 0; crypt_set_log_callback(cd, &new_log, NULL); - //crypt_set_log_callback(cd, NULL, NULL); - + EQ_(new_messages, 0); OK_(crypt_format(cd, CRYPT_PLAIN, cipher, cipher_mode, NULL, NULL, key_size, ¶ms)); - OK_(crypt_activate_by_passphrase(cd, CDEVICE_1, CRYPT_ANY_SLOT, passphrase, strlen(passphrase), 0)); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); + EQ_(new_messages, 0); + FAIL_(crypt_activate_by_passphrase(cd, CDEVICE_1, CRYPT_ANY_SLOT, passphrase, strlen(passphrase), 0), "already exists"); + EQ_(new_messages, 1); + crypt_set_log_callback(cd, NULL, NULL); OK_(crypt_deactivate(cd, CDEVICE_1)); - - reset_log(); - crypt_set_password_callback(cd, pass_callback_err, cd); - FAIL_(crypt_activate_by_passphrase(cd, CDEVICE_1, CRYPT_ANY_SLOT, NULL, 0, 0), "callback fails"); - EQ_(strncmp(global_log, CALLBACK_ERROR, strlen(CALLBACK_ERROR)), 0); - - crypt_set_password_callback(cd, pass_callback_ok, NULL); - OK_(crypt_activate_by_passphrase(cd, CDEVICE_1, CRYPT_ANY_SLOT, NULL, 0, 0)); - EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); - OK_(crypt_deactivate(cd, CDEVICE_1)); - - // Check error reporting. - // This must fail and create error message - crypt_deactivate(cd, CDEVICE_1); - - // Here context must be the same - crypt_get_error(buf1, sizeof(buf1)); - crypt_last_error(cd, buf2, sizeof(buf2)); - OK_(!*buf1); - OK_(!*buf2); - OK_(strcmp(buf1, buf2)); - - crypt_get_error(buf1, sizeof(buf1)); - crypt_last_error(cd, buf2, sizeof(buf2)); - OK_(*buf1); - OK_(*buf2); - - crypt_free(cd); + CRYPT_FREE(cd); } static void UseLuksDevice(void) { - struct crypt_device *cd; char key[128]; size_t key_size; @@ -948,25 +662,26 @@ static void UseLuksDevice(void) EQ_((int)key_size, crypt_get_volume_key_size(cd)); EQ_(1032, crypt_get_data_offset(cd)); - if (!_fips_mode) { - EQ_(0, crypt_volume_key_get(cd, CRYPT_ANY_SLOT, key, &key_size, KEY1, strlen(KEY1))); - OK_(crypt_volume_key_verify(cd, key, key_size)); - OK_(crypt_activate_by_volume_key(cd, NULL, key, key_size, 0)); - OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0)); - EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); - OK_(crypt_deactivate(cd, CDEVICE_1)); + EQ_(0, crypt_volume_key_get(cd, CRYPT_ANY_SLOT, key, &key_size, KEY1, strlen(KEY1))); + OK_(crypt_volume_key_verify(cd, key, key_size)); + OK_(crypt_activate_by_volume_key(cd, NULL, key, key_size, 0)); + OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0)); + EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); + OK_(crypt_deactivate(cd, CDEVICE_1)); - key[1] = ~key[1]; - FAIL_(crypt_volume_key_verify(cd, key, key_size), "key mismatch"); - FAIL_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0), "key mismatch"); - } - crypt_free(cd); + key[1] = ~key[1]; + FAIL_(crypt_volume_key_verify(cd, key, key_size), "key mismatch"); + FAIL_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0), "key mismatch"); + + CRYPT_FREE(cd); } static void SuspendDevice(void) { + struct crypt_active_device cad; + char key[128]; + size_t key_size; int suspend_status; - struct crypt_device *cd; OK_(crypt_init(&cd, DEVICE_1)); OK_(crypt_load(cd, CRYPT_LUKS1, NULL)); @@ -976,67 +691,85 @@ static void SuspendDevice(void) if (suspend_status == -ENOTSUP) { printf("WARNING: Suspend/Resume not supported, skipping test.\n"); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); return; } OK_(suspend_status); + OK_(crypt_get_active_device(cd, CDEVICE_1, &cad)); + EQ_(CRYPT_ACTIVATE_SUSPENDED, cad.flags & CRYPT_ACTIVATE_SUSPENDED); + FAIL_(crypt_suspend(cd, CDEVICE_1), "already suspended"); FAIL_(crypt_resume_by_passphrase(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEY1, strlen(KEY1)-1), "wrong key"); OK_(crypt_resume_by_passphrase(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEY1, strlen(KEY1))); FAIL_(crypt_resume_by_passphrase(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEY1, strlen(KEY1)), "not suspended"); - OK_(_prepare_keyfile(KEYFILE1, KEY1, strlen(KEY1))); + OK_(crypt_get_active_device(cd, CDEVICE_1, &cad)); + EQ_(0, cad.flags & CRYPT_ACTIVATE_SUSPENDED); + + OK_(prepare_keyfile(KEYFILE1, KEY1, strlen(KEY1))); OK_(crypt_suspend(cd, CDEVICE_1)); FAIL_(crypt_resume_by_keyfile(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1 "blah", 0), "wrong keyfile"); FAIL_(crypt_resume_by_keyfile_offset(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, 1, 0), "wrong key"); - OK_(crypt_resume_by_keyfile_offset(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, 0, 0)); + FAIL_(crypt_resume_by_keyfile_device_offset(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, 1, 0), "wrong key"); + OK_(crypt_resume_by_keyfile_device_offset(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, 0, 0)); FAIL_(crypt_resume_by_keyfile(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, 0), "not suspended"); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); /* create LUKS device with detached header */ OK_(crypt_init(&cd, DEVICE_1)); OK_(crypt_load(cd, CRYPT_LUKS1, NULL)); OK_(crypt_set_data_device(cd, DEVICE_2)); OK_(crypt_activate_by_passphrase(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEY1, strlen(KEY1), 0)); - crypt_free(cd); + CRYPT_FREE(cd); /* Should be able to suspend but not resume if not header specified */ OK_(crypt_init_by_name(&cd, CDEVICE_1)); OK_(crypt_suspend(cd, CDEVICE_1)); FAIL_(crypt_suspend(cd, CDEVICE_1), "already suspended"); FAIL_(crypt_resume_by_passphrase(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEY1, strlen(KEY1)-1), "no header"); - crypt_free(cd); + CRYPT_FREE(cd); OK_(crypt_init_by_name_and_header(&cd, CDEVICE_1, DEVICE_1)); OK_(crypt_resume_by_passphrase(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEY1, strlen(KEY1))); + /* Resume by volume key */ + OK_(crypt_suspend(cd, CDEVICE_1)); + key_size = sizeof(key); + memset(key, 0, key_size); + FAIL_(crypt_resume_by_volume_key(cd, CDEVICE_1, key, key_size), "wrong key"); + OK_(crypt_volume_key_get(cd, CRYPT_ANY_SLOT, key, &key_size, KEY1, strlen(KEY1))); + OK_(crypt_resume_by_volume_key(cd, CDEVICE_1, key, key_size)); + OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); _remove_keyfiles(); } static void AddDeviceLuks(void) { - struct crypt_device *cd; + enum { OFFSET_1M = 2048 , OFFSET_2M = 4096, OFFSET_4M = 8192, OFFSET_8M = 16384 }; struct crypt_params_luks1 params = { .hash = "sha512", - .data_alignment = 2048, // 4M, data offset will be 4096 + .data_alignment = OFFSET_1M, // 4M, data offset will be 4096 .data_device = DEVICE_2 }; - char key[128], key2[128]; + char key[128], key2[128], key3[128]; const char *passphrase = "blabla", *passphrase2 = "nsdkFI&Y#.sd"; const char *mk_hex = "bb21158c733229347bd4e681891e213d94c685be6a5b84818afe7a78a6de7a1a"; + const char *mk_hex2 = "bb21158c733229347bd4e681891e213d94c685be6a5b84818afe7a78a6de7a1e"; size_t key_size = strlen(mk_hex) / 2; const char *cipher = "aes"; const char *cipher_mode = "cbc-essiv:sha256"; uint64_t r_payload_offset, r_header_size, r_size_1; + struct crypt_pbkdf_type pbkdf; crypt_decode_key(key, mk_hex, key_size); + crypt_decode_key(key3, mk_hex2, key_size); // init test devices OK_(get_luks_offsets(1, key_size, 0, 0, &r_header_size, &r_payload_offset)); @@ -1047,13 +780,13 @@ static void AddDeviceLuks(void) OK_(crypt_init(&cd, DMDIR H_DEVICE_WRONG)); params.data_alignment = 0; FAIL_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms), "Not enough space for keyslots material"); - crypt_free(cd); + CRYPT_FREE(cd); // test payload_offset = 0 for encrypted device with external header device OK_(crypt_init(&cd, DMDIR H_DEVICE)); OK_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms)); EQ_(crypt_get_data_offset(cd), 0); - crypt_free(cd); + CRYPT_FREE(cd); params.data_alignment = 0; params.data_device = NULL; @@ -1062,12 +795,37 @@ static void AddDeviceLuks(void) OK_(crypt_init(&cd, DEVICE_2)); OK_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms)); OK_(!(crypt_get_data_offset(cd) > 0)); - crypt_free(cd); + CRYPT_FREE(cd); + + // set_data_offset has priority, alignment must be 0 or must be compatible + params.data_alignment = 0; + OK_(crypt_init(&cd, DEVICE_2)); + OK_(crypt_set_data_offset(cd, OFFSET_8M)); + OK_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms)); + EQ_(crypt_get_data_offset(cd), OFFSET_8M); + CRYPT_FREE(cd); + + // Load gets the value from metadata + OK_(crypt_init(&cd, DEVICE_2)); + OK_(crypt_set_data_offset(cd, OFFSET_2M)); + OK_(crypt_load(cd, CRYPT_LUKS1, NULL)); + EQ_(crypt_get_data_offset(cd), OFFSET_8M); + CRYPT_FREE(cd); + + params.data_alignment = OFFSET_4M; + OK_(crypt_init(&cd, DEVICE_2)); + FAIL_(crypt_set_data_offset(cd, OFFSET_2M + 1), "Not aligned to 4096"); // must be aligned to 4k + OK_(crypt_set_data_offset(cd, OFFSET_2M)); + FAIL_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms), "Alignment not compatible"); + OK_(crypt_set_data_offset(cd, OFFSET_4M)); + OK_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms)); + EQ_(crypt_get_data_offset(cd), OFFSET_4M); + CRYPT_FREE(cd); /* * test limit values for backing device size */ - params.data_alignment = 4096; + params.data_alignment = OFFSET_2M; OK_(get_luks_offsets(0, key_size, params.data_alignment, 0, NULL, &r_payload_offset)); OK_(create_dmdevice_over_loop(L_DEVICE_0S, r_payload_offset)); OK_(create_dmdevice_over_loop(L_DEVICE_1S, r_payload_offset + 1)); @@ -1077,13 +835,13 @@ static void AddDeviceLuks(void) // 1 sector less than required OK_(crypt_init(&cd, DMDIR L_DEVICE_WRONG)); FAIL_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms), "Device too small"); - crypt_free(cd); + CRYPT_FREE(cd); // 0 sectors for encrypted area OK_(crypt_init(&cd, DMDIR L_DEVICE_0S)); OK_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms)); FAIL_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0), "Encrypted area too small"); - crypt_free(cd); + CRYPT_FREE(cd); // 1 sector for encrypted area OK_(crypt_init(&cd, DMDIR L_DEVICE_1S)); @@ -1091,20 +849,20 @@ static void AddDeviceLuks(void) EQ_(crypt_get_data_offset(cd), params.data_alignment); OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0)); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); - OK_(device_size(DMDIR CDEVICE_1, &r_size_1)); + OK_(t_device_size(DMDIR CDEVICE_1, &r_size_1)); EQ_(r_size_1, SECTOR_SIZE); OK_(crypt_deactivate(cd, CDEVICE_1)); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_INACTIVE); // restrict format only to empty context - FAIL_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms), "Context is already formated"); - FAIL_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, NULL), "Context is already formated"); + FAIL_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms), "Context is already formatted"); + FAIL_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, NULL), "Context is already formatted"); // change data device to wrong one OK_(crypt_set_data_device(cd, DMDIR L_DEVICE_0S)); FAIL_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0), "Device too small"); OK_(crypt_set_data_device(cd, DMDIR L_DEVICE_1S)); OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0)); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); params.data_alignment = 0; params.data_device = DEVICE_2; @@ -1114,43 +872,43 @@ static void AddDeviceLuks(void) OK_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms)); EQ_(crypt_keyslot_add_by_volume_key(cd, 7, key, key_size, passphrase, strlen(passphrase)), 7); EQ_(crypt_activate_by_passphrase(cd, CDEVICE_1, 7, passphrase, strlen(passphrase) ,0), 7); - crypt_free(cd); + CRYPT_FREE(cd); OK_(crypt_init_by_name_and_header(&cd, CDEVICE_1, DMDIR H_DEVICE)); - FAIL_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms), "Context is already formated"); + FAIL_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms), "Context is already formatted"); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); - crypt_free(cd); + CRYPT_FREE(cd); // check active status without header OK_(crypt_init_by_name_and_header(&cd, CDEVICE_1, NULL)); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); - OK_(!!crypt_get_type(cd)); + NULL_(crypt_get_type(cd)); OK_(strcmp(cipher, crypt_get_cipher(cd))); OK_(strcmp(cipher_mode, crypt_get_cipher_mode(cd))); EQ_((int)key_size, crypt_get_volume_key_size(cd)); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); - params.data_alignment = 2048; + params.data_alignment = OFFSET_1M; params.data_device = NULL; // test uuid mismatch and _init_by_name_and_header OK_(crypt_init(&cd, DMDIR L_DEVICE_1S)); OK_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms)); OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0)); - crypt_free(cd); + CRYPT_FREE(cd); params.data_alignment = 0; params.data_device = DEVICE_2; OK_(crypt_init(&cd, DMDIR H_DEVICE)); OK_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms)); - crypt_free(cd); + CRYPT_FREE(cd); // there we've got uuid mismatch OK_(crypt_init_by_name_and_header(&cd, CDEVICE_1, DMDIR H_DEVICE)); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); - OK_(!!crypt_get_type(cd)); + NULL_(crypt_get_type(cd)); FAIL_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0), "Device is active"); FAIL_(crypt_activate_by_volume_key(cd, CDEVICE_2, key, key_size, 0), "Device is active"); EQ_(crypt_status(cd, CDEVICE_2), CRYPT_INACTIVE); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); params.data_device = NULL; @@ -1172,8 +930,19 @@ static void AddDeviceLuks(void) crypt_set_iteration_time(cd, 1); EQ_(1, crypt_keyslot_add_by_volume_key(cd, 1, key, key_size, KEY1, strlen(KEY1))); - OK_(_prepare_keyfile(KEYFILE1, KEY1, strlen(KEY1))); - OK_(_prepare_keyfile(KEYFILE2, KEY2, strlen(KEY2))); + + // PBKDF info (in LUKS1 slots are the same) + FAIL_(crypt_keyslot_get_pbkdf(cd, 1, NULL), "PBKDF struct required"); + OK_(crypt_keyslot_get_pbkdf(cd, 1, &pbkdf)); + OK_(strcmp(pbkdf.type, CRYPT_KDF_PBKDF2)); + OK_(strcmp(pbkdf.hash, params.hash)); + OK_(pbkdf.iterations < 1000); /* set by minimum iterations above */ + EQ_(0, pbkdf.max_memory_kb); + EQ_(0, pbkdf.parallel_threads); + FAIL_(crypt_keyslot_get_pbkdf(cd, 2, &pbkdf), "Keyslot 2 is inactive."); + + OK_(prepare_keyfile(KEYFILE1, KEY1, strlen(KEY1))); + OK_(prepare_keyfile(KEYFILE2, KEY2, strlen(KEY2))); EQ_(2, crypt_keyslot_add_by_keyfile(cd, 2, KEYFILE1, 0, KEYFILE2, 0)); FAIL_(crypt_keyslot_add_by_keyfile_offset(cd, 3, KEYFILE1, 0, 1, KEYFILE2, 0, 1), "wrong key"); EQ_(3, crypt_keyslot_add_by_keyfile_offset(cd, 3, KEYFILE1, 0, 0, KEYFILE2, 0, 1)); @@ -1212,23 +981,20 @@ static void AddDeviceLuks(void) EQ_(7, crypt_activate_by_passphrase(cd, NULL, 7, passphrase2, strlen(passphrase2), 0)); EQ_(6, crypt_keyslot_change_by_passphrase(cd, CRYPT_ANY_SLOT, 6, passphrase2, strlen(passphrase2), passphrase, strlen(passphrase))); - if (!_fips_mode) { - EQ_(6, crypt_volume_key_get(cd, CRYPT_ANY_SLOT, key2, &key_size, passphrase, strlen(passphrase))); - OK_(crypt_volume_key_verify(cd, key2, key_size)); + EQ_(6, crypt_volume_key_get(cd, CRYPT_ANY_SLOT, key2, &key_size, passphrase, strlen(passphrase))); + OK_(crypt_volume_key_verify(cd, key2, key_size)); + + OK_(memcmp(key, key2, key_size)); - OK_(memcmp(key, key2, key_size)); - } OK_(strcmp(cipher, crypt_get_cipher(cd))); OK_(strcmp(cipher_mode, crypt_get_cipher_mode(cd))); EQ_((int)key_size, crypt_get_volume_key_size(cd)); - EQ_(4096, crypt_get_data_offset(cd)); + EQ_(OFFSET_2M, crypt_get_data_offset(cd)); OK_(strcmp(DEVICE_2, crypt_get_device_name(cd))); reset_log(); - crypt_set_log_callback(cd, &new_log, NULL); OK_(crypt_dump(cd)); OK_(!(global_lines != 0)); - crypt_set_log_callback(cd, NULL, NULL); reset_log(); FAIL_(crypt_set_uuid(cd, "blah"), "wrong UUID format"); @@ -1236,13 +1002,24 @@ static void AddDeviceLuks(void) OK_(strcmp(DEVICE_TEST_UUID, crypt_get_uuid(cd))); FAIL_(crypt_deactivate(cd, CDEVICE_2), "not active"); - crypt_free(cd); + CRYPT_FREE(cd); + + // No benchmark PBKDF2 + pbkdf.flags = CRYPT_PBKDF_NO_BENCHMARK; + pbkdf.hash = "sha256"; + pbkdf.iterations = 1000; + pbkdf.time_ms = 0; + + OK_(crypt_init(&cd, DEVICE_2)); + OK_(crypt_set_pbkdf_type(cd, &pbkdf)); + OK_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms)); + CRYPT_FREE(cd); + _cleanup_dmdevices(); } static void UseTempVolumes(void) { - struct crypt_device *cd; char tmp[256]; // Tepmporary device without keyslot but with on-disk LUKS header @@ -1251,14 +1028,14 @@ static void UseTempVolumes(void) OK_(crypt_format(cd, CRYPT_LUKS1, "aes", "cbc-essiv:sha256", NULL, NULL, 16, NULL)); OK_(crypt_activate_by_volume_key(cd, CDEVICE_2, NULL, 0, 0)); EQ_(crypt_status(cd, CDEVICE_2), CRYPT_ACTIVE); - crypt_free(cd); + CRYPT_FREE(cd); OK_(crypt_init_by_name(&cd, CDEVICE_2)); OK_(crypt_deactivate(cd, CDEVICE_2)); - crypt_free(cd); + CRYPT_FREE(cd); // Dirty checks: device without UUID - // we should be able to remove it but not manuipulate with it + // we should be able to remove it but not manipulate with it snprintf(tmp, sizeof(tmp), "dmsetup create %s --table \"" "0 100 crypt aes-cbc-essiv:sha256 deadbabedeadbabedeadbabedeadbabe 0 " "%s 2048\"", CDEVICE_2, DEVICE_2); @@ -1266,7 +1043,7 @@ static void UseTempVolumes(void) OK_(crypt_init_by_name(&cd, CDEVICE_2)); OK_(crypt_deactivate(cd, CDEVICE_2)); FAIL_(crypt_activate_by_volume_key(cd, CDEVICE_2, NULL, 0, 0), "No known device type"); - crypt_free(cd); + CRYPT_FREE(cd); // Dirty checks: device with UUID but LUKS header key fingerprint must fail) snprintf(tmp, sizeof(tmp), "dmsetup create %s --table \"" @@ -1277,29 +1054,28 @@ static void UseTempVolumes(void) OK_(crypt_init_by_name(&cd, CDEVICE_2)); OK_(crypt_deactivate(cd, CDEVICE_2)); FAIL_(crypt_activate_by_volume_key(cd, CDEVICE_2, NULL, 0, 0), "wrong volume key"); - crypt_free(cd); + CRYPT_FREE(cd); // No slots OK_(crypt_init(&cd, DEVICE_2)); OK_(crypt_load(cd, CRYPT_LUKS1, NULL)); FAIL_(crypt_activate_by_volume_key(cd, CDEVICE_2, NULL, 0, 0), "volume key is lost"); - crypt_free(cd); + CRYPT_FREE(cd); // Plain device OK_(crypt_init(&cd, DEVICE_2)); OK_(crypt_format(cd, CRYPT_PLAIN, "aes", "cbc-essiv:sha256", NULL, NULL, 16, NULL)); FAIL_(crypt_activate_by_volume_key(cd, NULL, "xxx", 3, 0), "cannot verify key with plain"); FAIL_(crypt_volume_key_verify(cd, "xxx", 3), "cannot verify key with plain"); - FAIL_(crypt_activate_by_volume_key(cd, CDEVICE_2, "xxx", 3, 0), "wrong key lenght"); + FAIL_(crypt_activate_by_volume_key(cd, CDEVICE_2, "xxx", 3, 0), "wrong key length"); OK_(crypt_activate_by_volume_key(cd, CDEVICE_2, "volumekeyvolumek", 16, 0)); EQ_(crypt_status(cd, CDEVICE_2), CRYPT_ACTIVE); OK_(crypt_deactivate(cd, CDEVICE_2)); - crypt_free(cd); + CRYPT_FREE(cd); } static void LuksHeaderRestore(void) { - struct crypt_device *cd; struct crypt_params_luks1 params = { .hash = "sha512", .data_alignment = 2048, // 4M, data offset will be 4096 @@ -1331,7 +1107,7 @@ static void LuksHeaderRestore(void) FAIL_(crypt_header_restore(cd, CRYPT_LUKS1, VALID_HEADER), "Cannot restore header over PLAIN type device"); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); // invalid headers OK_(crypt_init(&cd, DMDIR L_DEVICE_OK)); @@ -1340,6 +1116,7 @@ static void LuksHeaderRestore(void) FAIL_(crypt_header_restore(cd, CRYPT_LUKS1, EVL_HEADER_2), "Header corrupted"); FAIL_(crypt_header_restore(cd, CRYPT_LUKS1, EVL_HEADER_3), "Header corrupted"); FAIL_(crypt_header_restore(cd, CRYPT_LUKS1, EVL_HEADER_4), "Header too small"); + FAIL_(crypt_header_restore(cd, CRYPT_LUKS1, EVL_HEADER_5), "Header corrupted"); OK_(crypt_header_restore(cd, CRYPT_LUKS1, VALID_HEADER)); // wipe valid luks header snprintf(cmd, sizeof(cmd), "dd if=/dev/zero of=" DMDIR L_DEVICE_OK " bs=512 count=%" PRIu64 " 2>/dev/null", r_payload_offset); @@ -1348,17 +1125,18 @@ static void LuksHeaderRestore(void) FAIL_(crypt_header_restore(cd, CRYPT_LUKS1, EVL_HEADER_2), "Header corrupted"); FAIL_(crypt_header_restore(cd, CRYPT_LUKS1, EVL_HEADER_3), "Header corrupted"); FAIL_(crypt_header_restore(cd, CRYPT_LUKS1, EVL_HEADER_4), "Header too small"); + FAIL_(crypt_header_restore(cd, CRYPT_LUKS1, EVL_HEADER_5), "Header corrupted"); OK_(crypt_header_restore(cd, CRYPT_LUKS1, VALID_HEADER)); OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0)); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); // volume key_size mismatch OK_(crypt_init(&cd, DMDIR L_DEVICE_OK)); memcpy(key2, key, key_size / 2); OK_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key2, key_size / 2, ¶ms)); FAIL_(crypt_header_restore(cd, CRYPT_LUKS1, VALID_HEADER), "Volume keysize mismatch"); - crypt_free(cd); + CRYPT_FREE(cd); // payload offset mismatch params.data_alignment = 8192; @@ -1366,14 +1144,25 @@ static void LuksHeaderRestore(void) OK_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms)); FAIL_(crypt_header_restore(cd, CRYPT_LUKS1, VALID_HEADER), "Payload offset mismatch"); //_system("dmsetup table;sleep 1",1); - crypt_free(cd); + CRYPT_FREE(cd); + + /* check crypt_header_restore() properly loads crypt_device context */ + OK_(crypt_init(&cd, DMDIR L_DEVICE_OK)); + OK_(crypt_wipe(cd, NULL, CRYPT_WIPE_ZERO, 0, 1*1024*1024, 1*1024*1024, 0, NULL, NULL)); + OK_(crypt_header_restore(cd, CRYPT_LUKS1, VALID_HEADER)); + OK_(crypt_activate_by_volume_key(cd, NULL, key, key_size, 0)); + /* same test, any LUKS */ + OK_(crypt_wipe(cd, NULL, CRYPT_WIPE_ZERO, 0, 1*1024*1024, 1*1024*1024, 0, NULL, NULL)); + OK_(crypt_header_restore(cd, CRYPT_LUKS, VALID_HEADER)); + OK_(crypt_activate_by_volume_key(cd, NULL, key, key_size, 0)); + + CRYPT_FREE(cd); _cleanup_dmdevices(); } static void LuksHeaderLoad(void) { - struct crypt_device *cd; struct crypt_params_luks1 params = { .hash = "sha512", .data_alignment = 2048, @@ -1391,6 +1180,7 @@ static void LuksHeaderLoad(void) const char *cipher = "aes"; const char *cipher_mode = "cbc-essiv:sha256"; uint64_t r_payload_offset, r_header_size; + uint64_t mdata_size, keyslots_size; crypt_decode_key(key, mk_hex, key_size); @@ -1416,55 +1206,78 @@ static void LuksHeaderLoad(void) params.data_device = DMDIR L_DEVICE_OK; OK_(crypt_init(&cd, DMDIR H_DEVICE)); OK_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms)); - crypt_free(cd); + CRYPT_FREE(cd); OK_(crypt_init(&cd, DMDIR H_DEVICE)); OK_(crypt_load(cd, CRYPT_LUKS1, NULL)); OK_(crypt_set_data_device(cd, DMDIR L_DEVICE_OK)); OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0)); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); + OK_(!crypt_get_metadata_device_name(cd)); + EQ_(strcmp(DMDIR H_DEVICE, crypt_get_metadata_device_name(cd)), 0); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); + + // repeat with init with two devices + OK_(crypt_init_data_device(&cd, DMDIR H_DEVICE, DMDIR L_DEVICE_OK)); + OK_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms)); + CRYPT_FREE(cd); + OK_(crypt_init_data_device(&cd, DMDIR H_DEVICE, DMDIR L_DEVICE_OK)); + OK_(crypt_load(cd, CRYPT_LUKS1, NULL)); + OK_(!crypt_get_metadata_device_name(cd)); + EQ_(strcmp(DMDIR H_DEVICE, crypt_get_metadata_device_name(cd)), 0); + CRYPT_FREE(cd); // bad header: device too small (payloadOffset > device_size) OK_(crypt_init(&cd, DMDIR H_DEVICE_WRONG)); FAIL_(crypt_load(cd, CRYPT_LUKS1, NULL), "Device too small"); - OK_(!!crypt_get_type(cd)); - crypt_free(cd); + NULL_(crypt_get_type(cd)); + CRYPT_FREE(cd); // 0 secs for encrypted data area params.data_alignment = 2048; params.data_device = NULL; OK_(crypt_init(&cd, DMDIR L_DEVICE_0S)); OK_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms)); - crypt_free(cd); + FAIL_(crypt_set_metadata_size(cd, 0x004000, 0x004000), "Wrong context type"); + OK_(crypt_get_metadata_size(cd, &mdata_size, &keyslots_size)); + EQ_(mdata_size, LUKS_ALIGN_KEYSLOTS); + EQ_(keyslots_size, r_header_size * SECTOR_SIZE - mdata_size); + CRYPT_FREE(cd); // load should be ok OK_(crypt_init(&cd, DMDIR L_DEVICE_0S)); OK_(crypt_load(cd, CRYPT_LUKS1, NULL)); FAIL_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0), "Device too small"); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_INACTIVE); - crypt_free(cd); + CRYPT_FREE(cd); // damaged header OK_(_system("dd if=/dev/zero of=" DMDIR L_DEVICE_OK " bs=512 count=8 2>/dev/null", 1)); OK_(crypt_init(&cd, DMDIR L_DEVICE_OK)); FAIL_(crypt_load(cd, CRYPT_LUKS1, NULL), "Header not found"); - crypt_free(cd); + CRYPT_FREE(cd); // plain device OK_(crypt_init(&cd, DMDIR H_DEVICE)); FAIL_(crypt_load(cd, CRYPT_PLAIN, NULL), "Can't load nonLUKS device type"); - crypt_free(cd); + CRYPT_FREE(cd); OK_(crypt_init(&cd, DMDIR H_DEVICE)); OK_(crypt_format(cd, CRYPT_PLAIN, cipher, cipher_mode, NULL, key, key_size, &pl_params)); FAIL_(crypt_load(cd, CRYPT_LUKS1, NULL), "Can't load over nonLUKS device type"); - crypt_free(cd); + FAIL_(crypt_set_metadata_size(cd, 0x004000, 0x004000), "Wrong context type"); + FAIL_(crypt_get_metadata_size(cd, &mdata_size, &keyslots_size), "Wrong context type"); + CRYPT_FREE(cd); + + /* check load sets proper device type */ + OK_(crypt_init(&cd, DMDIR L_DEVICE_0S)); + OK_(crypt_load(cd, CRYPT_LUKS, NULL)); + EQ_(strcmp(CRYPT_LUKS1, crypt_get_type(cd)), 0); + CRYPT_FREE(cd); _cleanup_dmdevices(); } static void LuksHeaderBackup(void) { - struct crypt_device *cd; struct crypt_params_luks1 params = { .hash = "sha512", .data_alignment = 2048, @@ -1493,7 +1306,7 @@ static void LuksHeaderBackup(void) EQ_(crypt_keyslot_add_by_volume_key(cd, 0, key, key_size, passphrase, strlen(passphrase)), 0); OK_(crypt_header_backup(cd, CRYPT_LUKS1, BACKUP_FILE)); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); // restore header from backup OK_(crypt_init(&cd, DMDIR L_DEVICE_OK)); @@ -1502,7 +1315,7 @@ static void LuksHeaderBackup(void) OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0)); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); // exercise luksOpen using backup header in file OK_(crypt_init(&cd, BACKUP_FILE)); @@ -1511,7 +1324,7 @@ static void LuksHeaderBackup(void) EQ_(crypt_activate_by_passphrase(cd, CDEVICE_1, 0, passphrase, strlen(passphrase), 0), 0); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); OK_(crypt_init(&cd, BACKUP_FILE)); OK_(crypt_load(cd, CRYPT_LUKS1, NULL)); @@ -1519,19 +1332,19 @@ static void LuksHeaderBackup(void) EQ_(crypt_activate_by_passphrase(cd, CDEVICE_1, 7, passphrase, strlen(passphrase), 0), 7); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); // exercise luksOpen using backup header on block device - fd = crypt_loop_attach(DEVICE_3, BACKUP_FILE, 0, 0, &ro); + fd = loop_attach(&DEVICE_3, BACKUP_FILE, 0, 0, &ro); + NOTFAIL_(fd, "Bad loop device."); close(fd); - OK_(fd < 0); OK_(crypt_init(&cd, DEVICE_3)); OK_(crypt_load(cd, CRYPT_LUKS1, NULL)); OK_(crypt_set_data_device(cd, DMDIR L_DEVICE_OK)); EQ_(crypt_activate_by_passphrase(cd, CDEVICE_1, 0, passphrase, strlen(passphrase), 0), 0); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); OK_(crypt_init(&cd, DEVICE_3)); OK_(crypt_load(cd, CRYPT_LUKS1, NULL)); @@ -1539,14 +1352,13 @@ static void LuksHeaderBackup(void) EQ_(crypt_activate_by_passphrase(cd, CDEVICE_1, 7, passphrase, strlen(passphrase), 0), 7); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); _cleanup_dmdevices(); } static void ResizeDeviceLuks(void) { - struct crypt_device *cd; struct crypt_params_luks1 params = { .hash = "sha512", .data_alignment = 2048, @@ -1567,24 +1379,25 @@ static void ResizeDeviceLuks(void) OK_(create_dmdevice_over_loop(H_DEVICE, r_header_size)); OK_(create_dmdevice_over_loop(L_DEVICE_OK, r_payload_offset + 1000)); OK_(create_dmdevice_over_loop(L_DEVICE_0S, 1000)); + OK_(create_dmdevice_over_loop(L_DEVICE_WRONG, r_payload_offset + 1000)); // test header and encrypted payload all in one device OK_(crypt_init(&cd, DMDIR L_DEVICE_OK)); OK_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms)); OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0)); OK_(crypt_resize(cd, CDEVICE_1, 42)); - if (!device_size(DMDIR CDEVICE_1, &r_size)) + if (!t_device_size(DMDIR CDEVICE_1, &r_size)) EQ_(42, r_size >> SECTOR_SHIFT); // autodetect encrypted device area size OK_(crypt_resize(cd, CDEVICE_1, 0)); - if (!device_size(DMDIR CDEVICE_1, &r_size)) + if (!t_device_size(DMDIR CDEVICE_1, &r_size)) EQ_(1000, r_size >> SECTOR_SHIFT); FAIL_(crypt_resize(cd, CDEVICE_1, 1001), "Device too small"); - if (!device_size(DMDIR CDEVICE_1, &r_size)) + if (!t_device_size(DMDIR CDEVICE_1, &r_size)) EQ_(1000, r_size >> SECTOR_SHIFT); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); params.data_alignment = 0; params.data_device = DMDIR L_DEVICE_0S; @@ -1593,25 +1406,46 @@ static void ResizeDeviceLuks(void) OK_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms)); OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0)); OK_(crypt_resize(cd, CDEVICE_1, 666)); - if (!device_size(DMDIR CDEVICE_1, &r_size)) + if (!t_device_size(DMDIR CDEVICE_1, &r_size)) EQ_(666, r_size >> SECTOR_SHIFT); // autodetect encrypted device size OK_(crypt_resize(cd, CDEVICE_1, 0)); - if (!device_size(DMDIR CDEVICE_1, &r_size)) + if (!t_device_size(DMDIR CDEVICE_1, &r_size)) EQ_(1000, r_size >> SECTOR_SHIFT); FAIL_(crypt_resize(cd, CDEVICE_1, 1001), "Device too small"); - if (!device_size(DMDIR CDEVICE_1, &r_size)) + if (!t_device_size(DMDIR CDEVICE_1, &r_size)) EQ_(1000, r_size >> SECTOR_SHIFT); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); + + OK_(crypt_init(&cd, DMDIR L_DEVICE_OK)); + OK_(crypt_load(cd, NULL, NULL)); + OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, key, key_size, 0)); + + /* do not allow resize of other device */ + OK_(crypt_init(&cd2, DMDIR L_DEVICE_WRONG)); + OK_(crypt_format(cd2, CRYPT_LUKS1, cipher, cipher_mode, crypt_get_uuid(cd), key, key_size, ¶ms)); + OK_(crypt_activate_by_volume_key(cd2, CDEVICE_2, key, key_size, 0)); + FAIL_(crypt_resize(cd2, CDEVICE_1, 1), "Device got resized by wrong device context."); + OK_(crypt_deactivate(cd2, CDEVICE_2)); + CRYPT_FREE(cd2); + + OK_(crypt_init(&cd2, DMDIR L_DEVICE_WRONG)); + OK_(crypt_format(cd2, CRYPT_PLAIN, cipher, cipher_mode, NULL, key, key_size, NULL)); + OK_(crypt_activate_by_volume_key(cd2, CDEVICE_2, key, key_size, 0)); + FAIL_(crypt_resize(cd2, CDEVICE_1, 1), "Device got resized by wrong device context."); + OK_(crypt_deactivate(cd2, CDEVICE_2)); + CRYPT_FREE(cd2); + + OK_(crypt_deactivate(cd, CDEVICE_1)); + CRYPT_FREE(cd); _cleanup_dmdevices(); } static void HashDevicePlain(void) { - struct crypt_device *cd; struct crypt_params_plain params = { .hash = NULL, .skip = 0, @@ -1626,7 +1460,7 @@ static void HashDevicePlain(void) OK_(crypt_format(cd, CRYPT_PLAIN, "aes", "cbc-essiv:sha256", NULL, NULL, 16, ¶ms)); // hash PLAIN, short key - OK_(_prepare_keyfile(KEYFILE1, "tooshort", 8)); + OK_(prepare_keyfile(KEYFILE1, "tooshort", 8)); FAIL_(crypt_activate_by_keyfile(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, 16, 0), "not enough data in keyfile"); _remove_keyfiles(); @@ -1635,16 +1469,16 @@ static void HashDevicePlain(void) mk_hex = "caffeecaffeecaffeecaffeecaffee88"; key_size = 16; crypt_decode_key(key, mk_hex, key_size); - OK_(_prepare_keyfile(KEYFILE1, key, key_size)); + OK_(prepare_keyfile(KEYFILE1, key, key_size)); OK_(crypt_activate_by_keyfile(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, key_size, 0)); - OK_(_get_key_dm(CDEVICE_1, key, sizeof(key))); + OK_(get_key_dm(CDEVICE_1, key, sizeof(key))); OK_(strcmp(key, mk_hex)); OK_(crypt_deactivate(cd, CDEVICE_1)); // Limit plain key mk_hex = "caffeecaffeecaffeecaffeeca000000"; OK_(crypt_activate_by_keyfile(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, key_size - 3, 0)); - OK_(_get_key_dm(CDEVICE_1, key, sizeof(key))); + OK_(get_key_dm(CDEVICE_1, key, sizeof(key))); OK_(strcmp(key, mk_hex)); OK_(crypt_deactivate(cd, CDEVICE_1)); @@ -1655,21 +1489,37 @@ static void HashDevicePlain(void) mk_hex = "caffeecaffeecaffeecaffeecaffee88babebabe"; key_size = 16; crypt_decode_key(key, mk_hex, key_size); - OK_(_prepare_keyfile(KEYFILE1, key, strlen(mk_hex) / 2)); + OK_(prepare_keyfile(KEYFILE1, key, strlen(mk_hex) / 2)); OK_(crypt_activate_by_keyfile(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, key_size, 0)); - OK_(_get_key_dm(CDEVICE_1, key, sizeof(key))); + OK_(get_key_dm(CDEVICE_1, key, sizeof(key))); FAIL_(strcmp(key, mk_hex), "only key length used"); OK_(strncmp(key, mk_hex, key_size)); OK_(crypt_deactivate(cd, CDEVICE_1)); - // Now without explicit limit OK_(crypt_activate_by_keyfile(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, 0, 0)); - OK_(_get_key_dm(CDEVICE_1, key, sizeof(key))); + OK_(get_key_dm(CDEVICE_1, key, sizeof(key))); FAIL_(strcmp(key, mk_hex), "only key length used"); OK_(strncmp(key, mk_hex, key_size)); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); + + _remove_keyfiles(); + + // Handling of legacy "plain" hash (no hash) + params.hash = "plain"; + // 0 1 2 3 4 5 6 7 8 9 a b c d e f + mk_hex = "aabbcaffeecaffeecaffeecaffeecaff"; + key_size = 16; + crypt_decode_key(key, mk_hex, key_size); + OK_(prepare_keyfile(KEYFILE1, key, strlen(mk_hex) / 2)); + OK_(crypt_init(&cd, DEVICE_1)); + OK_(crypt_format(cd, CRYPT_PLAIN, "aes", "cbc-essiv:sha256", NULL, NULL, 16, ¶ms)); + OK_(crypt_activate_by_keyfile(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, key_size, 0)); + OK_(get_key_dm(CDEVICE_1, key, sizeof(key))); + OK_(strcmp(key, mk_hex)); + OK_(crypt_deactivate(cd, CDEVICE_1)); + CRYPT_FREE(cd); _remove_keyfiles(); @@ -1682,15 +1532,15 @@ static void HashDevicePlain(void) mk_hex = "c62e4615bd39e222572f3a1bf7c2132e"; keystr = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; key_size = strlen(keystr); // 32 - OK_(_prepare_keyfile(KEYFILE1, keystr, strlen(keystr))); + OK_(prepare_keyfile(KEYFILE1, keystr, strlen(keystr))); OK_(crypt_activate_by_keyfile(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, key_size, 0)); - OK_(_get_key_dm(CDEVICE_1, key, sizeof(key))); + OK_(get_key_dm(CDEVICE_1, key, sizeof(key))); OK_(strcmp(key, mk_hex)); OK_(crypt_deactivate(cd, CDEVICE_1)); // Read full keyfile OK_(crypt_activate_by_keyfile(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, 0, 0)); - OK_(_get_key_dm(CDEVICE_1, key, sizeof(key))); + OK_(get_key_dm(CDEVICE_1, key, sizeof(key))); OK_(strcmp(key, mk_hex)); OK_(crypt_deactivate(cd, CDEVICE_1)); @@ -1698,15 +1548,15 @@ static void HashDevicePlain(void) // Limit keyfile read keystr = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxAAAAAAAA"; - OK_(_prepare_keyfile(KEYFILE1, keystr, strlen(keystr))); + OK_(prepare_keyfile(KEYFILE1, keystr, strlen(keystr))); OK_(crypt_activate_by_keyfile(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, key_size, 0)); - OK_(_get_key_dm(CDEVICE_1, key, sizeof(key))); + OK_(get_key_dm(CDEVICE_1, key, sizeof(key))); OK_(strcmp(key, mk_hex)); OK_(crypt_deactivate(cd, CDEVICE_1)); // Full keyfile OK_(crypt_activate_by_keyfile(cd, CDEVICE_1, CRYPT_ANY_SLOT, KEYFILE1, 0, 0)); - OK_(_get_key_dm(CDEVICE_1, key, sizeof(key))); + OK_(get_key_dm(CDEVICE_1, key, sizeof(key))); OK_(strcmp(key, "0e49cb34a1dee1df33f6505e4de44a66")); OK_(crypt_deactivate(cd, CDEVICE_1)); @@ -1714,15 +1564,15 @@ static void HashDevicePlain(void) // FIXME: add keyfile="-" tests somehow - crypt_free(cd); + CRYPT_FREE(cd); } static void VerityTest(void) { - struct crypt_device *cd; const char *salt_hex = "20c28ffc129c12360ba6ceea2b6cf04e89c2b41cfe6b8439eb53c1897f50df7b"; const char *root_hex = "ab018b003a967fc782effb293b6dccb60b4f40c06bf80d16391acf686d28b5d6"; - char salt[256], root_hash[256]; + char salt[256], root_hash[256], root_hash_out[256]; + size_t root_hash_out_size = 256; struct crypt_active_device cad; struct crypt_params_verity params = { .data_device = DEVICE_EMPTY, @@ -1741,11 +1591,11 @@ static void VerityTest(void) /* block size */ params.data_block_size = 333; FAIL_(crypt_format(cd, CRYPT_VERITY, NULL, NULL, NULL, NULL, 0, ¶ms), - "Unsupppored block size."); + "Unsupported block size."); params.data_block_size = 4096; params.hash_block_size = 333; FAIL_(crypt_format(cd, CRYPT_VERITY, NULL, NULL, NULL, NULL, 0, ¶ms), - "Unsupppored block size."); + "Unsupported block size."); params.hash_block_size = 4096; /* salt size */ @@ -1765,7 +1615,13 @@ static void VerityTest(void) params.hash_name = "sha256"; OK_(crypt_format(cd, CRYPT_VERITY, NULL, NULL, NULL, NULL, 0, ¶ms)); - crypt_free(cd); + CRYPT_FREE(cd); + + params.data_device = NULL; + OK_(crypt_init_data_device(&cd, DEVICE_2, DEVICE_EMPTY)); + OK_(crypt_format(cd, CRYPT_VERITY, NULL, NULL, NULL, NULL, 0, ¶ms)); + EQ_(strcmp(DEVICE_2, crypt_get_metadata_device_name(cd)), 0); + CRYPT_FREE(cd); /* Verify */ OK_(crypt_init(&cd, DEVICE_2)); @@ -1795,19 +1651,25 @@ static void VerityTest(void) if (crypt_activate_by_volume_key(cd, CDEVICE_1, root_hash, 32, CRYPT_ACTIVATE_READONLY) == -ENOTSUP) { printf("WARNING: kernel dm-verity not supported, skipping test.\n"); - crypt_free(cd); + CRYPT_FREE(cd); return; } OK_(crypt_get_active_device(cd, CDEVICE_1, &cad)); EQ_(CRYPT_ACTIVATE_READONLY, cad.flags); - crypt_free(cd); + CRYPT_FREE(cd); OK_(crypt_init_by_name(&cd, CDEVICE_1)); + memset(root_hash_out, 0, root_hash_out_size); + OK_(crypt_volume_key_get(cd, CRYPT_ANY_SLOT, root_hash_out, &root_hash_out_size, NULL, 0)); + EQ_(32, root_hash_out_size); + OK_(memcmp(root_hash, root_hash_out, root_hash_out_size)); OK_(crypt_deactivate(cd, CDEVICE_1)); /* hash fail */ root_hash[1] = ~root_hash[1]; OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, root_hash, 32, CRYPT_ACTIVATE_READONLY)); + /* Be sure there was some read activity to mark device corrupted. */ + _system("blkid " DMDIR CDEVICE_1, 0); OK_(crypt_get_active_device(cd, CDEVICE_1, &cad)); EQ_(CRYPT_ACTIVATE_READONLY|CRYPT_ACTIVATE_CORRUPTED, cad.flags); OK_(crypt_deactivate(cd, CDEVICE_1)); @@ -1816,16 +1678,16 @@ static void VerityTest(void) /* data fail */ OK_(crypt_set_data_device(cd, DEVICE_1)); OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, root_hash, 32, CRYPT_ACTIVATE_READONLY)); + _system("blkid " DMDIR CDEVICE_1, 0); OK_(crypt_get_active_device(cd, CDEVICE_1, &cad)); EQ_(CRYPT_ACTIVATE_READONLY|CRYPT_ACTIVATE_CORRUPTED, cad.flags); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); } static void TcryptTest(void) { - struct crypt_device *cd = NULL; struct crypt_active_device cad; const char *passphrase = "aaaaaaaaaaaa"; const char *kf1 = "tcrypt-images/keyfile1"; @@ -1870,24 +1732,22 @@ static void TcryptTest(void) EQ_(256, crypt_get_data_offset(cd)); memset(key, 0, key_size); - if (!_fips_mode) { - key_size--; - // small buffer - FAIL_(crypt_volume_key_get(cd, CRYPT_ANY_SLOT, key, &key_size, NULL, 0), "small buffer"); - key_size++; - OK_(crypt_volume_key_get(cd, CRYPT_ANY_SLOT, key, &key_size, NULL, 0)); - OK_(memcmp(key, key_def, key_size)); - } + + key_size--; + // small buffer + FAIL_(crypt_volume_key_get(cd, CRYPT_ANY_SLOT, key, &key_size, NULL, 0), "small buffer"); + key_size++; + OK_(crypt_volume_key_get(cd, CRYPT_ANY_SLOT, key, &key_size, NULL, 0)); + OK_(memcmp(key, key_def, key_size)); reset_log(); - crypt_set_log_callback(cd, &new_log, NULL); OK_(crypt_dump(cd)); OK_(!(global_lines != 0)); - crypt_set_log_callback(cd, NULL, NULL); reset_log(); OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, NULL, 0, CRYPT_ACTIVATE_READONLY)); - crypt_free(cd); + NULL_(crypt_get_metadata_device_name(cd)); + CRYPT_FREE(cd); OK_(crypt_init_by_name_and_header(&cd, CDEVICE_1, NULL)); EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); @@ -1908,14 +1768,28 @@ static void TcryptTest(void) EQ_(72, cad.size); OK_(crypt_deactivate(cd, CDEVICE_1)); - crypt_free(cd); + CRYPT_FREE(cd); + + // init with detached header is not supported + OK_(crypt_init_data_device(&cd, tcrypt_dev2, DEVICE_2)); + FAIL_(crypt_load(cd, CRYPT_TCRYPT, ¶ms), "can't use tcrypt with separate metadata device"); + CRYPT_FREE(cd); + + // Following test uses non-FIPS algorithms in the cipher chain + if(_fips_mode) + return; 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); + CRYPT_FREE(cd); // Deactivate the whole chain EQ_(crypt_status(NULL, CDEVICE_1 "_1"), CRYPT_BUSY); @@ -1923,10 +1797,62 @@ static void TcryptTest(void) EQ_(crypt_status(NULL, CDEVICE_1 "_1"), CRYPT_INACTIVE); } +static void IntegrityTest(void) +{ + struct crypt_params_integrity params = { + .tag_size = 4, + .integrity = "crc32c", + .sector_size = 4096, + }, ip = {}; + int ret; + + // FIXME: this should be more detailed + + OK_(crypt_init(&cd,DEVICE_1)); + FAIL_(crypt_format(cd,CRYPT_INTEGRITY,NULL,NULL,NULL,NULL,0,NULL), "params field required"); + ret = crypt_format(cd,CRYPT_INTEGRITY,NULL,NULL,NULL,NULL,0,¶ms); + if (ret < 0) { + printf("WARNING: cannot format integrity device, skipping test.\n"); + CRYPT_FREE(cd); + return; + } + OK_(crypt_get_integrity_info(cd, &ip)); + EQ_(ip.tag_size, params.tag_size); + EQ_(ip.sector_size, params.sector_size); + EQ_(crypt_get_sector_size(cd), params.sector_size); + EQ_(ip.interleave_sectors, params.interleave_sectors); + EQ_(ip.journal_size, params.journal_size); + EQ_(ip.journal_watermark, params.journal_watermark); + OK_(strcmp(ip.integrity,params.integrity)); + FAIL_(crypt_set_uuid(cd,DEVICE_1_UUID),"can't set uuid to integrity device"); + CRYPT_FREE(cd); + + OK_(crypt_init(&cd, DEVICE_1)); + OK_(crypt_load(cd, CRYPT_INTEGRITY, NULL)); + CRYPT_FREE(cd); + + OK_(crypt_init(&cd, DEVICE_1)); + //params.tag_size = 8; + //FAIL_(crypt_load(cd, CRYPT_INTEGRITY, ¶ms), "tag size mismatch"); + params.tag_size = 4; + OK_(crypt_load(cd, CRYPT_INTEGRITY, ¶ms)); + OK_(crypt_activate_by_volume_key(cd, CDEVICE_1, NULL, 0, 0)); + EQ_(crypt_status(cd, CDEVICE_1), CRYPT_ACTIVE); + CRYPT_FREE(cd); + + memset(&ip, 0, sizeof(ip)); + OK_(crypt_init_by_name(&cd, CDEVICE_1)); + OK_(crypt_get_integrity_info(cd, &ip)); + EQ_(ip.tag_size, params.tag_size); + OK_(strcmp(ip.integrity,params.integrity)); + OK_(strcmp(CRYPT_INTEGRITY,crypt_get_type(cd))); + OK_(crypt_deactivate(cd, CDEVICE_1)); + CRYPT_FREE(cd); +} + // Check that gcrypt is properly initialised in format static void NonFIPSAlg(void) { - struct crypt_device *cd; struct crypt_params_luks1 params = {0}; char key[128] = ""; size_t key_size = 128 / 8; @@ -1939,23 +1865,23 @@ static void NonFIPSAlg(void) OK_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms)); FAIL_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms), "Already formatted."); - crypt_free(cd); + CRYPT_FREE(cd); params.hash = "whirlpool"; OK_(crypt_init(&cd, DEVICE_2)); ret = crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms); if (ret < 0) { printf("WARNING: whirlpool not supported, skipping test.\n"); - crypt_free(cd); + CRYPT_FREE(cd); return; } - crypt_free(cd); + CRYPT_FREE(cd); params.hash = "md5"; OK_(crypt_init(&cd, DEVICE_2)); FAIL_(crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, key, key_size, ¶ms), "MD5 unsupported, too short"); - crypt_free(cd); + CRYPT_FREE(cd); } static void int_handler(int sig __attribute__((__unused__))) @@ -1970,9 +1896,14 @@ int main(int argc, char *argv[]) if (getuid() != 0) { printf("You must be root to run this test.\n"); - exit(0); + exit(77); } - +#ifndef NO_CRYPTSETUP_PATH + if (getenv("CRYPTSETUP_PATH")) { + printf("Cannot run this test with CRYPTSETUP_PATH set.\n"); + exit(77); + } +#endif for (i = 1; i < argc; i++) { if (!strcmp("-v", argv[i]) || !strcmp("--verbose", argv[i])) _verbose = 1; @@ -1984,27 +1915,33 @@ int main(int argc, char *argv[]) sigaction(SIGINT, &sa, NULL); sigaction(SIGTERM, &sa, NULL); + register_cleanup(_cleanup); + _cleanup(); - if (_setup()) - goto out; + if (_setup()) { + printf("Cannot set test devices.\n"); + _cleanup(); + exit(77); + } crypt_set_debug_level(_debug ? CRYPT_DEBUG_ALL : CRYPT_DEBUG_NONE); RUN_(NonFIPSAlg, "Crypto is properly initialised in format"); //must be the first! - RUN_(AddDevicePlain, "plain device API creation exercise"); - RUN_(HashDevicePlain, "plain device API hash test"); + RUN_(AddDevicePlain, "A plain device API creation"); + RUN_(HashDevicePlain, "A plain device API hash"); RUN_(AddDeviceLuks, "Format and use LUKS device"); - RUN_(LuksHeaderLoad, "test header load"); - RUN_(LuksHeaderRestore, "test LUKS header restore"); - RUN_(LuksHeaderBackup, "test LUKS header backup"); - RUN_(ResizeDeviceLuks, "Luks device resize tests"); + RUN_(LuksHeaderLoad, "Header load"); + RUN_(LuksHeaderRestore, "LUKS header restore"); + RUN_(LuksHeaderBackup, "LUKS header backup"); + RUN_(ResizeDeviceLuks, "LUKS device resize"); RUN_(UseLuksDevice, "Use pre-formated LUKS device"); - RUN_(SuspendDevice, "Suspend/Resume test"); + RUN_(SuspendDevice, "Suspend/Resume"); RUN_(UseTempVolumes, "Format and use temporary encrypted device"); - RUN_(CallbacksTest, "API callbacks test"); - RUN_(VerityTest, "DM verity test"); - RUN_(TcryptTest, "Tcrypt API test"); -out: + RUN_(CallbacksTest, "API callbacks"); + RUN_(VerityTest, "DM verity"); + RUN_(TcryptTest, "Tcrypt API"); + RUN_(IntegrityTest, "Integrity API"); + _cleanup(); return 0; }