commit 961cbf022deed5b1cb158893211502b2822d78a2
author Bill Yi <byi@google.com> Wed Feb 17 09:51:17 2016 -0800
committer Bill Yi <byi@google.com> Wed Feb 17 09:51:17 2016 -0800
tree 70615e59cb7491ed4c3f5af7025858924021e402
parent 95ef8d4627e61e3892615b3b08b61f2089e6250e
parent f0217cdbde4334bfe2fad7fa484cfa000241ea08

Merge commit 'f0217cdbde4334bfe2fad7fa484cfa000241ea08' into HEAD

gatekeeper_messages.cpp

diff --git a/gatekeeper_messages.cpp b/gatekeeper_messages.cpp
index c803666..fc76d5e 100644
--- a/gatekeeper_messages.cpp
+++ b/gatekeeper_messages.cpp
@@ -199,6 +199,7 @@
 }
 
 VerifyResponse::VerifyResponse() {
+    request_reenroll = false;
     memset_s(&auth_token, 0, sizeof(auth_token));
 };
 

tests/gatekeeper_device_test.cpp

diff --git a/tests/gatekeeper_device_test.cpp b/tests/gatekeeper_device_test.cpp
index d2283ec..0e7ace6 100644
--- a/tests/gatekeeper_device_test.cpp
+++ b/tests/gatekeeper_device_test.cpp
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include <endian.h>
 #include <gtest/gtest.h>
 #include <hardware/gatekeeper.h>
 #include <gatekeeper/gatekeeper.h> // For password_handle_t
@@ -97,7 +98,7 @@
     hat = reinterpret_cast<hw_auth_token_t *>(auth_token);
 
     ASSERT_EQ(HW_AUTH_TOKEN_VERSION, hat->version);
-    ASSERT_EQ(HW_AUTH_PASSWORD, hat->authenticator_type);
+    ASSERT_EQ(htonl(HW_AUTH_PASSWORD), hat->authenticator_type);
 }
 
 TEST_F(GateKeeperDeviceTest, EnrollAndVerifyTimeout) {
@@ -195,7 +196,7 @@
                 password_payload, password_len, &auth_token, &auth_token_len,
                 &should_reenroll);
         // shoudln't be a timeout
-        ASSERT_LT(0, ret);
+        ASSERT_LT(ret, 0);
     }
 }