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

Move terminal handling to tools wrapper.

Browse Source
This commit is contained in:
Milan Broz
2015-08-26 14:16:47 +02:00
parent 39698fa6b7
commit 5293f5aae1
5 changed files with 170 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cryptsetup_reencrypt.c
View File

@@ -987,17 +987,13 @@ static int init_passphrase1(struct reenc_ctx *rc, struct crypt_device *cd,
retry_count = opt_tries ?: 1;
while (retry_count--) {
set_int_handler(0);
r = crypt_get_key(msg, &password, &passwordLen,
0, 0, NULL /*opt_key_file*/,
0, 0, cd);
r = tools_get_key(msg, &password, &passwordLen, 0, 0,
NULL /*opt_key_file*/, 0, 0, 0 /*pwquality*/, cd);
if (r < 0)
return r;
if (quit)
return -EAGAIN;
/* library uses sigint internally, until it is fixed...*/
set_int_block(1);
if (check)
r = crypt_activate_by_passphrase(cd, NULL, slot_to_check,
password, passwordLen, 0);
@@ -1032,8 +1028,8 @@ static int init_keyfile(struct reenc_ctx *rc, struct crypt_device *cd, int slot_
int r;
size_t passwordLen;
r = crypt_get_key(NULL, &password, &passwordLen, opt_keyfile_offset,
opt_keyfile_size, opt_key_file, 0, 0, cd);
r = tools_get_key(NULL, &password, &passwordLen, opt_keyfile_offset,
opt_keyfile_size, opt_key_file, 0, 0, 0, cd);
if (r < 0)
return r;