commit da1773c3ce490d4b8e8c0584fbeee506c4debffe
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 14 13:00:59 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 14 13:01:00 2017 +0000
tree 3d977eef7269df2d3b5843ad05c9e806b22f6126
parent 0b77fdaa7c18ef42804175f1140cdea7e4f64529
parent 50624e995d07b8fa214f8e0885696445df470018

Merge "Have generateKey() treat additional entropy as optional"

keymaster/3.0/default/KeymasterDevice.cpp

diff --git a/keymaster/3.0/default/KeymasterDevice.cpp b/keymaster/3.0/default/KeymasterDevice.cpp
index 563ff84..24cf53a 100644
--- a/keymaster/3.0/default/KeymasterDevice.cpp
+++ b/keymaster/3.0/default/KeymasterDevice.cpp
@@ -375,6 +375,7 @@
 }
 
 Return<ErrorCode> KeymasterDevice::addRngEntropy(const hidl_vec<uint8_t>& data) {
+    if (!data.size()) return ErrorCode::OK;
     return legacy_enum_conversion(
         keymaster_device_->add_rng_entropy(keymaster_device_, &data[0], data.size()));
 }