commit f6eada7e37b75bf208224db2f80de6dd29152e68
author Chih-hung Hsieh <chh@google.com> Sat Feb 26 01:36:24 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 26 01:36:24 2022 +0000
tree f2c1823410cee927ddb53fdaba4c4731fcb02706
parent 5c4f570ba4616c7c9a8e1a4a506eb8ec3d83d37b
parent adb67ec6ba2b3012707ab2990571554f75451f16

Merge "Add timed out test files to tidy_timeout_srcs"

ng/AndroidKeyMintDevice.cpp

diff --git a/ng/AndroidKeyMintDevice.cpp b/ng/AndroidKeyMintDevice.cpp
index 9b5f76f..08a1036 100644
--- a/ng/AndroidKeyMintDevice.cpp
+++ b/ng/AndroidKeyMintDevice.cpp
@@ -471,6 +471,19 @@
     return ScopedAStatus::ok();
 }
 
+ScopedAStatus AndroidKeyMintDevice::getRootOfTrustChallenge(array<uint8_t, 16>* /* challenge */) {
+    return kmError2ScopedAStatus(KM_ERROR_UNIMPLEMENTED);
+}
+
+ScopedAStatus AndroidKeyMintDevice::getRootOfTrust(const array<uint8_t, 16>& /* challenge */,
+                                                   vector<uint8_t>* /* rootOfTrust */) {
+    return kmError2ScopedAStatus(KM_ERROR_UNIMPLEMENTED);
+}
+
+ScopedAStatus AndroidKeyMintDevice::sendRootOfTrust(const vector<uint8_t>& /* rootOfTrust */) {
+    return kmError2ScopedAStatus(KM_ERROR_UNIMPLEMENTED);
+}
+
 IKeyMintDevice* CreateKeyMintDevice(SecurityLevel securityLevel) {
     return ::new AndroidKeyMintDevice(securityLevel);
 }

ng/include/AndroidKeyMintDevice.h

diff --git a/ng/include/AndroidKeyMintDevice.h b/ng/include/AndroidKeyMintDevice.h
index e4ea976..b1b27cb 100644
--- a/ng/include/AndroidKeyMintDevice.h
+++ b/ng/include/AndroidKeyMintDevice.h
@@ -26,6 +26,7 @@
 
 namespace aidl::android::hardware::security::keymint {
 using ::ndk::ScopedAStatus;
+using std::array;
 using std::optional;
 using std::shared_ptr;
 using std::vector;
@@ -73,13 +74,18 @@
                                const optional<TimeStampToken>& timestampToken) override;
     ScopedAStatus earlyBootEnded() override;
 
-    ScopedAStatus convertStorageKeyToEphemeral(const std::vector<uint8_t>& storageKeyBlob,
-                                               std::vector<uint8_t>* ephemeralKeyBlob) override;
+    ScopedAStatus convertStorageKeyToEphemeral(const vector<uint8_t>& storageKeyBlob,
+                                               vector<uint8_t>* ephemeralKeyBlob) override;
 
-    ScopedAStatus
-    getKeyCharacteristics(const std::vector<uint8_t>& keyBlob, const std::vector<uint8_t>& appId,
-                          const std::vector<uint8_t>& appData,
-                          std::vector<KeyCharacteristics>* keyCharacteristics) override;
+    ScopedAStatus getKeyCharacteristics(const vector<uint8_t>& keyBlob,
+                                        const vector<uint8_t>& appId,
+                                        const vector<uint8_t>& appData,
+                                        vector<KeyCharacteristics>* keyCharacteristics) override;
+
+    ScopedAStatus getRootOfTrustChallenge(array<uint8_t, 16>* challenge) override;
+    ScopedAStatus getRootOfTrust(const array<uint8_t, 16>& challenge,
+                                 vector<uint8_t>* rootOfTrust) override;
+    ScopedAStatus sendRootOfTrust(const vector<uint8_t>& rootOfTrust) override;
 
     shared_ptr<::keymaster::AndroidKeymaster>& getKeymasterImpl() { return impl_; }