diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-04 07:27:36 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-04 07:27:36 +0000 |
| commit | 1bc53fa97b997d4ae2fb92312bd4ae70b3c75693 (patch) | |
| tree | 1619a9cf52bde7f5b66c74693df69e1e848b835d | |
| parent | 3c9f3058ccc5288a664616809a944654916ad0a4 (diff) | |
| parent | 6e2e1afad871394e488b2a145961dd90edb24076 (diff) | |
| download | security-1bc53fa97b997d4ae2fb92312bd4ae70b3c75693.tar.gz | |
Snap for 4698807 from 6e2e1afad871394e488b2a145961dd90edb24076 to pi-release
Change-Id: I7d42e37e967b16cd162933300d2efcdc9ea34bb4
| -rw-r--r-- | keystore/keystore_main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/keystore/keystore_main.cpp b/keystore/keystore_main.cpp index 1ec32dd5..58f07339 100644 --- a/keystore/keystore_main.cpp +++ b/keystore/keystore_main.cpp @@ -122,9 +122,8 @@ void performHmacKeyHandshake(std::initializer_list<const sp<Keymaster>> keymaste CHECK(rc.isOk()) << "Communication error while calling getHmacSharingParameters on" " Keymaster with index: " << index; - CHECK(ec == ErrorCode::OK) << "Failed to get HmacSharingParameters from" - " Keymaster with index: " - << index; + CHECK(ec == ErrorCode::OK) << "Failed to get HmacSharingParameters from Keymaster " + << km->halVersion().keymasterName << " at index: " << index; ++index; } hmacSharingParams.resize(index); @@ -160,8 +159,9 @@ KeymasterDevices initializeKeymasters() { auto result = enumerateKeymasterDevices<Keymaster4>(serviceManager.get()); auto softKeymaster = result[SecurityLevel::SOFTWARE]; if (result[SecurityLevel::TRUSTED_ENVIRONMENT]) { - performHmacKeyHandshake( - {result[SecurityLevel::TRUSTED_ENVIRONMENT], result[SecurityLevel::STRONGBOX]}); + // TODO(swillden): Put this back when StrongBox KM works. b/77533310 + // performHmacKeyHandshake( + // {result[SecurityLevel::TRUSTED_ENVIRONMENT], result[SecurityLevel::STRONGBOX]}); } else { result = enumerateKeymasterDevices<Keymaster3>(serviceManager.get()); } |