eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-16 21:29:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not set confirm callback when not needed.

Browse Source 
It's currently used only in crypt_set_uuid and crypt_header_restore
API calls.
This commit is contained in:
Ondrej Kozina
2020-10-15 11:53:59 +02:00
committed by Milan Broz
parent 14c7148edd
commit 482fcd0602
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/cryptsetup.c
View File

@@ -526,7 +526,6 @@ static int tcryptDump_with_volume_key(struct crypt_device *cd)
unsigned i; unsigned i;
int r; int r;
crypt_set_confirm_callback(cd, yesDialog, NULL);
if (!yesDialog( if (!yesDialog(
_("Header dump with volume key is sensitive information\n" _("Header dump with volume key is sensitive information\n"
"which allows access to encrypted partition without passphrase.\n" "which allows access to encrypted partition without passphrase.\n"
@@ -1533,8 +1532,6 @@ static int action_luksKillSlot(void)
if ((r = crypt_init(&cd, uuid_or_device_header(NULL)))) if ((r = crypt_init(&cd, uuid_or_device_header(NULL))))
goto out; goto out;
crypt_set_confirm_callback(cd, yesDialog, NULL);
if ((r = crypt_load(cd, luksType(device_type), NULL))) { if ((r = crypt_load(cd, luksType(device_type), NULL))) {
log_err(_("Device %s is not a valid LUKS device."), log_err(_("Device %s is not a valid LUKS device."),
uuid_or_device_header(NULL)); uuid_or_device_header(NULL));
@@ -1590,8 +1587,6 @@ static int action_luksRemoveKey(void)
if ((r = crypt_init(&cd, uuid_or_device_header(NULL)))) if ((r = crypt_init(&cd, uuid_or_device_header(NULL))))
goto out; goto out;
crypt_set_confirm_callback(cd, yesDialog, NULL);
if ((r = crypt_load(cd, luksType(device_type), NULL))) { if ((r = crypt_load(cd, luksType(device_type), NULL))) {
log_err(_("Device %s is not a valid LUKS device."), log_err(_("Device %s is not a valid LUKS device."),
uuid_or_device_header(NULL)); uuid_or_device_header(NULL));
@@ -1646,8 +1641,6 @@ static int luksAddUnboundKey(void)
if ((r = crypt_init(&cd, uuid_or_device_header(NULL)))) if ((r = crypt_init(&cd, uuid_or_device_header(NULL))))
goto out; goto out;
crypt_set_confirm_callback(cd, yesDialog, NULL);
if ((r = crypt_load(cd, CRYPT_LUKS2, NULL))) { if ((r = crypt_load(cd, CRYPT_LUKS2, NULL))) {
log_err(_("Device %s is not a valid LUKS device."), log_err(_("Device %s is not a valid LUKS device."),
uuid_or_device_header(NULL)); uuid_or_device_header(NULL));
@@ -1713,8 +1706,6 @@ static int action_luksAddKey(void)
if ((r = crypt_init(&cd, uuid_or_device_header(NULL)))) if ((r = crypt_init(&cd, uuid_or_device_header(NULL))))
goto out; goto out;
crypt_set_confirm_callback(cd, yesDialog, NULL);
if ((r = crypt_load(cd, luksType(device_type), NULL))) { if ((r = crypt_load(cd, luksType(device_type), NULL))) {
log_err(_("Device %s is not a valid LUKS device."), log_err(_("Device %s is not a valid LUKS device."),
uuid_or_device_header(NULL)); uuid_or_device_header(NULL));
@@ -1976,7 +1967,6 @@ static int luksDump_with_volume_key(struct crypt_device *cd)
unsigned i; unsigned i;
int r; int r;
crypt_set_confirm_callback(cd, yesDialog, NULL);
if (!yesDialog( if (!yesDialog(
_("The header dump with volume key is sensitive information\n" _("The header dump with volume key is sensitive information\n"
"that allows access to encrypted partition without a passphrase.\n" "that allows access to encrypted partition without a passphrase.\n"
@@ -2047,7 +2037,6 @@ static int luksDump_with_unbound_key(struct crypt_device *cd)
return -EINVAL; return -EINVAL;
} }
crypt_set_confirm_callback(cd, yesDialog, NULL);
if (!yesDialog( if (!yesDialog(
_("The header dump with unbound key is sensitive information.\n" _("The header dump with unbound key is sensitive information.\n"
"This dump should be stored encrypted in a safe place."), "This dump should be stored encrypted in a safe place."),
@@ -2191,8 +2180,6 @@ static int action_luksBackup(void)
if ((r = crypt_init(&cd, uuid_or_device_header(NULL)))) if ((r = crypt_init(&cd, uuid_or_device_header(NULL))))
goto out; goto out;
crypt_set_confirm_callback(cd, yesDialog, NULL);
r = crypt_header_backup(cd, NULL, ARG_STR(OPT_HEADER_BACKUP_FILE_ID)); r = crypt_header_backup(cd, NULL, ARG_STR(OPT_HEADER_BACKUP_FILE_ID));
out: out:
crypt_free(cd); crypt_free(cd);
@@ -2305,8 +2292,6 @@ static int action_luksErase(void)
if ((r = crypt_init(&cd, uuid_or_device_header(NULL)))) if ((r = crypt_init(&cd, uuid_or_device_header(NULL))))
goto out; goto out;
crypt_set_confirm_callback(cd, yesDialog, NULL);
if ((r = crypt_load(cd, luksType(device_type), NULL))) { if ((r = crypt_load(cd, luksType(device_type), NULL))) {
log_err(_("Device %s is not a valid LUKS device."), log_err(_("Device %s is not a valid LUKS device."),
uuid_or_device_header(NULL)); uuid_or_device_header(NULL));
@@ -2364,8 +2349,6 @@ static int action_luksConvert(void)
if ((r = crypt_init(&cd, uuid_or_device_header(NULL)))) if ((r = crypt_init(&cd, uuid_or_device_header(NULL))))
return r; return r;
crypt_set_confirm_callback(cd, yesDialog, NULL);
if ((r = crypt_load(cd, CRYPT_LUKS, NULL)) || if ((r = crypt_load(cd, CRYPT_LUKS, NULL)) ||
!(from_type = crypt_get_type(cd))) { !(from_type = crypt_get_type(cd))) {
log_err(_("Device %s is not a valid LUKS device."), log_err(_("Device %s is not a valid LUKS device."),