commit 0b885c10323743e86f9dc620e443bf53c77b47cd
author Tucker Sylvestro <tuckeris@google.com> Thu Oct 06 14:40:53 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 06 14:40:53 2016 +0000
tree 5395e42ad6088a6adfe1e86fb16ed90a3d52e8f2
parent 9dd99334afb00db98f23feb854c4d72721723656
parent 8f1436275ad7cb279dd8c3343b575c03cd8b8601

Treat all tags as unsigned when comparing them am: 28a872eb79
am: 8f1436275a

Change-Id: I2b3f571ed02470ab6b1e46f7d239fbd767c68225

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index fdd7a4e..323b7dd 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -522,7 +522,7 @@
 
 #define KEYMASTER_SIMPLE_COMPARE(a, b) (a < b) ? -1 : ((a > b) ? 1 : 0)
 inline int keymaster_param_compare(const keymaster_key_param_t* a, const keymaster_key_param_t* b) {
-    int retval = KEYMASTER_SIMPLE_COMPARE(a->tag, b->tag);
+    int retval = KEYMASTER_SIMPLE_COMPARE((uint32_t)a->tag, (uint32_t)b->tag);
     if (retval != 0)
         return retval;