summaryrefslogtreecommitdiff
path: root/keymaster/3.0
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2020-04-01 13:54:33 -0600
committerShawn Willden <swillden@google.com>2020-04-09 15:44:36 -0600
commit994c65e5bc90822f18a185502a6d553c06bdaa6b (patch)
tree898f0d00e188e2f6adc75a9125325a2378489da7 /keymaster/3.0
parent15664d3f58148f8ccc39a40b9286330892bd5c4c (diff)
downloadinterfaces-994c65e5bc90822f18a185502a6d553c06bdaa6b.tar.gz
Fixed encoding of device_locked field
The attestation code used boringssl's ASN.1 encoding tools incorrectly, causing it to encode incorrect values in device_locked. Bug: b/152503089 Test: Build & boot Merged-In: I3c5352523b2db37d539ad353ac8c48c1585eb08d Change-Id: I3c5352523b2db37d539ad353ac8c48c1585eb08d
Diffstat (limited to 'keymaster/3.0')
-rw-r--r--keymaster/3.0/vts/functional/attestation_record.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/keymaster/3.0/vts/functional/attestation_record.cpp b/keymaster/3.0/vts/functional/attestation_record.cpp
index a428989de2..bde4b57e9b 100644
--- a/keymaster/3.0/vts/functional/attestation_record.cpp
+++ b/keymaster/3.0/vts/functional/attestation_record.cpp
@@ -46,7 +46,7 @@ struct ASN1_TYPE_Delete {
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;
} KM_ROOT_OF_TRUST;