Switch LUKS2 convert code to LUKS_check_cipher check.

Author: oniko

lib/luks2/luks2_internal.h

@@ -226,11 +226,6 @@ int LUKS2_find_area_max_gap(struct crypt_device *cd, struct luks2_hdr *hdr,
 
 uint64_t LUKS2_hdr_and_areas_size_jobj(json_object *jobj);
 
-int LUKS2_check_cipher(struct crypt_device *cd,
-		      size_t keylength,
-		      const char *cipher,
-		      const char *cipher_mode);
-
 static inline const char *crypt_reencrypt_mode_to_str(crypt_reencrypt_mode_info mi)
 {
 	if (mi == CRYPT_REENCRYPT_REENCRYPT)

lib/luks2/luks2_luks1_convert.c

@@ -11,39 +11,6 @@
 #include "../luks1/luks.h"
 #include "../luks1/af.h"
 
-/* This differs from LUKS_check_cipher() that it does not check dm-crypt fallback. */
-int LUKS2_check_cipher(struct crypt_device *cd,
-		      size_t keylength,
-		      const char *cipher,
-		      const char *cipher_mode)
-{
-	int r;
-	struct crypt_storage *s;
-	char buf[SECTOR_SIZE], *empty_key;
-
-	log_dbg(cd, "Checking if cipher %s-%s is usable (storage wrapper).", cipher, cipher_mode);
-
-	empty_key = malloc(keylength);
-	if (!empty_key)
-		return -ENOMEM;
-
-	/* No need to get KEY quality random but it must avoid known weak keys. */
-	r = crypt_random_get(cd, empty_key, keylength, CRYPT_RND_NORMAL);
-	if (r < 0)
-		goto out;
-
-	r = crypt_storage_init(&s, SECTOR_SIZE, cipher, cipher_mode, empty_key, keylength, false);
-	if (r < 0)
-		goto out;
-
-	memset(buf, 0, sizeof(buf));
-	r = crypt_storage_decrypt(s, 0, sizeof(buf), buf);
-	crypt_storage_destroy(s);
-out:
-	free(empty_key);
-	return r;
-}
-
 static int json_luks1_keyslot(const struct luks_phdr *hdr_v1, int keyslot, json_object **keyslot_object)
 {
 	char *base64_str, cipher[LUKS_CIPHERNAME_L+LUKS_CIPHERMODE_L];
@@ -585,7 +552,7 @@ int LUKS2_luks1_to_luks2(struct crypt_device *cd, struct luks_phdr *hdr1, struct
 		return -EINVAL;
 	}
 
-	if (LUKS2_check_cipher(cd, hdr1->keyBytes, hdr1->cipherName, hdr1->cipherMode)) {
+	if (crypt_check_cipher(cd, hdr1->keyBytes, hdr1->cipherName, hdr1->cipherMode)) {
 		log_err(cd, _("Unable to use cipher specification %s-%s for LUKS2."),
 			hdr1->cipherName, hdr1->cipherMode);
 		return -EINVAL;