Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 397e40b1 authored by Arve Hjønnevåg's avatar Arve Hjønnevåg Committed by Automerger Merge Worker
Browse files

Merge "trusty: keymaster: set_attestation_key: Change wrapped key" am: 3e7c3504 

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

Change-Id: I44fd518b31ede08ebf01628d2252dd11c0bc57d7
parents 8c42a18c 3e7c3504

trusty/keymaster/set_attestation_key/set_attestation_key.cpp

+8 −3
Original line number Diff line number Diff line
@@ -292,9 +292,14 @@ static int process_xml(xmlTextReaderPtr xml) { 
                value = xmlTextReaderConstValue(xml);

                uint32_t cmd;

                if (xmlStrEqual(element, BAD_CAST "PrivateKey")) {

                    if (xmlStrEqual(element_format, BAD_CAST "pem")) {

                        cmd = KM_SET_ATTESTATION_KEY;

                } else if (xmlStrEqual(element, BAD_CAST "WrappedPrivateKey")) {

                    } 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 {