diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-03 15:39:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-03 15:39:08 +0000 |
| commit | 3d85d69171a46d22c4f99dd601f1811a1ebf2aa3 (patch) | |
| tree | a74350c0d91553a867a757fc4920962c0e568655 | |
| parent | c3939fc3d2bbb6210f67e5f41513a60762b6447f (diff) | |
| parent | 8ccabc9a5cb34f8d09f252bd271c3de6e6fb0a1b (diff) | |
| download | keymaster-android11-mainline-permission-release.tar.gz | |
Merge "Adding GetVerifiedBootParams to soft keymaster context" into rvc-devandroid-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-dev
| -rw-r--r-- | contexts/soft_keymaster_context.cpp | 12 | ||||
| -rw-r--r-- | include/keymaster/contexts/soft_keymaster_context.h | 9 |
2 files changed, 21 insertions, 0 deletions
diff --git a/contexts/soft_keymaster_context.cpp b/contexts/soft_keymaster_context.cpp index 6c23fa4..5003c72 100644 --- a/contexts/soft_keymaster_context.cpp +++ b/contexts/soft_keymaster_context.cpp @@ -476,4 +476,16 @@ keymaster_error_t SoftKeymasterContext::UnwrapKey(const KeymasterKeyBlob&, const return KM_ERROR_UNIMPLEMENTED; } +keymaster_error_t SoftKeymasterContext::GetVerifiedBootParams( + keymaster_blob_t* verified_boot_key, keymaster_blob_t* verified_boot_hash, + keymaster_verified_boot_t* verified_boot_state, bool* device_locked) const { + // TODO(swillden): See if there might be some sort of vbmeta data in goldfish/cuttlefish. + static std::string fake_vb_key(32, 0); + *verified_boot_key = {reinterpret_cast<uint8_t*>(fake_vb_key.data()), fake_vb_key.size()}; + *verified_boot_hash = {reinterpret_cast<uint8_t*>(fake_vb_key.data()), fake_vb_key.size()}; + *verified_boot_state = KM_VERIFIED_BOOT_UNVERIFIED; + *device_locked = false; + return KM_ERROR_OK; +} + } // namespace keymaster diff --git a/include/keymaster/contexts/soft_keymaster_context.h b/include/keymaster/contexts/soft_keymaster_context.h index 588e3db..20a10ac 100644 --- a/include/keymaster/contexts/soft_keymaster_context.h +++ b/include/keymaster/contexts/soft_keymaster_context.h @@ -104,6 +104,15 @@ class SoftKeymasterContext: public KeymasterContext, SoftwareKeyBlobMaker, Softw AuthorizationSet* sw_enforced) const override; /*********************************************************************************************/ + /********************************************************************************************* + * Implement AttestationRecordContext + */ + + keymaster_error_t GetVerifiedBootParams(keymaster_blob_t* verified_boot_key, + keymaster_blob_t* verified_boot_hash, + keymaster_verified_boot_t* verified_boot_state, + bool* device_locked) const override; + private: keymaster_error_t ParseKeymaster1HwBlob(const KeymasterKeyBlob& blob, const AuthorizationSet& additional_params, |