github
/
arm-trusted-firmware
mirror of https://github.com/ARM-software/arm-trusted-firmware.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

feat(lib/psa): mock PSA APIs 

Introduce PLAT_RSS_NOT_SUPPORTED build config to
provide a mocked version of PSA APIs. The goal is
to test the RSS backend based measured boot and
attestation token request integration on such
a platform (AEM FVP) where RSS is otherwise
unsupported. The mocked PSA API version does
not send a request to the RSS, it only returns
with success and hard-coded values.

Signed-off-by: Tamas Ban <tamas.ban@arm.com>
Change-Id: Ice8d174adf828c1df08fc589f0e17abd1e382a4d
pull/1985/head
Tamas Ban 3 years ago
committed by David Vincze
parent
0442ebd2e9
commit
0ce2072d9b
5 changed files with 162 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Makefile
  2. 5
      docs/getting_started/build-options.rst
  3. 127
      lib/psa/initial_attestation.c
  4. 25
      lib/psa/measured_boot.c
  5. 3
      make_helpers/defaults.mk

2
Makefile
View File

@ -1011,6 +1011,7 @@ $(eval $(call assert_booleans,\
NS_TIMER_SWITCH \
OVERRIDE_LIBC \
PL011_GENERIC_UART \
PLAT_RSS_NOT_SUPPORTED \
PROGRAMMABLE_RESET_ADDRESS \
PSCI_EXTENDED_STATE_ID \
RESET_TO_BL31 \
@ -1146,6 +1147,7 @@ $(eval $(call add_defines,\
NS_TIMER_SWITCH \
PL011_GENERIC_UART \
PLAT_${PLAT} \
PLAT_RSS_NOT_SUPPORTED \
PROGRAMMABLE_RESET_ADDRESS \
PSCI_EXTENDED_STATE_ID \
RAS_EXTENSION \

5
docs/getting_started/build-options.rst
View File

@ -994,6 +994,11 @@ Common build options
if FEAT_TRF is implemented. This flag can take the values 0 to 2, to align
with the ``FEATURE_DETECTION`` mechanism. This flag is disabled by default.
- ``PLAT_RSS_NOT_SUPPORTED``: Boolean option to enable the usage of the PSA
APIs on platforms that doesn't support RSS (providing Arm CCA HES
functionalities). When enabled (``1``), a mocked version of the APIs are used.
The default value is 0.
GICv3 driver options
--------------------

127
lib/psa/initial_attestation.c
View File

@ -9,6 +9,7 @@
#include <psa/client.h>
#include <psa_manifest/sid.h>
#if !PLAT_RSS_NOT_SUPPORTED
psa_status_t
psa_initial_attest_get_token(const uint8_t *auth_challenge,
size_t challenge_size,
@ -34,3 +35,129 @@ psa_initial_attest_get_token(const uint8_t *auth_challenge,
return status;
}
#else /* !PLAT_RSS_NOT_SUPPORTED */
#include <string.h>
static const uint8_t platform_token[] = {
0xD2, 0x84, 0x43, 0xA1, 0x01, 0x26, 0xA0, 0x59,
0x02, 0xBE, 0xAA, 0x3A, 0x00, 0x01, 0x24, 0xFF,
0x58, 0x20, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB,
0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB,
0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB,
0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB,
0xAB, 0xAB, 0x3A, 0x00, 0x01, 0x24, 0xFB, 0x58,
0x20, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6,
0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE,
0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6,
0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE,
0xBF, 0x3A, 0x00, 0x01, 0x25, 0x00, 0x58, 0x21,
0x01, 0xFA, 0x58, 0x75, 0x5F, 0x65, 0x86, 0x27,
0xCE, 0x54, 0x60, 0xF2, 0x9B, 0x75, 0x29, 0x67,
0x13, 0x24, 0x8C, 0xAE, 0x7A, 0xD9, 0xE2, 0x98,
0x4B, 0x90, 0x28, 0x0E, 0xFC, 0xBC, 0xB5, 0x02,
0x48, 0x3A, 0x00, 0x01, 0x24, 0xFA, 0x58, 0x20,
0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB,
0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD,
0x3A, 0x00, 0x01, 0x24, 0xF8, 0x20, 0x3A, 0x00,
0x01, 0x24, 0xF9, 0x00, 0x3A, 0x00, 0x01, 0x24,
0xFD, 0x85, 0xA5, 0x05, 0x58, 0x20, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x60,
0x01, 0x65, 0x42, 0x4C, 0x31, 0x5F, 0x32, 0x06,
0x66, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x02,
0x58, 0x20, 0xF8, 0xB7, 0xCE, 0xAD, 0x9B, 0xE4,
0x5A, 0x8F, 0x5C, 0x52, 0x6F, 0x0C, 0x05, 0x25,
0x8F, 0xF3, 0xE9, 0x81, 0xDC, 0xBC, 0xF2, 0x05,
0x7F, 0x33, 0xF6, 0xBB, 0xDC, 0xD9, 0x4D, 0xA2,
0x34, 0x3A, 0xA5, 0x05, 0x58, 0x20, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x67,
0x31, 0x2E, 0x37, 0x2E, 0x32, 0x2B, 0x30, 0x01,
0x63, 0x42, 0x4C, 0x32, 0x06, 0x66, 0x53, 0x48,
0x41, 0x32, 0x35, 0x36, 0x02, 0x58, 0x20, 0x3A,
0xE5, 0x9E, 0x40, 0xA9, 0x6B, 0xD5, 0x29, 0x1C,
0xAB, 0x7A, 0x5F, 0xBD, 0x1F, 0x9A, 0xA6, 0x52,
0xFB, 0x77, 0x7D, 0xA3, 0xEC, 0x9C, 0x29, 0xBC,
0xE6, 0x5B, 0x3B, 0x43, 0xFC, 0x9D, 0x26, 0xA5,
0x05, 0x58, 0x20, 0xBF, 0xE6, 0xD8, 0x6F, 0x88,
0x26, 0xF4, 0xFF, 0x97, 0xFB, 0x96, 0xC4, 0xE6,
0xFB, 0xC4, 0x99, 0x3E, 0x46, 0x19, 0xFC, 0x56,
0x5D, 0xA2, 0x6A, 0xDF, 0x34, 0xC3, 0x29, 0x48,
0x9A, 0xDC, 0x38, 0x04, 0x67, 0x31, 0x2E, 0x35,
0x2E, 0x30, 0x2B, 0x30, 0x01, 0x64, 0x52, 0x54,
0x5F, 0x30, 0x06, 0x66, 0x53, 0x48, 0x41, 0x32,
0x35, 0x36, 0x02, 0x58, 0x20, 0x47, 0x94, 0x9D,
0x27, 0x33, 0x82, 0x45, 0x1A, 0xDD, 0x25, 0xF4,
0x9A, 0x89, 0x6F, 0x5F, 0xD9, 0xB0, 0xE8, 0x14,
0xD3, 0xA4, 0x9B, 0x53, 0xB0, 0x44, 0x0B, 0xCF,
0x32, 0x1A, 0xC4, 0xD2, 0x65, 0xA5, 0x05, 0x58,
0x20, 0xB3, 0x60, 0xCA, 0xF5, 0xC9, 0x8C, 0x6B,
0x94, 0x2A, 0x48, 0x82, 0xFA, 0x9D, 0x48, 0x23,
0xEF, 0xB1, 0x66, 0xA9, 0xEF, 0x6A, 0x6E, 0x4A,
0xA3, 0x7C, 0x19, 0x19, 0xED, 0x1F, 0xCC, 0xC0,
0x49, 0x04, 0x67, 0x30, 0x2E, 0x30, 0x2E, 0x37,
0x2B, 0x30, 0x01, 0x64, 0x52, 0x54, 0x5F, 0x31,
0x06, 0x66, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36,
0x02, 0x58, 0x20, 0xCD, 0x38, 0xBE, 0xC8, 0xB7,
0xC0, 0x9E, 0xD5, 0x24, 0x30, 0xFE, 0xC8, 0xD0,
0x19, 0x12, 0x56, 0xB2, 0x7A, 0xA5, 0x53, 0x6F,
0xBC, 0x7D, 0x09, 0xCA, 0x11, 0xDD, 0x90, 0xD7,
0xD6, 0x70, 0xFD, 0xA5, 0x05, 0x58, 0x20, 0xAA,
0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x04,
0x60, 0x01, 0x60, 0x06, 0x66, 0x53, 0x48, 0x41,
0x32, 0x35, 0x36, 0x02, 0x58, 0x20, 0x28, 0x3D,
0x0C, 0x25, 0x22, 0x0C, 0x87, 0x46, 0xA0, 0x58,
0x64, 0x6C, 0x0B, 0x14, 0x37, 0x39, 0x40, 0x9D,
0x2D, 0x11, 0xD1, 0xCC, 0x54, 0x51, 0xB4, 0x29,
0x22, 0xCD, 0x70, 0x92, 0x71, 0xC3, 0x3A, 0x00,
0x01, 0x25, 0x01, 0x77, 0x77, 0x77, 0x77, 0x2E,
0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x66,
0x69, 0x72, 0x6D, 0x77, 0x61, 0x72, 0x65, 0x2E,
0x6F, 0x72, 0x67, 0x3A, 0x00, 0x01, 0x24, 0xF7,
0x71, 0x50, 0x53, 0x41, 0x5F, 0x49, 0x4F, 0x54,
0x5F, 0x50, 0x52, 0x4F, 0x46, 0x49, 0x4C, 0x45,
0x5F, 0x31, 0x3A, 0x00, 0x01, 0x24, 0xFC, 0x70,
0x30, 0x36, 0x30, 0x34, 0x35, 0x36, 0x35, 0x32,
0x37, 0x32, 0x38, 0x32, 0x39, 0x31, 0x30, 0x30,
0x58, 0x40, 0x1E, 0x0D, 0x2B, 0xD8, 0x7A, 0xC9,
0x2D, 0xCB, 0x73, 0xD1, 0x42, 0x2F, 0xBF, 0xDA,
0x24, 0x71, 0xE2, 0xAF, 0xEA, 0x48, 0x60, 0x17,
0x23, 0x75, 0x64, 0xAC, 0xCC, 0x23, 0xA2, 0x67,
0xC4, 0xE7, 0x8F, 0x1C, 0x7C, 0x68, 0x49, 0x42,
0x4D, 0xDA, 0xC6, 0xD6, 0x21, 0x1C, 0xAA, 0x00,
0xDA, 0x1E, 0x68, 0x56, 0xA3, 0x48, 0xEE, 0xA7,
0x92, 0xA9, 0x09, 0x83, 0x42, 0x04, 0x06, 0x9E,
0x62, 0xBB
};
psa_status_t
psa_initial_attest_get_token(const uint8_t *auth_challenge,
size_t challenge_size,
uint8_t *token_buf,
size_t token_buf_size,
size_t *token_size)
{
(void)auth_challenge;
(void)challenge_size;
if (token_buf_size < sizeof(platform_token)) {
return PSA_ERROR_BUFFER_TOO_SMALL;
}
(void)memcpy(token_buf, platform_token, sizeof(platform_token));
*token_size = sizeof(platform_token);
return PSA_SUCCESS;
}
#endif /* !PLAT_RSS_NOT_SUPPORTED */

25
lib/psa/measured_boot.c
View File

@ -55,6 +55,7 @@ static void log_measurement(uint8_t index,
INFO(" - locking : %s\n", lock_measurement ? "true" : "false");
}
#if !PLAT_RSS_NOT_SUPPORTED
psa_status_t
rss_measured_boot_extend_measurement(uint8_t index,
const uint8_t *signer_id,
@ -102,3 +103,27 @@ rss_measured_boot_extend_measurement(uint8_t index,
in_vec, IOVEC_LEN(in_vec),
NULL, 0);
}
#else /* !PLAT_RSS_NOT_SUPPORTED */
psa_status_t
rss_measured_boot_extend_measurement(uint8_t index,
const uint8_t *signer_id,
size_t signer_id_size,
const uint8_t *version,
size_t version_size,
uint32_t measurement_algo,
const uint8_t *sw_type,
size_t sw_type_size,
const uint8_t *measurement_value,
size_t measurement_value_size,
bool lock_measurement)
{
log_measurement(index, signer_id, signer_id_size,
version, measurement_algo, sw_type,
measurement_value, measurement_value_size,
lock_measurement);
return PSA_SUCCESS;
}
#endif /* !PLAT_RSS_NOT_SUPPORTED */

3
make_helpers/defaults.mk
View File

@ -460,3 +460,6 @@ ENABLE_TRF_FOR_NS := 0
# SCR_EL3.TWEDEL(4bit) field, when FEAT_TWED is implemented.
# By default it takes 0, and need to be updated by the platforms.
TWED_DELAY := 0
# By default, disable the mocking of RSS provided services
PLAT_RSS_NOT_SUPPORTED := 0

Write Preview
Loading…
Cancel
Save