commit 8d0cddc68b355c3ab42eff83ffd06f665d3a1050
author Shawn Willden <swillden@google.com> Fri Apr 10 16:30:39 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 10 16:30:39 2020 +0000
tree 95576e3b61873f32a0b0a060bc7179fbcd8eaafb
parent d440aacd0dfc0afa5807bf7bc6dff9a51df9508a
parent 76ce61d4ce41361d4f152545af644aea89133550

Fixed encoding of device_locked field am: 76ce61d4ce

Change-Id: I60b624ba496a7c01c9d12d9ab29c28a5a2e187ab

include/keymaster/attestation_record.h

diff --git a/include/keymaster/attestation_record.h b/include/keymaster/attestation_record.h
index 2a6f24b..17a6429 100644
--- a/include/keymaster/attestation_record.h
+++ b/include/keymaster/attestation_record.h
@@ -43,7 +43,7 @@
 
 typedef struct km_root_of_trust {
     ASN1_OCTET_STRING* verified_boot_key;
-    ASN1_BOOLEAN* device_locked;
+    ASN1_BOOLEAN device_locked;
     ASN1_ENUMERATED* verified_boot_state;
     ASN1_OCTET_STRING* verified_boot_hash;
 } KM_ROOT_OF_TRUST;

km_openssl/attestation_record.cpp

diff --git a/km_openssl/attestation_record.cpp b/km_openssl/attestation_record.cpp
index d1a920b..4f70138 100644
--- a/km_openssl/attestation_record.cpp
+++ b/km_openssl/attestation_record.cpp
@@ -417,8 +417,7 @@
         return TranslateLastOpenSslError();
     }
 
-    root_of_trust->device_locked = reinterpret_cast<int*>(malloc(sizeof(ASN1_BOOLEAN)));
-    *root_of_trust->device_locked = device_locked;
+    root_of_trust->device_locked = device_locked ? 0xFF : 0x00;
     if (!ASN1_ENUMERATED_set(root_of_trust->verified_boot_state, verified_boot_state)) {
         return TranslateLastOpenSslError();
     }