diff options
| author | Ji Luo <ji.luo@nxp.com> | 2020-06-18 10:52:37 +0800 |
|---|---|---|
| committer | Ji Luo <ji.luo@nxp.com> | 2022-04-18 16:40:09 +0800 |
| commit | dbe3d7726816b0efad5c605b7702177428b245d9 (patch) | |
| tree | b1d03166019ba08c5531f6716a57e4da6c859cab /include | |
| parent | 3a9cea328057ba484f8884d32a5e0a6ed5b2b24d (diff) | |
MA-17390 Clean build warnings for android
This commit eliminate the annoying build warning logs.
Test: builds with buildman.
Signed-off-by: Ji Luo <ji.luo@nxp.com>
Change-Id: Ia335dafe3f4c0eab08e011215b9de5d2974b8d0c
(cherry picked from commit 85e0d429d19b8f9a62369a5f20e088644c488b1e)
(cherry picked from commit 52471735760a8d3a410f88c144910a07a161028d)
(cherry picked from commit c0ed4a68aecf0cf67d61c72c273fcd655682366f)
Diffstat (limited to 'include')
| -rw-r--r-- | include/trusty/keymaster.h | 22 | ||||
| -rw-r--r-- | include/trusty/sysdeps.h | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/include/trusty/keymaster.h b/include/trusty/keymaster.h index 3776dbc5a54..a44ae21987a 100644 --- a/include/trusty/keymaster.h +++ b/include/trusty/keymaster.h @@ -86,6 +86,28 @@ int trusty_append_attestation_cert_chain(const uint8_t *cert, uint32_t cert_size, keymaster_algorithm_t algorithm); /* + * Set encrypted Keymaster attestation key. Returns one of trusty_err. + * + * @key: buffer containing encrypted key + * @key_size: size of key in bytes + * @algorithm: one of KM_ALGORITHM_RSA or KM_ALGORITHM_EC + */ +int trusty_set_attestation_key_enc(const uint8_t *key, + uint32_t key_size, + keymaster_algorithm_t algorithm); + +/* + * Append encrypted certificate to Keymaster attestation certificate chain. Returns + * one of trusty_err. + * + * @cert: buffer containing encrypted certificate + * @cert_size: size of certificate in bytes + * @algorithm: one of KM_ALGORITHM_RSA or KM_ALGORITHM_EC + */ +int trusty_append_attestation_cert_chain_enc(const uint8_t *cert, + uint32_t cert_size, + keymaster_algorithm_t algorithm); +/* * Reads a CA Request from Keymaster. On success allocates a new CA Request * message at |*ca_request_p|, and the caller takes ownership. Returns one * of trusty_err. diff --git a/include/trusty/sysdeps.h b/include/trusty/sysdeps.h index 1f26bbd4c3d..b21a29ca08d 100644 --- a/include/trusty/sysdeps.h +++ b/include/trusty/sysdeps.h @@ -31,6 +31,7 @@ */ #include <common.h> #include <compiler.h> +#include <irq_func.h> /* * These attribute macros may need to be adjusted if not using gcc or clang. |