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

Commit d634e42b 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 

Change-Id: I0e7eff3c575163f39f99d874ebe2e1fc833a685b
parents 3dd4aac0 ca71a6e8

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;