X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcryptsetup.c;h=d652bad2ffc5efc8f82714440166300acd806191;hb=05af3a3383aea6bdd5050b6c5207ac3a55a3f05b;hp=6fb3f8ef427341b4d0fb41a9c81a27f35564d1a1;hpb=16c82312f33535eef956764749d598e00fa5b855;p=platform%2Fupstream%2Fcryptsetup.git

diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index 6fb3f8e..d652bad 100644
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -909,24 +909,13 @@ out:
 	return r;
 }
 
-static int _slots_full(struct crypt_device *cd)
-{
-	int i;
-
-	for (i = 0; i < crypt_keyslot_max(crypt_get_type(cd)); i++)
-		if (crypt_keyslot_status(cd, i) == CRYPT_SLOT_INACTIVE)
-			return 0;
-	return 1;
-}
-
 static int action_luksChangeKey(void)
 {
 	const char *opt_new_key_file = (action_argc > 1 ? action_argv[1] : NULL);
 	struct crypt_device *cd = NULL;
-	char *vk = NULL, *password = NULL;
-	size_t passwordLen = 0;
-	size_t vk_size;
-	int new_key_slot, old_key_slot, r;
+	char *password = NULL, *password_new = NULL;
+	size_t password_size = 0, password_new_size = 0;
+	int r;
 
 	if ((r = crypt_init(&cd, uuid_or_device(action_argv[0]))))
 		goto out;
@@ -938,71 +927,31 @@ static int action_luksChangeKey(void)
 		crypt_set_iteration_time(cd, opt_iteration_time);
 
 	r = crypt_get_key(_("Enter LUKS passphrase to be changed: "),
-		      &password, &passwordLen,
+		      &password, &password_size,
 		      opt_keyfile_offset, opt_keyfile_size, opt_key_file,
 		      opt_timeout, _verify_passphrase(0), cd);
 	if (r < 0)
 		goto out;
 
-	vk_size = crypt_get_volume_key_size(cd);
-	vk = crypt_safe_alloc(vk_size);
-	if (!vk) {
-		r = -ENOMEM;
-		goto out;
-	}
-
-	r = crypt_volume_key_get(cd, opt_key_slot, vk, &vk_size,
-				 password, passwordLen);
-	if (r < 0) {
-		if (opt_key_slot != CRYPT_ANY_SLOT)
-			log_err(_("No key available with this passphrase.\n"));
+	/* Check password before asking for new one */
+	r = crypt_activate_by_passphrase(cd, NULL, opt_key_slot,
+					 password, password_size, 0);
+	if (r < 0)
 		goto out;
-	}
-
-	if (opt_key_slot != CRYPT_ANY_SLOT || _slots_full(cd)) {
-		log_dbg("Key slot %d is going to be overwritten (%s).",
-			r, opt_key_slot != CRYPT_ANY_SLOT ?
-			"explicit key slot specified" : "no free key slot");
-		old_key_slot = r;
-		new_key_slot = r;
-	} else {
-		log_dbg("Allocating new key slot.");
-		old_key_slot = r;
-		new_key_slot = CRYPT_ANY_SLOT;
-	}
 
-	crypt_safe_free(password);
-	password = NULL;
-	passwordLen = 0;
 	r = crypt_get_key(_("Enter new LUKS passphrase: "),
-			  &password, &passwordLen,
+			  &password_new, &password_new_size,
 			  opt_new_keyfile_offset, opt_new_keyfile_size,
 			  opt_new_key_file,
 			  opt_timeout, _verify_passphrase(0), cd);
 	if (r < 0)
 		goto out;
 
-	if (new_key_slot == old_key_slot) {
-		(void)crypt_keyslot_destroy(cd, old_key_slot);
-		r = crypt_keyslot_add_by_volume_key(cd, new_key_slot,
-						    vk, vk_size,
-						    password, passwordLen);
-		if (r >= 0)
-			log_verbose(_("Key slot %d changed.\n"), r);
-	} else {
-		r = crypt_keyslot_add_by_volume_key(cd, CRYPT_ANY_SLOT,
-						    vk, vk_size,
-						    password, passwordLen);
-		if (r >= 0) {
-			log_verbose(_("Replaced with key slot %d.\n"), r);
-			r = crypt_keyslot_destroy(cd, old_key_slot);
-		}
-	}
-	if (r < 0)
-		log_err(_("Failed to swap new key slot.\n"));
+	r = crypt_keyslot_change_by_passphrase(cd, opt_key_slot, opt_key_slot,
+		password, password_size, password_new, password_new_size);
 out:
-	crypt_safe_free(vk);
 	crypt_safe_free(password);
+	crypt_safe_free(password_new);
 	crypt_free(cd);
 	return r;
 }