| commit | 994c65e5bc90822f18a185502a6d553c06bdaa6b | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Wed Apr 01 13:54:33 2020 -0600 |
| committer | Shawn Willden <swillden@google.com> | Thu Apr 09 15:44:36 2020 -0600 |
| tree | 898f0d00e188e2f6adc75a9125325a2378489da7 | |
| parent | 15664d3f58148f8ccc39a40b9286330892bd5c4c [diff] |
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
diff --git a/keymaster/3.0/vts/functional/attestation_record.cpp b/keymaster/3.0/vts/functional/attestation_record.cpp index a428989..bde4b57 100644 --- a/keymaster/3.0/vts/functional/attestation_record.cpp +++ b/keymaster/3.0/vts/functional/attestation_record.cpp
@@ -46,7 +46,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; } KM_ROOT_OF_TRUST;
diff --git a/keymaster/4.0/support/attestation_record.cpp b/keymaster/4.0/support/attestation_record.cpp index 27e00c1..bc294bd 100644 --- a/keymaster/4.0/support/attestation_record.cpp +++ b/keymaster/4.0/support/attestation_record.cpp
@@ -50,7 +50,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;
diff --git a/keymaster/4.1/support/attestation_record.cpp b/keymaster/4.1/support/attestation_record.cpp index 9eab1db..63bf854 100644 --- a/keymaster/4.1/support/attestation_record.cpp +++ b/keymaster/4.1/support/attestation_record.cpp
@@ -58,7 +58,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;