Make passphrase prompts more consistent.

Also see http://code.google.com/p/cryptsetup/issues/detail?id=145

diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index 86337dc..39b4bd2 100644 (file)
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -657,7 +657,7 @@ static int action_luksFormat(void)
        else if (opt_urandom)
                crypt_set_rng_type(cd, CRYPT_RNG_URANDOM);
 
-       r = tools_get_key(_("Enter LUKS passphrase: "), &password, &passwordLen,
+       r = tools_get_key(_("Enter passphrase: "), &password, &passwordLen,
                          opt_keyfile_offset, opt_keyfile_size, opt_key_file,
                          opt_timeout, _verify_passphrase(1), 1, cd);
        if (r < 0)
@@ -828,7 +828,7 @@ static int action_luksKillSlot(void)
        if (!opt_batch_mode) {
                r = verify_keyslot(cd, opt_key_slot,
                        _("This is the last keyslot. Device will become unusable after purging this key."),
-                       _("Enter any remaining LUKS passphrase: "),
+                       _("Enter any remaining passphrase: "),
                        opt_key_file, opt_keyfile_offset, opt_keyfile_size);
                if (r < 0)
                        goto out;
@@ -856,7 +856,7 @@ static int action_luksRemoveKey(void)
        if ((r = crypt_load(cd, CRYPT_LUKS1, NULL)))
                goto out;
 
-       r = tools_get_key(_("Enter LUKS passphrase to be deleted: "),
+       r = tools_get_key(_("Enter passphrase to be deleted: "),
                      &password, &passwordLen,
                      opt_keyfile_offset, opt_keyfile_size, opt_key_file,
                      opt_timeout,
@@ -925,7 +925,7 @@ static int action_luksAddKey(void)
                        opt_key_file, opt_keyfile_size, opt_keyfile_offset,
                        opt_new_key_file, opt_new_keyfile_size, opt_new_keyfile_offset);
        } else {
-               r = tools_get_key(_("Enter any passphrase: "),
+               r = tools_get_key(_("Enter any existing passphrase: "),
                              &password, &password_size, 0, 0, NULL,
                              opt_timeout, _verify_passphrase(0), 0, cd);
 
@@ -974,7 +974,7 @@ static int action_luksChangeKey(void)
        if (opt_iteration_time)
                crypt_set_iteration_time(cd, opt_iteration_time);
 
-       r = tools_get_key(_("Enter LUKS passphrase to be changed: "),
+       r = tools_get_key(_("Enter passphrase to be changed: "),
                      &password, &password_size,
                      opt_keyfile_offset, opt_keyfile_size, opt_key_file,
                      opt_timeout, _verify_passphrase(0), 0, cd);
@@ -988,7 +988,7 @@ static int action_luksChangeKey(void)
        if (r < 0)
                goto out;
 
-       r = tools_get_key(_("Enter new LUKS passphrase: "),
+       r = tools_get_key(_("Enter new passphrase: "),
                          &password_new, &password_new_size,
                          opt_new_keyfile_offset, opt_new_keyfile_size,
                          opt_new_key_file,
@@ -1067,7 +1067,7 @@ static int luksDump_with_volume_key(struct crypt_device *cd)
        if (!vk)
                return -ENOMEM;
 
-       r = tools_get_key(_("Enter LUKS passphrase: "), &password, &passwordLen,
+       r = tools_get_key(_("Enter passphrase: "), &password, &passwordLen,
                          opt_keyfile_offset, opt_keyfile_size, opt_key_file,
                          opt_timeout, 0, 0, cd);
        if (r < 0)

diff --git a/src/cryptsetup_reencrypt.c b/src/cryptsetup_reencrypt.c
index 8bf064c..599923c 100644 (file)
--- a/src/cryptsetup_reencrypt.c
+++ b/src/cryptsetup_reencrypt.c
@@ -931,7 +931,7 @@ static int initialize_passphrase(struct reenc_ctx *rc, const char *device)
        log_dbg("Passhrases initialization.");
 
        if (opt_new && !rc->in_progress) {
-               r = init_passphrase1(rc, cd, _("Enter new LUKS passphrase: "), 0, 0);
+               r = init_passphrase1(rc, cd, _("Enter new passphrase: "), 0, 0);
                return r > 0 ? 0 : r;
        }
 
@@ -945,14 +945,14 @@ static int initialize_passphrase(struct reenc_ctx *rc, const char *device)
        if (opt_key_file) {
                r = init_keyfile(rc, cd, opt_key_slot);
        } else if (rc->in_progress) {
-               r = init_passphrase1(rc, cd, _("Enter any LUKS passphrase: "),
+               r = init_passphrase1(rc, cd, _("Enter any existing passphrase: "),
                                     CRYPT_ANY_SLOT, 1);
        } else for (i = 0; i < MAX_SLOT; i++) {
                ki = crypt_keyslot_status(cd, i);
                if (ki != CRYPT_SLOT_ACTIVE && ki != CRYPT_SLOT_ACTIVE_LAST)
                        continue;
 
-               snprintf(msg, sizeof(msg), _("Enter LUKS passphrase for key slot %u: "), i);
+               snprintf(msg, sizeof(msg), _("Enter passphrase for key slot %u: "), i);
                r = init_passphrase1(rc, cd, msg, i, 1);
                if (r < 0)
                        break;