diff options
author | Bartosz Fabianowski <bartfab@google.com> | 2017-03-20 14:02:32 +0100 |
---|---|---|
committer | Bartosz Fabianowski <bartfab@google.com> | 2017-03-20 14:02:36 +0100 |
commit | 634a1aac20ab5970e731c41010520260e7a66c3c (patch) | |
tree | 70d96b14f4d802745a7a12f5353cb2888ab3b1fa /keystore/legacy_keymaster_device_wrapper.cpp | |
parent | 7675c9f2c7b62f5a127fd06af83223482ff9b594 (diff) | |
download | security-634a1aac20ab5970e731c41010520260e7a66c3c.tar.gz |
Add manufacturer and model to device ID attestation
Discussions have shown that in addition to brand, device and product,
we should also allow devices to attest their manufacturer and model.
Bug: 36433192
Test: GTS com.google.android.gts.security.DeviceIdAttestationHostTest
Change-Id: I28ee51d9f95c3e4efb8932f3c9b899082eb62e55
Diffstat (limited to 'keystore/legacy_keymaster_device_wrapper.cpp')
-rw-r--r-- | keystore/legacy_keymaster_device_wrapper.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/keystore/legacy_keymaster_device_wrapper.cpp b/keystore/legacy_keymaster_device_wrapper.cpp index 440eb506..c57bfed3 100644 --- a/keystore/legacy_keymaster_device_wrapper.cpp +++ b/keystore/legacy_keymaster_device_wrapper.cpp @@ -356,6 +356,8 @@ Return<void> LegacyKeymasterDeviceWrapper::attestKey(const hidl_vec<uint8_t>& ke case Tag::ATTESTATION_ID_SERIAL: case Tag::ATTESTATION_ID_IMEI: case Tag::ATTESTATION_ID_MEID: + case Tag::ATTESTATION_ID_MANUFACTURER: + case Tag::ATTESTATION_ID_MODEL: // Device id attestation may only be supported if the device is able to permanently // destroy its knowledge of the ids. This device is unable to do this, so it must // never perform any device id attestation. |