From fe090a468651ae636fa5abd8759bf6eb4d6c6e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= Date: Fri, 2 Oct 2020 16:55:16 -0700 Subject: [PATCH] trusty: keymaster: set_attestation_key: Change wrapped key Remove WrappedPrivateKey and select wrapped vs plaintext key command based on format instead. Bug: 154033394 Test: send wrapped test key. Not yet accepted by trusty Change-Id: I3b0a29be78f2a8e84ebd990713f66788256d8e3f --- .../set_attestation_key/set_attestation_key.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/trusty/keymaster/set_attestation_key/set_attestation_key.cpp b/trusty/keymaster/set_attestation_key/set_attestation_key.cpp index a89a4a87c..6f74833f6 100644 --- a/trusty/keymaster/set_attestation_key/set_attestation_key.cpp +++ b/trusty/keymaster/set_attestation_key/set_attestation_key.cpp @@ -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 {