diff --git a/tests/api-test-2.c b/tests/api-test-2.c index 445a12e8..32e6c368 100644 --- a/tests/api-test-2.c +++ b/tests/api-test-2.c @@ -3323,8 +3323,10 @@ static void Luks2Requirements(void) /* crypt_get_label (unrestricted) */ NOTNULL_(crypt_get_label(cd)); + OK_(strcmp("", crypt_get_label(cd))); /* crypt_get_subsystem (unrestricted) */ NOTNULL_(crypt_get_subsystem(cd)); + OK_(strcmp("", crypt_get_subsystem(cd))); /* crypt_repair (with current repair capabilities it's unrestricted) */ OK_(crypt_repair(cd, CRYPT_LUKS2, NULL)); @@ -3807,6 +3809,15 @@ static void Luks2Flags(void) OK_(crypt_persistent_flags_get(cd, CRYPT_FLAGS_ACTIVATION, &flags)); EQ_(flags,CRYPT_ACTIVATE_ALLOW_DISCARDS | CRYPT_ACTIVATE_SUBMIT_FROM_CRYPT_CPUS); + /* label and subsystem (second label */ + OK_(crypt_set_label(cd, "label", "subsystem")); + OK_(strcmp("label", crypt_get_label(cd))); + OK_(strcmp("subsystem", crypt_get_subsystem(cd))); + + OK_(crypt_set_label(cd, NULL, NULL)); + OK_(strcmp("", crypt_get_label(cd))); + OK_(strcmp("", crypt_get_subsystem(cd))); + CRYPT_FREE(cd); } diff --git a/tests/api-test.c b/tests/api-test.c index a789bab0..269171ce 100644 --- a/tests/api-test.c +++ b/tests/api-test.c @@ -604,6 +604,9 @@ static void AddDevicePlain(void) FAIL_(crypt_keyslot_add_by_keyfile(cd,CRYPT_ANY_SLOT,KEYFILE1,strlen(KEY1),KEYFILE2,strlen(KEY2)),"can't add keyslot to plain device"); FAIL_(crypt_keyslot_destroy(cd,1),"can't manipulate keyslots on plain device"); EQ_(crypt_keyslot_status(cd, 0), CRYPT_SLOT_INVALID); + FAIL_(crypt_set_label(cd, "label", "subsystem"), "can't set labels for plain device"); + NULL_(crypt_get_label(cd)); + NULL_(crypt_get_subsystem(cd)); _remove_keyfiles(); CRYPT_FREE(cd); @@ -1036,6 +1039,10 @@ static void AddDeviceLuks(void) OK_(crypt_set_uuid(cd, DEVICE_TEST_UUID)); OK_(strcmp(DEVICE_TEST_UUID, crypt_get_uuid(cd))); + FAIL_(crypt_set_label(cd, "label", "subsystem"), "can't set labels for LUKS1 device"); + NULL_(crypt_get_label(cd)); + NULL_(crypt_get_subsystem(cd)); + FAIL_(crypt_deactivate(cd, CDEVICE_2), "not active"); CRYPT_FREE(cd);