Attachment 302488 Details for Bug 433406 – Patch to add device to the prompt

[patch] Patch to add device to the prompt

cryptsetup-prompt.patch (text/plain), 1.08 KB, created by Bill Nottingham on 2008-04-15 16:16:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Nottingham

Created: 2008-04-15 16:16:20 UTC

Size: 1.08 KB

patch

obsolete

>diff -up cryptsetup-1.0.6/lib/setup.c.foo cryptsetup-1.0.6/lib/setup.c
>--- cryptsetup-1.0.6/lib/setup.c.foo	2008-04-15 12:07:58.000000000 -0400
>+++ cryptsetup-1.0.6/lib/setup.c	2008-04-15 12:12:38.000000000 -0400
>@@ -444,6 +444,7 @@ static int __crypt_luks_open(int arg, st
> {
> 	struct luks_masterkey *mk=NULL;
> 	struct luks_phdr hdr;
>+	char *prompt = NULL;
> 	char *password; int passwordLen;
> 	struct device_infos infos;
> 	struct crypt_options tmp = {
>@@ -474,7 +475,8 @@ static int __crypt_luks_open(int arg, st
> start:
> 	mk=NULL;
> 
>-	if(get_key("Enter LUKS passphrase: ",&password,&passwordLen, 0, options->key_file,  options->passphrase_fd, options->timeout, options->flags))
>+	asprintf(&prompt, "Enter LUKS passphrase for %s: ", options->device);
>+	if(get_key(prompt ? prompt : "Enter LUKS passphrase: ",&password,&passwordLen, 0, options->key_file,  options->passphrase_fd, options->timeout, options->flags))
> 		tries--;
> 	else
> 		tries = 0;
>@@ -518,6 +520,7 @@ start:
>  out1:
> 	safe_free(password);
>  out:
>+ 	free(prompt);
> 	LUKS_dealloc_masterkey(mk);
> 	if (r == -EPERM && tries > 0)
> 		goto start;

Actions: View | Diff

Attachments on bug 433406: 302488