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

Fix various backward incompatibilities in password processing.

Browse Source
This commit is contained in:
Milan Broz
2015-08-26 14:20:04 +02:00
parent 4aea3b81ee
commit d293de579a
5 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/utils_crypt.c
View File

@@ -194,7 +194,8 @@ static int keyfile_seek(int fd, size_t bytes)
int crypt_keyfile_read(struct crypt_device *cd, const char *keyfile,
char **key, size_t *key_size_read,
size_t keyfile_offset, size_t keyfile_size_max)
size_t keyfile_offset, size_t keyfile_size_max,
uint32_t flags)
{
int fd, regular_file, char_read, unlimited_read = 0;
int r = -EINVAL, newline;
@@ -226,7 +227,7 @@ int crypt_keyfile_read(struct crypt_device *cd, const char *keyfile,
/* use 4k for buffer (page divisor but avoid huge pages) */
buflen = 4096 - sizeof(struct safe_allocation);
regular_file = 0;
if(fd != STDIN_FILENO) {
if (keyfile) {
if(stat(keyfile, &st) < 0) {
log_err(cd, _("Failed to stat key file.\n"));
goto out_err;
@@ -281,7 +282,7 @@ int crypt_keyfile_read(struct crypt_device *cd, const char *keyfile,
/* Stop on newline only if not requested read from keyfile */
if (char_read == 0)
break;
if (!keyfile && pass[i] == '\n') {
if ((flags & CRYPT_KEYFILE_STOP_EOL) && pass[i] == '\n') {
newline = 1;
pass[i] = '\0';
break;