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

Commit 994c65e5 authored by Shawn Willden's avatar Shawn Willden
Browse files

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
parent 15664d3f

keymaster/3.0/vts/functional/attestation_record.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

keymaster/4.0/support/attestation_record.cpp

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,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;

    ASN1_OCTET_STRING* verified_boot_hash;

} KM_ROOT_OF_TRUST;

keymaster/4.1/support/attestation_record.cpp

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,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;

    ASN1_OCTET_STRING* verified_boot_hash;

} KM_ROOT_OF_TRUST;