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

Set devel version.

Browse Source
This commit is contained in:
Milan Broz
2018-04-24 20:22:00 +02:00
parent 487965dc8a
commit 5a71c6f2eb
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -1,5 +1,5 @@
AC_PREREQ([2.67]) AC_PREREQ([2.67])
AC_INIT([cryptsetup],[2.0.2]) AC_INIT([cryptsetup],[2.0.3-git])
dnl library version from <major>.<minor>.<release>[-<suffix>] dnl library version from <major>.<minor>.<release>[-<suffix>]
LIBCRYPTSETUP_VERSION=$(echo $PACKAGE_VERSION | cut -f1 -d-) LIBCRYPTSETUP_VERSION=$(echo $PACKAGE_VERSION | cut -f1 -d-)

2
lib/setup.c
View File

@@ -4277,7 +4277,7 @@ static int verify_and_update_segment_digest(struct crypt_device *cd,
r = update_volume_key_segment_digest(cd, &cd->u.luks2.hdr, digest, 1); r = update_volume_key_segment_digest(cd, &cd->u.luks2.hdr, digest, 1);
if (r) if (r)
log_err(cd, _("Failed to designate keyslot %u to be new volume keyslot.\n"), keyslot); log_err(cd, _("Failed to assign keyslot %u as the new volume key.\n"), keyslot);
out: out:
crypt_free_volume_key(vk); crypt_free_volume_key(vk);
return r < 0 ? r : keyslot; return r < 0 ? r : keyslot;

2
src/cryptsetup.c
View File

@@ -1510,7 +1510,7 @@ static int action_luksConvertKey(void)
goto out; goto out;
} }
r = tools_get_key(_("Enter passphrase for keylot to be converted: "), r = tools_get_key(_("Enter passphrase for keyslot to be converted: "),
&password, &password_size, &password, &password_size,
opt_keyfile_offset, opt_keyfile_size, opt_key_file, opt_keyfile_offset, opt_keyfile_size, opt_key_file,
opt_timeout, _verify_passphrase(0), 0, cd); opt_timeout, _verify_passphrase(0), 0, cd);