commit 567a4a04f43d35b785d50508e6459b01f2ab4d14
author Shawn Willden <swillden@google.com> Wed Dec 31 12:14:46 2014 -0700
committer Shawn Willden <swillden@google.com> Wed Mar 04 13:22:15 2015 -0700
tree 215bc12078d545398b7d58f07b6c6409a98cde4e
parent 04b3b1ea3af7a9f19d51b8685aa683c08753e23c

Switch to using global logger

Change-Id: I7af02342320a9a431cd9845baaf5dbcf61d460c2

google_keymaster_test.cpp

diff --git a/google_keymaster_test.cpp b/google_keymaster_test.cpp
index 04b50e8..c832235 100644
--- a/google_keymaster_test.cpp
+++ b/google_keymaster_test.cpp
@@ -163,12 +163,12 @@
     AuthorizationSet set;
 };
 
+StdoutLogger logger;
+
 const uint64_t OP_HANDLE_SENTINEL = 0xFFFFFFFFFFFFFFFF;
 class KeymasterTest : public testing::Test {
   protected:
-    KeymasterTest()
-        : device_(new StdoutLogger), out_params_(NULL), op_handle_(OP_HANDLE_SENTINEL),
-          characteristics_(NULL) {
+    KeymasterTest() : out_params_(NULL), op_handle_(OP_HANDLE_SENTINEL), characteristics_(NULL) {
         blob_.key_material = NULL;
         RAND_seed("foobar", 6);
         blob_.key_material = 0;
@@ -672,7 +672,7 @@
 }
 
 TEST_F(SigningOperationsTest, RsaUnsupportedDigest) {
-    GenerateKey(ParamBuilder().RsaSigningKey(256, KM_DIGEST_SHA_2_256, KM_PAD_NONE));
+    GenerateKey(ParamBuilder().RsaSigningKey(256, KM_DIGEST_MD5, KM_PAD_NONE));
     ASSERT_EQ(KM_ERROR_UNSUPPORTED_DIGEST, BeginOperation(KM_PURPOSE_SIGN));
 }