commit 9c8612c88dc03dc52d85e7a482453e04e7e3e2a2
author Chad Brubaker <cbrubaker@google.com> Mon Feb 09 11:32:54 2015 -0800
committer Chad Brubaker <cbrubaker@google.com> Mon Mar 09 16:04:59 2015 -0700
tree 4adddd7ac6c93e1871210b808bac64a67cd8cf0a
parent 1b0fbce97776d481ea0ccfee26708d1d26755259

Implement keymaster 1.0 add_rng_entropy

Change-Id: Ib027930049dec289b62e45eaa6cad32c03d9556c

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index da3ffab..4c139bc 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -2432,8 +2432,25 @@
         return ::SYSTEM_ERROR;
     }
 
-    int32_t addRngEntropy(const uint8_t* /*data*/, size_t /*dataLength*/) {
-        return KM_ERROR_UNIMPLEMENTED;
+    int32_t addRngEntropy(const uint8_t* data, size_t dataLength) {
+        const keymaster1_device_t* device = mKeyStore->getDevice();
+        const keymaster1_device_t* fallback = mKeyStore->getFallbackDevice();
+        int32_t devResult = KM_ERROR_UNIMPLEMENTED;
+        int32_t fallbackResult = KM_ERROR_UNIMPLEMENTED;
+        if (device->common.module->module_api_version >= KEYMASTER_MODULE_API_VERSION_1_0 &&
+                device->add_rng_entropy != NULL) {
+            devResult = device->add_rng_entropy(device, data, dataLength);
+        }
+        if (fallback->add_rng_entropy) {
+            fallbackResult = fallback->add_rng_entropy(fallback, data, dataLength);
+        }
+        if (devResult) {
+            return devResult;
+        }
+        if (fallbackResult) {
+            return fallbackResult;
+        }
+        return ::NO_ERROR;
     }
 
     int32_t generateKey(const String16& /*name*/, const KeymasterArguments& /*params*/,