commit f01329d8692edde9a9ffb88f29f5d684eab481e2
author Shawn Willden <swillden@google.com> Wed Mar 11 21:51:38 2015 -0600
committer Shawn Willden <swillden@google.com> Mon Mar 23 11:22:41 2015 -0600
tree 5c3a46de07e0286d3a307a7d0ab9d6715d020ce1
parent 2399df41360717017e06928c5d3f5857c94bb08c

Improve error reporting and logging.

Bug: 19603049
Bug: 19509317
Change-Id: I041c973802e6c567adc5b1f280fc5bac27ba28d6

symmetric_key.cpp

diff --git a/symmetric_key.cpp b/symmetric_key.cpp
index 680c08a..8b84dd7 100644
--- a/symmetric_key.cpp
+++ b/symmetric_key.cpp
@@ -60,6 +60,8 @@
     }
 
     if (key->key_data_size_ != key_material_length) {
+        LOG_E("Expected %d byte key data but got %d bytes", key->key_data_size_,
+              key_material_length);
         *error = KM_ERROR_INVALID_KEY_BLOB;
         return NULL;
     }
@@ -92,6 +94,7 @@
     *error = key->set_size(key_size_bits / 8);
     if (*error != KM_ERROR_OK)
         return NULL;
+
     return key.release();
 }