diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-24 06:03:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-06-24 06:03:14 +0000 |
| commit | 4d20aba79cc1c2b37a9e69f6208eab76a222071b (patch) | |
| tree | c1929818944d15845ba195d8f15e9c78ac220b6f | |
| parent | 9d2cfdd61caf08989c8ef6c20e2993a5392744cb (diff) | |
| parent | a59d9ca8a380e67b032f69eaf70a8e0e3ace30dc (diff) | |
| download | keymaster-4d20aba79cc1c2b37a9e69f6208eab76a222071b.tar.gz | |
Merge "Don't construct the RP context for KM <= 4.1" into sc-dev
| -rw-r--r-- | contexts/pure_soft_keymaster_context.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contexts/pure_soft_keymaster_context.cpp b/contexts/pure_soft_keymaster_context.cpp index 18f4c93..c04475e 100644 --- a/contexts/pure_soft_keymaster_context.cpp +++ b/contexts/pure_soft_keymaster_context.cpp @@ -66,7 +66,10 @@ PureSoftKeymasterContext::PureSoftKeymasterContext(KmVersion version, if (security_level != KM_SECURITY_LEVEL_SOFTWARE) { pure_soft_secure_key_storage_ = std::make_unique<PureSoftSecureKeyStorage>(64); } - pure_soft_remote_provisioning_context_ = std::make_unique<PureSoftRemoteProvisioningContext>(); + if (version >= KmVersion::KEYMINT_1) { + pure_soft_remote_provisioning_context_ = + std::make_unique<PureSoftRemoteProvisioningContext>(); + } } PureSoftKeymasterContext::~PureSoftKeymasterContext() {} |