commit c609659a4b469778f523bece9ad0235fcfe6dd91
author Shawn Willden <swillden@google.com> Tue Mar 17 15:53:14 2015 -0600
committer Shawn Willden <swillden@google.com> Mon Mar 23 12:22:43 2015 -0600
tree d3f03d4faee1c1bdc69dd4bbcda0fa50921f7e1f
parent f35e8eea72e61a383bcbcbe204ff5628ae3bd4ac

Update keymaster Makefile to check for signed/unsigned mismatches

Also update unit tests which contained mismatches.  That will have to be
done to get the unit tests building for on-device testing.

Change-Id: I1106b206058b3dac1f6e72ac6a13d88609fa4006

soft_keymaster_device.cpp

diff --git a/soft_keymaster_device.cpp b/soft_keymaster_device.cpp
index 0aa9457..3ddce33 100644
--- a/soft_keymaster_device.cpp
+++ b/soft_keymaster_device.cpp
@@ -67,7 +67,7 @@
     assert(reinterpret_cast<keymaster_device*>(this) == &device_);
     assert(reinterpret_cast<hw_device_t*>(this) == &(device_.common));
 #endif
-    LOG_I("Creating device");
+    LOG_I("Creating device", 0);
     LOG_D("Device address: %p", this);
 
     memset(&device_, 0, sizeof(device_));
@@ -218,7 +218,7 @@
 int SoftKeymasterDevice::import_keypair(const keymaster1_device_t* dev, const uint8_t* key,
                                         const size_t key_length, uint8_t** key_blob,
                                         size_t* key_blob_length) {
-    LOG_D("Device received import_keypair");
+    LOG_D("Device received import_keypair", 0);
 
     if (!dev || !key)
         return KM_ERROR_UNEXPECTED_NULL_POINTER;
@@ -254,7 +254,7 @@
 int SoftKeymasterDevice::get_keypair_public(const struct keymaster1_device* dev,
                                             const uint8_t* key_blob, const size_t key_blob_length,
                                             uint8_t** x509_data, size_t* x509_data_length) {
-    LOG_D("Device received get_keypair_public");
+    LOG_D("Device received get_keypair_public", 0);
 
     if (!dev || !key_blob)
         return KM_ERROR_UNEXPECTED_NULL_POINTER;
@@ -288,7 +288,7 @@
                                    const uint8_t* key_blob, const size_t key_blob_length,
                                    const uint8_t* data, const size_t data_length,
                                    uint8_t** signed_data, size_t* signed_data_length) {
-    LOG_D("Device received sign_data");
+    LOG_D("Device received sign_data", 0);
 
     if (!dev || !params || !key_blob)
         return KM_ERROR_UNEXPECTED_NULL_POINTER;
@@ -346,7 +346,7 @@
                                      const uint8_t* key_blob, const size_t key_blob_length,
                                      const uint8_t* signed_data, const size_t signed_data_length,
                                      const uint8_t* signature, const size_t signature_length) {
-    LOG_D("Device received verify_data");
+    LOG_D("Device received verify_data", 0);
 
     if (!dev || !params || !key_blob || !signed_data || !signature)
         return KM_ERROR_UNEXPECTED_NULL_POINTER;