commit c2120744da8d0612ad54484b314f94e1e6e3a167
author Shawn Willden <swillden@google.com> Thu Aug 13 20:49:53 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 13 20:49:53 2015 +0000
tree 1fb0ca7ad10b52be6d6f4bf0ffe781faa698cbaf
parent cbfdeefef7a12fcb383e8b0f840771f6983927aa
parent 55268b5b037a8c3537602b1073ad624455d3672d

Merge "Wrap incomplete keymaster1 implementations with sw keymaster." into mnc-dr-dev

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 413dd5d..0906abf 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -611,12 +611,12 @@
     Blob(const uint8_t* value, size_t valueLength, const uint8_t* info, uint8_t infoLength,
             BlobType type) {
         memset(&mBlob, 0, sizeof(mBlob));
-        if (valueLength > sizeof(mBlob.value)) {
-            valueLength = sizeof(mBlob.value);
+        if (valueLength > VALUE_SIZE) {
+            valueLength = VALUE_SIZE;
             ALOGW("Provided blob length too large");
         }
-        if (infoLength + valueLength > sizeof(mBlob.value)) {
-            infoLength = sizeof(mBlob.value) - valueLength;
+        if (infoLength + valueLength > VALUE_SIZE) {
+            infoLength = VALUE_SIZE - valueLength;
             ALOGW("Provided info length too large");
         }
         mBlob.length = valueLength;