openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

trusty: keymaster: Implement upgrade_key 

Test: builds
Change-Id: I2ce86be1cd2c2c35ded371b21cb6546c31e0014e
This commit is contained in:
Jocelyn Bohr 2017-02-09 17:35:32 -08:00
parent a256198b92
commit 22812e9a30
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
trusty/keymaster/keymaster_ipc.h
View File

@ -43,6 +43,7 @@ enum keymaster_command : uint32_t {
KM_GET_SUPPORTED_EXPORT_FORMATS = (14 << KEYMASTER_REQ_SHIFT),
KM_GET_KEY_CHARACTERISTICS = (15 << KEYMASTER_REQ_SHIFT),
KM_ATTEST_KEY = (16 << KEYMASTER_REQ_SHIFT),
KM_UPGRADE_KEY = (17 << KEYMASTER_REQ_SHIFT),
KM_CONFIGURE = (18 << KEYMASTER_REQ_SHIFT),
};

28
trusty/keymaster/trusty_keymaster_device.cpp
View File

@ -426,6 +426,34 @@ keymaster_error_t TrustyKeymasterDevice::upgrade_key(const keymaster_key_blob_t*
const keymaster_key_param_set_t* upgrade_params,
keymaster_key_blob_t* upgraded_key) {
ALOGD("Device received upgrade_key");
if (error_ != KM_ERROR_OK) {
return error_;
}
if (!key_to_upgrade || !upgrade_params) {
return KM_ERROR_UNEXPECTED_NULL_POINTER;
}
if (!upgraded_key) {
return KM_ERROR_OUTPUT_PARAMETER_NULL;
}
UpgradeKeyRequest request;
request.SetKeyMaterial(*key_to_upgrade);
request.upgrade_params.Reinitialize(*upgrade_params);
UpgradeKeyResponse response;
keymaster_error_t err = Send(KM_UPGRADE_KEY, request, &response);
if (err != KM_ERROR_OK) {
return err;
}
upgraded_key->key_material_size = response.upgraded_key.key_material_size;
upgraded_key->key_material = DuplicateBuffer(response.upgraded_key.key_material,
response.upgraded_key.key_material_size);
if (!upgraded_key->key_material) {
return KM_ERROR_MEMORY_ALLOCATION_FAILED;
}
return KM_ERROR_OK;
}