Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-16 01:24:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge changes Ida9abfd5,Iec447d97 into integration

Browse source 
* changes:
  build: enable adding MbedTLS files for platform
  feat(lib/psa): add read_measurement API
This commit is contained in:
Sandrine Bailleux 2022-12-07 13:51:57 +01:00 • committed by TrustedFirmware Code Review
commit 825641d615
4 changed files with 141 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/auth/mbedtls/mbedtls_common.mk
View file

@ -22,7 +22,7 @@ $(eval $(call add_define,MBEDTLS_CONFIG_FILE))
MBEDTLS_SOURCES += drivers/auth/mbedtls/mbedtls_common.c
LIBMBEDTLS_SRCS := $(addprefix ${MBEDTLS_DIR}/library/, \
LIBMBEDTLS_SRCS += $(addprefix ${MBEDTLS_DIR}/library/, \
aes.c \
asn1parse.c \
asn1write.c \

49
include/lib/psa/measured_boot.h
View file

@ -74,4 +74,53 @@ rss_measured_boot_extend_measurement(uint8_t index,
size_t measurement_value_size,
bool lock_measurement);
/**
* Retrieves a measurement from the requested slot.
*
* index Slot number from which measurement is to be
* retrieved.
* signer_id Pointer to signer_id buffer.
* signer_id_size Size of the signer_id buffer in bytes.
* signer_id_len On success, number of bytes that make up
* signer_id.
* version Pointer to version buffer.
* version_size Size of the version buffer in bytes.
* version_len On success, number of bytes that makeup the
* version.
* measurement_algo Pointer to measurement_algo.
* sw_type Pointer to sw_type buffer.
* sw_type_size Size of the sw_type buffer in bytes.
* sw_type_len On success, number of bytes that makeup the
* sw_type.
* measurement_value Pointer to measurement_value buffer.
* measurement_value_size Size of the measurement_value buffer in bytes.
* measurement_value_len On success, number of bytes that make up the
* measurement_value.
* is_locked Pointer to lock status of requested measurement
* slot.
*
* PSA_SUCCESS
* - Success.
* PSA_ERROR_INVALID_ARGUMENT
* - The size of at least one of the output buffers is incorrect or the
* requested slot index is invalid.
* PSA_ERROR_DOES_NOT_EXIST
* - The requested slot is empty, does not contain a measurement.
*/
psa_status_t rss_measured_boot_read_measurement(uint8_t index,
uint8_t *signer_id,
size_t signer_id_size,
size_t *signer_id_len,
uint8_t *version,
size_t version_size,
size_t *version_len,
uint32_t *measurement_algo,
uint8_t *sw_type,
size_t sw_type_size,
size_t *sw_type_len,
uint8_t *measurement_value,
size_t measurement_value_size,
size_t *measurement_value_len,
bool *is_locked);
#endif /* PSA_MEASURED_BOOT_H */

75
lib/psa/measured_boot.c
View file

@ -111,6 +111,61 @@ rss_measured_boot_extend_measurement(uint8_t index,
NULL, 0);
}
psa_status_t rss_measured_boot_read_measurement(uint8_t index,
uint8_t *signer_id,
size_t signer_id_size,
size_t *signer_id_len,
uint8_t *version,
size_t version_size,
size_t *version_len,
uint32_t *measurement_algo,
uint8_t *sw_type,
size_t sw_type_size,
size_t *sw_type_len,
uint8_t *measurement_value,
size_t measurement_value_size,
size_t *measurement_value_len,
bool *is_locked)
{
psa_status_t status;
struct measured_boot_read_iovec_in_t read_iov_in = {
.index = index,
.sw_type_size = sw_type_size,
.version_size = version_size,
};
struct measured_boot_read_iovec_out_t read_iov_out;
psa_invec in_vec[] = {
{.base = &read_iov_in,
.len = sizeof(struct measured_boot_read_iovec_in_t)},
};
psa_outvec out_vec[] = {
{.base = &read_iov_out,
.len = sizeof(struct measured_boot_read_iovec_out_t)},
{.base = signer_id, .len = signer_id_size},
{.base = measurement_value, .len = measurement_value_size}
};
status = psa_call(RSS_MEASURED_BOOT_HANDLE, RSS_MEASURED_BOOT_READ,
in_vec, IOVEC_LEN(in_vec),
out_vec, IOVEC_LEN(out_vec));
if (status == PSA_SUCCESS) {
*is_locked = read_iov_out.is_locked;
*measurement_algo = read_iov_out.measurement_algo;
*sw_type_len = read_iov_out.sw_type_len;
*version_len = read_iov_out.version_len;
memcpy(sw_type, read_iov_out.sw_type, read_iov_out.sw_type_len);
memcpy(version, read_iov_out.version, read_iov_out.version_len);
*signer_id_len = out_vec[1].len;
*measurement_value_len = out_vec[2].len;
}
return status;
}
#else /* !PLAT_RSS_NOT_SUPPORTED */
psa_status_t
@ -133,4 +188,24 @@ rss_measured_boot_extend_measurement(uint8_t index,
return PSA_SUCCESS;
}
psa_status_t rss_measured_boot_read_measurement(uint8_t index,
uint8_t *signer_id,
size_t signer_id_size,
size_t *signer_id_len,
uint8_t *version,
size_t version_size,
size_t *version_len,
uint32_t *measurement_algo,
uint8_t *sw_type,
size_t sw_type_size,
size_t *sw_type_len,
uint8_t *measurement_value,
size_t measurement_value_size,
size_t *measurement_value_len,
bool *is_locked)
{
return PSA_SUCCESS;
}
#endif /* !PLAT_RSS_NOT_SUPPORTED */

16
lib/psa/measured_boot_private.h
View file

@ -11,8 +11,24 @@
#include <stdint.h>
/* Measured boot message types that distinguish its services */
#define RSS_MEASURED_BOOT_READ 1001U
#define RSS_MEASURED_BOOT_EXTEND 1002U
struct measured_boot_read_iovec_in_t {
uint8_t index;
uint8_t sw_type_size;
uint8_t version_size;
};
struct measured_boot_read_iovec_out_t {
uint8_t is_locked;
uint32_t measurement_algo;
uint8_t sw_type[SW_TYPE_MAX_SIZE];
uint8_t sw_type_len;
uint8_t version[VERSION_MAX_SIZE];
uint8_t version_len;
};
struct measured_boot_extend_iovec_t {
uint8_t index;
uint8_t lock_measurement;