mirror of
https://gitlab.com/cryptsetup/cryptsetup.git
synced 2025-12-17 05:40:13 +01:00
Do not link integritysetup and veritysetup with pwquality.
These tools do not read passphrases, no need to link to these libraries. Just move the helper code that introduced this dependence as a side-effect. Fixes: #677
This commit is contained in:
@@ -493,3 +493,59 @@ int tools_reencrypt_progress(uint64_t size, uint64_t offset, void *usrptr)
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
int tools_read_mk(const char *file, char **key, int keysize)
|
||||
{
|
||||
int fd = -1, r = -EINVAL;
|
||||
|
||||
if (keysize <= 0 || !key)
|
||||
return -EINVAL;
|
||||
|
||||
*key = crypt_safe_alloc(keysize);
|
||||
if (!*key)
|
||||
return -ENOMEM;
|
||||
|
||||
fd = open(file, O_RDONLY);
|
||||
if (fd == -1) {
|
||||
log_err(_("Cannot read keyfile %s."), file);
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (read_buffer(fd, *key, keysize) != keysize) {
|
||||
log_err(_("Cannot read %d bytes from keyfile %s."), keysize, file);
|
||||
goto out;
|
||||
}
|
||||
r = 0;
|
||||
out:
|
||||
if (fd != -1)
|
||||
close(fd);
|
||||
|
||||
if (r) {
|
||||
crypt_safe_free(*key);
|
||||
*key = NULL;
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
int tools_write_mk(const char *file, const char *key, int keysize)
|
||||
{
|
||||
int fd, r = -EINVAL;
|
||||
|
||||
if (keysize <= 0 || !key)
|
||||
return -EINVAL;
|
||||
|
||||
fd = open(file, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR);
|
||||
if (fd < 0) {
|
||||
log_err(_("Cannot open keyfile %s for write."), file);
|
||||
return r;
|
||||
}
|
||||
|
||||
if (write_buffer(fd, key, keysize) == keysize)
|
||||
r = 0;
|
||||
else
|
||||
log_err(_("Cannot write to keyfile %s."), file);
|
||||
|
||||
close(fd);
|
||||
return r;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user