mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-21 07:01:57 +00:00
efi_loader: simplify tcg2_measure_secure_boot_variable()
Don't duplicate GUIDs. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
This commit is contained in:
parent
02fef8b101
commit
a45dac1785
1 changed files with 13 additions and 16 deletions
|
@ -11,6 +11,7 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <dm.h>
|
#include <dm.h>
|
||||||
#include <efi_loader.h>
|
#include <efi_loader.h>
|
||||||
|
#include <efi_variable.h>
|
||||||
#include <efi_tcg2.h>
|
#include <efi_tcg2.h>
|
||||||
#include <log.h>
|
#include <log.h>
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
|
@ -79,17 +80,12 @@ static const struct digest_info hash_algo_list[] = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
struct variable_info {
|
static const u16 *secure_variables[] = {
|
||||||
u16 *name;
|
u"SecureBoot",
|
||||||
const efi_guid_t *guid;
|
u"PK",
|
||||||
};
|
u"KEK",
|
||||||
|
u"db",
|
||||||
static struct variable_info secure_variables[] = {
|
u"dbx",
|
||||||
{L"SecureBoot", &efi_global_variable_guid},
|
|
||||||
{L"PK", &efi_global_variable_guid},
|
|
||||||
{L"KEK", &efi_global_variable_guid},
|
|
||||||
{L"db", &efi_guid_image_security_database},
|
|
||||||
{L"dbx", &efi_guid_image_security_database},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#define MAX_HASH_COUNT ARRAY_SIZE(hash_algo_list)
|
#define MAX_HASH_COUNT ARRAY_SIZE(hash_algo_list)
|
||||||
|
@ -1594,19 +1590,20 @@ static efi_status_t tcg2_measure_secure_boot_variable(struct udevice *dev)
|
||||||
|
|
||||||
count = ARRAY_SIZE(secure_variables);
|
count = ARRAY_SIZE(secure_variables);
|
||||||
for (i = 0; i < count; i++) {
|
for (i = 0; i < count; i++) {
|
||||||
|
const efi_guid_t *guid;
|
||||||
|
|
||||||
|
guid = efi_auth_var_get_guid(secure_variables[i]);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* According to the TCG2 PC Client PFP spec, "SecureBoot",
|
* According to the TCG2 PC Client PFP spec, "SecureBoot",
|
||||||
* "PK", "KEK", "db" and "dbx" variables must be measured
|
* "PK", "KEK", "db" and "dbx" variables must be measured
|
||||||
* even if they are empty.
|
* even if they are empty.
|
||||||
*/
|
*/
|
||||||
data = efi_get_var(secure_variables[i].name,
|
data = efi_get_var(secure_variables[i], guid, &data_size);
|
||||||
secure_variables[i].guid,
|
|
||||||
&data_size);
|
|
||||||
|
|
||||||
ret = tcg2_measure_variable(dev, 7,
|
ret = tcg2_measure_variable(dev, 7,
|
||||||
EV_EFI_VARIABLE_DRIVER_CONFIG,
|
EV_EFI_VARIABLE_DRIVER_CONFIG,
|
||||||
secure_variables[i].name,
|
secure_variables[i], guid,
|
||||||
secure_variables[i].guid,
|
|
||||||
data_size, data);
|
data_size, data);
|
||||||
free(data);
|
free(data);
|
||||||
if (ret != EFI_SUCCESS)
|
if (ret != EFI_SUCCESS)
|
||||||
|
|
Loading…
Reference in a new issue