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

Add code for activation wirh FEC device.

Browse Source
This commit is contained in:
Milan Broz
2017-04-03 10:21:37 +02:00
parent 00419c6c41
commit e8eab081c5
5 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/setup.c
View File

@@ -72,6 +72,7 @@ struct crypt_device {
char *root_hash;
unsigned int root_hash_size;
char *uuid;
struct device *fec_device;
} verity;
struct { /* used in CRYPT_TCRYPT */
struct crypt_params_tcrypt params;
@@ -618,6 +619,10 @@ static int _crypt_load_verity(struct crypt_device *cd, struct crypt_params_verit
(r = crypt_set_data_device(cd, params->data_device)) < 0)
return r;
if (params && params->fec_device &&
(r = device_alloc(&cd->u.verity.fec_device, params->fec_device)) < 0)
return r;
return r;
}
@@ -1039,6 +1044,10 @@ static int _crypt_format_verity(struct crypt_device *cd,
return -EINVAL;
}
if (params->fec_device &&
(r = device_alloc(&cd->u.verity.fec_device, params->fec_device)) < 0)
return r;
hash_size = crypt_hash_size(params->hash_name);
if (hash_size <= 0) {
log_err(cd, _("Hash algorithm %s not supported.\n"),
@@ -1078,6 +1087,8 @@ static int _crypt_format_verity(struct crypt_device *cd,
if (params->flags & CRYPT_VERITY_CREATE_HASH) {
r = VERITY_create(cd, &cd->u.verity.hdr,
cd->u.verity.root_hash, cd->u.verity.root_hash_size);
if (!r && params->fec_device)
r = VERITY_FEC_create(cd, &cd->u.verity.hdr);
if (r)
return r;
}
@@ -1096,12 +1107,6 @@ static int _crypt_format_verity(struct crypt_device *cd,
&cd->u.verity.hdr);
}
if (params->fec_device) {
r = VERITY_FEC_create(cd, &cd->u.verity.hdr);
if (r)
return r;
}
return r;
}
@@ -1379,6 +1384,7 @@ void crypt_free(struct crypt_device *cd)
free(CONST_CAST(void*)cd->u.verity.hdr.salt);
free(cd->u.verity.root_hash);
free(cd->u.verity.uuid);
device_free(cd->u.verity.fec_device);
} else if (!cd->type) {
free(cd->u.none.active_name);
}
@@ -2026,7 +2032,7 @@ int crypt_activate_by_volume_key(struct crypt_device *cd,
return -EINVAL;
}
r = VERITY_activate(cd, name, volume_key, volume_key_size,
r = VERITY_activate(cd, name, volume_key, volume_key_size, cd->u.verity.fec_device,
&cd->u.verity.hdr, flags|CRYPT_ACTIVATE_READONLY);
if (r == -EPERM) {