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

Commit 9fffecd8 authored by Shawn Willden's avatar Shawn Willden Committed by Automerger Merge Worker
Browse files

Merge "Fixed encoding of device_locked field" into rvc-dev am: ca71a6e8 am: bf5cea77 

Change-Id: Ieed5d4627d7c18b8153fc556e2abdab47a372cab
parents 329a953c bf5cea77

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;