commit ff87778377fdf3f2fae62fdb09f21b82fa0ed98e
author Darren Krahn <dkrahn@chromium.org> Thu Mar 12 00:35:24 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Thu Mar 12 22:06:29 2015 +0000
tree 09dbfe6b98783e4bf6909369bf3e4aee75a755ee
parent 1ef82e4a52abc91d0e8db12500c2da0d8c21f62c

trunks: Fix authorization session tests.

BUG=None
TEST=unit
CQ-DEPEND=CL:255241

Change-Id: I0af0250fee0bbc10f71640b5e3c6b30648c9b433
Reviewed-on: https://chromium-review.googlesource.com/259551
Reviewed-by: Utkarsh Sanghi <usanghi@chromium.org>
Commit-Queue: Darren Krahn <dkrahn@chromium.org>
Tested-by: Darren Krahn <dkrahn@chromium.org>

authorization_session_test.cc

diff --git a/authorization_session_test.cc b/authorization_session_test.cc
index 62ef994..3b8ee56 100644
--- a/authorization_session_test.cc
+++ b/authorization_session_test.cc
@@ -5,6 +5,7 @@
 #include "trunks/authorization_session_impl.h"
 
 #include <base/logging.h>
+#include <base/strings/string_number_conversions.h>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
@@ -36,6 +37,25 @@
     return &(session->hmac_delegate_);
   }
 
+  TPM2B_PUBLIC_KEY_RSA GetValidRSAPublicKey() {
+    const char kValidModulus[] =
+        "A1D50D088994000492B5F3ED8A9C5FC8772706219F4C063B2F6A8C6B74D3AD6B"
+        "212A53D01DABB34A6261288540D420D3BA59ED279D859DE6227A7AB6BD88FADD"
+        "FC3078D465F4DF97E03A52A587BD0165AE3B180FE7B255B7BEDC1BE81CB1383F"
+        "E9E46F9312B1EF28F4025E7D332E33F4416525FEB8F0FC7B815E8FBB79CDABE6"
+        "327B5A155FEF13F559A7086CB8A543D72AD6ECAEE2E704FF28824149D7F4E393"
+        "D3C74E721ACA97F7ADBE2CCF7B4BCC165F7380F48065F2C8370F25F066091259"
+        "D14EA362BAF236E3CD8771A94BDEDA3900577143A238AB92B6C55F11DEFAFB31"
+        "7D1DC5B6AE210C52B008D87F2A7BFF6EB5C4FB32D6ECEC6505796173951A3167";
+    std::vector<uint8> bytes;
+    CHECK(base::HexStringToBytes(kValidModulus, &bytes));
+    CHECK_EQ(bytes.size(), 256u);
+    TPM2B_PUBLIC_KEY_RSA rsa;
+    rsa.size = bytes.size();
+    memcpy(rsa.buffer, bytes.data(), bytes.size());
+    return rsa;
+  }
+
  protected:
   TrunksFactoryForTest factory_;
   NiceMock<MockTpm> mock_tpm_;
@@ -44,8 +64,7 @@
 TEST_F(AuthorizationSessionTest, StartUnboundSuccess) {
   AuthorizationSessionImpl session(factory_);
   TPM2B_PUBLIC public_data;
-  public_data.public_area.unique.rsa.size = 256;
-  public_data.public_area.unique.rsa.buffer[0] = 1;
+  public_data.public_area.unique.rsa = GetValidRSAPublicKey();
   EXPECT_CALL(mock_tpm_, ReadPublicSync(kSaltingKey, _, _, _, _, NULL))
       .WillOnce(DoAll(SetArgPointee<2>(public_data),
                       Return(TPM_RC_SUCCESS)));
@@ -77,8 +96,7 @@
 TEST_F(AuthorizationSessionTest, StartUnboundFail) {
   AuthorizationSessionImpl session(factory_);
   TPM2B_PUBLIC public_data;
-  public_data.public_area.unique.rsa.size = 256;
-  public_data.public_area.unique.rsa.buffer[0] = 1;
+  public_data.public_area.unique.rsa = GetValidRSAPublicKey();
   EXPECT_CALL(mock_tpm_, ReadPublicSync(kSaltingKey, _, _, _, _, NULL))
       .WillOnce(DoAll(SetArgPointee<2>(public_data),
                       Return(TPM_RC_SUCCESS)));
@@ -92,8 +110,7 @@
 TEST_F(AuthorizationSessionTest, StartUnboundWithBadNonce) {
   AuthorizationSessionImpl session(factory_);
   TPM2B_PUBLIC public_data;
-  public_data.public_area.unique.rsa.size = 256;
-  public_data.public_area.unique.rsa.buffer[0] = 1;
+  public_data.public_area.unique.rsa = GetValidRSAPublicKey();
   EXPECT_CALL(mock_tpm_, ReadPublicSync(kSaltingKey, _, _, _, _, NULL))
       .WillOnce(DoAll(SetArgPointee<2>(public_data),
                       Return(TPM_RC_SUCCESS)));
@@ -110,8 +127,7 @@
 TEST_F(AuthorizationSessionTest, StartBoundSuccess) {
   AuthorizationSessionImpl session(factory_);
   TPM2B_PUBLIC public_data;
-  public_data.public_area.unique.rsa.size = 256;
-  public_data.public_area.unique.rsa.buffer[0] = 1;
+  public_data.public_area.unique.rsa = GetValidRSAPublicKey();
   EXPECT_CALL(mock_tpm_, ReadPublicSync(kSaltingKey, _, _, _, _, NULL))
       .WillOnce(DoAll(SetArgPointee<2>(public_data),
                       Return(TPM_RC_SUCCESS)));