ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "trusty: keymaster: set_attestation_key: Change wrapped key" am: 3e7c3504a3 am: 397e40b158

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1446633

Change-Id: Id105ddfa71ada179b458c2e200e1de4439057cb7
This commit is contained in:
Arve Hjønnevåg 2020-10-07 00:08:34 +00:00 • committed by Automerger Merge Worker
commit 89fe40b5c0
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
trusty/keymaster/set_attestation_key/set_attestation_key.cpp
View file

@ -292,9 +292,14 @@ static int process_xml(xmlTextReaderPtr xml) {
value = xmlTextReaderConstValue(xml);
uint32_t cmd;
if (xmlStrEqual(element, BAD_CAST "PrivateKey")) {
cmd = KM_SET_ATTESTATION_KEY;
} else if (xmlStrEqual(element, BAD_CAST "WrappedPrivateKey")) {
cmd = KM_SET_WRAPPED_ATTESTATION_KEY;
if (xmlStrEqual(element_format, BAD_CAST "pem")) {
cmd = KM_SET_ATTESTATION_KEY;
} else if (xmlStrEqual(element_format, BAD_CAST "iecs")) {
cmd = KM_SET_WRAPPED_ATTESTATION_KEY;
} else {
printf("unsupported key format: %s\n", element_format);
return -1;
}
} else if (xmlStrEqual(element, BAD_CAST "Certificate")) {
cmd = KM_APPEND_ATTESTATION_CERT_CHAIN;
} else {