diff options
| author | Julien Masson <jmasson@baylibre.com> | 2024-02-29 18:21:03 +0100 |
|---|---|---|
| committer | Joakim Bech <joakim.bech@linaro.org> | 2024-03-05 10:28:43 +0100 |
| commit | a923d238f1667eaeea188da99d6f89609f5c2a4a (patch) | |
| tree | 0f9472fbdaa373d465e5b9f6a614c17ab1ea79a0 | |
| parent | 5c59dde33be398b17b1098c61d0fa272601f7f8e (diff) | |
| download | apps-a923d238f1667eaeea188da99d6f89609f5c2a4a.tar.gz | |
keymaster: clean-up/fixes after trusty updates
The keymaster service has been realigned with trusty but some parts of
the code imported need changes:
- remove unused macros
- align keymaster_command
- keep OPTEE_KEYMASTER_SEND_BUF_SIZE size
- OP-TEE Foundation -> OP-TEE
Fixes: 258bfd4cec42 (keymaster: realign android service with trusty)
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Signed-off-by: Julien Masson <jmasson@baylibre.com>
| -rw-r--r-- | keymaster/3.0/OpteeKeymaster3Device.cpp | 2 | ||||
| -rw-r--r-- | keymaster/include/optee_keymaster/ipc/keymaster_ipc.h | 29 | ||||
| -rw-r--r-- | keymaster/include/optee_keymaster/ipc/optee_keymaster_ipc.h | 3 |
3 files changed, 15 insertions, 19 deletions
diff --git a/keymaster/3.0/OpteeKeymaster3Device.cpp b/keymaster/3.0/OpteeKeymaster3Device.cpp index 8e7d8f6..e923c07 100644 --- a/keymaster/3.0/OpteeKeymaster3Device.cpp +++ b/keymaster/3.0/OpteeKeymaster3Device.cpp @@ -217,7 +217,7 @@ OpteeKeymaster3Device::~OpteeKeymaster3Device() {} Return<void> OpteeKeymaster3Device::getHardwareFeatures(getHardwareFeatures_cb _hidl_cb) { _hidl_cb(true /* is_secure */, true /* supports_ec */, true /* supports_symmetric_cryptography */, true /* supports_attestation */, - true /* supportsAllDigests */, "OpteeKeymaster", "OP-TEE Foundation"); + true /* supportsAllDigests */, "OpteeKeymaster", "OP-TEE"); return Void(); } diff --git a/keymaster/include/optee_keymaster/ipc/keymaster_ipc.h b/keymaster/include/optee_keymaster/ipc/keymaster_ipc.h index 19f5a48..1ae476f 100644 --- a/keymaster/include/optee_keymaster/ipc/keymaster_ipc.h +++ b/keymaster/include/optee_keymaster/ipc/keymaster_ipc.h @@ -18,9 +18,6 @@ // clang-format off -#define KEYMASTER_PORT "com.android.optee.keymaster" -#define KEYMASTER_MAX_BUFFER_LENGTH 4096 - // Commands enum keymaster_command : uint32_t { KEYMASTER_RESP_BIT = 1, @@ -64,20 +61,20 @@ enum keymaster_command : uint32_t { KM_GENERATE_CSR_V2 = (36 << KEYMASTER_REQ_SHIFT), // Bootloader/provisioning calls. - KM_SET_BOOT_PARAMS = (0x1000 << KEYMASTER_REQ_SHIFT), - KM_SET_ATTESTATION_KEY = (0x2000 << KEYMASTER_REQ_SHIFT), + KM_SET_BOOT_PARAMS = (0x1000 << KEYMASTER_REQ_SHIFT), + KM_SET_ATTESTATION_KEY = (0x2000 << KEYMASTER_REQ_SHIFT), KM_APPEND_ATTESTATION_CERT_CHAIN = (0x3000 << KEYMASTER_REQ_SHIFT), - KM_ATAP_GET_CA_REQUEST = (0x4000 << KEYMASTER_REQ_SHIFT), - KM_ATAP_SET_CA_RESPONSE_BEGIN = (0x5000 << KEYMASTER_REQ_SHIFT), - KM_ATAP_SET_CA_RESPONSE_UPDATE = (0x6000 << KEYMASTER_REQ_SHIFT), - KM_ATAP_SET_CA_RESPONSE_FINISH = (0x7000 << KEYMASTER_REQ_SHIFT), - KM_ATAP_READ_UUID = (0x8000 << KEYMASTER_REQ_SHIFT), - KM_SET_PRODUCT_ID = (0x9000 << KEYMASTER_REQ_SHIFT), - KM_CLEAR_ATTESTATION_CERT_CHAIN = (0xa000 << KEYMASTER_REQ_SHIFT), - KM_SET_WRAPPED_ATTESTATION_KEY = (0xb000 << KEYMASTER_REQ_SHIFT), - KM_SET_ATTESTATION_IDS = (0xc000 << KEYMASTER_REQ_SHIFT), - KM_SET_ATTESTATION_IDS_KM3 = (0xc001 << KEYMASTER_REQ_SHIFT), - KM_CONFIGURE_BOOT_PATCHLEVEL = (0xd000 << KEYMASTER_REQ_SHIFT), + KM_ATAP_GET_CA_REQUEST = (0x4000 << KEYMASTER_REQ_SHIFT), + KM_ATAP_SET_CA_RESPONSE_BEGIN = (0x5000 << KEYMASTER_REQ_SHIFT), + KM_ATAP_SET_CA_RESPONSE_UPDATE = (0x6000 << KEYMASTER_REQ_SHIFT), + KM_ATAP_SET_CA_RESPONSE_FINISH = (0x7000 << KEYMASTER_REQ_SHIFT), + KM_ATAP_READ_UUID = (0x8000 << KEYMASTER_REQ_SHIFT), + KM_SET_PRODUCT_ID = (0x9000 << KEYMASTER_REQ_SHIFT), + KM_CLEAR_ATTESTATION_CERT_CHAIN = (0xa000 << KEYMASTER_REQ_SHIFT), + KM_SET_WRAPPED_ATTESTATION_KEY = (0xb000 << KEYMASTER_REQ_SHIFT), + KM_SET_ATTESTATION_IDS = (0xc000 << KEYMASTER_REQ_SHIFT), + KM_SET_ATTESTATION_IDS_KM3 = (0xc001 << KEYMASTER_REQ_SHIFT), + KM_CONFIGURE_BOOT_PATCHLEVEL = (0xd000 << KEYMASTER_REQ_SHIFT), }; #ifdef __ANDROID__ diff --git a/keymaster/include/optee_keymaster/ipc/optee_keymaster_ipc.h b/keymaster/include/optee_keymaster/ipc/optee_keymaster_ipc.h index f87fae0..4358a81 100644 --- a/keymaster/include/optee_keymaster/ipc/optee_keymaster_ipc.h +++ b/keymaster/include/optee_keymaster/ipc/optee_keymaster_ipc.h @@ -24,8 +24,7 @@ __BEGIN_DECLS const uint32_t OPTEE_KEYMASTER_RECV_BUF_SIZE = 2 * PAGE_SIZE; -const uint32_t OPTEE_KEYMASTER_SEND_BUF_SIZE = - (PAGE_SIZE - sizeof(struct keymaster_message) - 16 /* tipc header */); +const uint32_t OPTEE_KEYMASTER_SEND_BUF_SIZE = 2 * PAGE_SIZE; int optee_keymaster_connect(void); int optee_keymaster_call(uint32_t cmd, void* in, uint32_t in_size, uint8_t* out, |