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

Allow initialisation without specifying device.

Browse Source 
This is used e.g. when caller need only generate volume key in plain mode.

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@134 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
Milan Broz
2009-10-23 10:43:11 +00:00
parent 6a14ba8eb5
commit 873017d0fa
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/setup.c
View File

@@ -990,7 +990,7 @@ int crypt_init(struct crypt_device **cd, const char *device)
log_dbg("Allocating crypt device %s context.", device); log_dbg("Allocating crypt device %s context.", device);
if (!device_ready(NULL, device, O_RDONLY)) if (device && !device_ready(NULL, device, O_RDONLY))
return -ENOTBLK; return -ENOTBLK;
if (!(h = malloc(sizeof(struct crypt_device)))) if (!(h = malloc(sizeof(struct crypt_device))))
@@ -998,11 +998,14 @@ int crypt_init(struct crypt_device **cd, const char *device)
memset(h, 0, sizeof(*h)); memset(h, 0, sizeof(*h));
h->device = strdup(device); if (device) {
if (!h->device) { h->device = strdup(device);
free(h); if (!h->device) {
return -ENOMEM; free(h);
} return -ENOMEM;
}
} else
h->device = NULL;
if (dm_init(h, 1) < 0) { if (dm_init(h, 1) < 0) {
free(h); free(h);
@@ -1085,6 +1088,11 @@ static int _crypt_format_luks1(struct crypt_device *cd,
{ {
int r; int r;
if (!cd->device) {
log_err(cd, _("Can't format LUKS without device.\n"));
return -EINVAL;
}
r = LUKS_generate_phdr(&cd->hdr, cd->volume_key, cipher, cipher_mode, r = LUKS_generate_phdr(&cd->hdr, cd->volume_key, cipher, cipher_mode,
(params && params->hash) ? params->hash : "sha1", (params && params->hash) ? params->hash : "sha1",
uuid, LUKS_STRIPES, uuid, LUKS_STRIPES,
@@ -1115,7 +1123,7 @@ int crypt_format(struct crypt_device *cd,
{ {
int r; int r;
log_dbg("Formatting device %s as type %s.", cd->device, cd->type ?: "(none)"); log_dbg("Formatting device %s as type %s.", cd->device ?: "(none)", cd->type ?: "(none)");
if (!type) if (!type)
return -EINVAL; return -EINVAL;
@@ -1160,9 +1168,12 @@ int crypt_load(struct crypt_device *cd,
int r; int r;
log_dbg("Trying to load %s crypt type from device %s.", log_dbg("Trying to load %s crypt type from device %s.",
requested_type ?: "any", cd->device); requested_type ?: "any", cd->device ?: "(none)");
if (requested_type && !isPLAIN(requested_type) && !isLUKS(requested_type)) if (!cd->device)
return -EINVAL;
if (requested_type && !isLUKS(requested_type))
return -EINVAL; return -EINVAL;
/* Some hash functions need initialized gcrypt library */ /* Some hash functions need initialized gcrypt library */
@@ -2010,7 +2021,7 @@ const char *crypt_get_uuid(struct crypt_device *cd)
int crypt_get_volume_key_size(struct crypt_device *cd) int crypt_get_volume_key_size(struct crypt_device *cd)
{ {
if (isPLAIN(cd->type)) if (isPLAIN(cd->type))
return cd->volume_key->keyLength; return cd->volume_key->keyLength / 8;
if (isLUKS(cd->type)) if (isLUKS(cd->type))
return cd->hdr.keyBytes; return cd->hdr.keyBytes;