commit 3e7c3504a3f65513a8e776ace02a161e239cd7d4
author Arve Hjønnevåg <arve@android.com> Tue Oct 06 23:31:38 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 06 23:31:38 2020 +0000
tree 29968d60a83275b52fda4cf46e90a53755c3f737
parent 9602e3d31a44797f0ad1386da04f77dd34d052c3
parent fe090a468651ae636fa5abd8759bf6eb4d6c6e72

Merge "trusty: keymaster: set_attestation_key: Change wrapped key"

trusty/keymaster/set_attestation_key/set_attestation_key.cpp

diff --git a/trusty/keymaster/set_attestation_key/set_attestation_key.cpp b/trusty/keymaster/set_attestation_key/set_attestation_key.cpp
index a89a4a8..6f74833 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 @@
                 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 {