commit ed38afb42a3cb3895635ba19250d5607a0a176c0
author Pat Erley <perley@chromium.org> Mon Mar 19 13:34:42 2018
committer Pat Erley <perley@chromium.org> Fri Jun 15 17:13:10 2018
tree b1e3b021d3381a9ffea5380422b58f40efa3d6fe
parent b0cd4d0fb68dbf28427f8f3d5d9c81edacfc177a

attestation: Fix mis-merge of 917324d9d0

917324d9d0 was merged out of order, leading to the restoration
of this check, which leads to failure in verify_endorsement.  Fix
this up by removing the block.

BUG=b:110177906
TEST=Built and Deployed, run tpm-manager verify_endorsement
Change-Id: I966d0ef87908b19df28c51a0ff5dfd84e7e9a988

attestation/common/tpm_utility_v2.cc

diff --git a/attestation/common/tpm_utility_v2.cc b/attestation/common/tpm_utility_v2.cc
index 74f8df4..7131ff6 100644
--- a/attestation/common/tpm_utility_v2.cc
+++ b/attestation/common/tpm_utility_v2.cc
@@ -484,11 +484,6 @@
 
 bool TpmUtilityV2::GetEndorsementPublicKey(KeyType key_type,
                                            std::string* public_key) {
-  if (key_type == KEY_TYPE_RSA) {
-    return trunks_utility_->GetPublicRSAEndorsementKeyModulus(public_key) ==
-           TPM_RC_SUCCESS;
-  }
-
   TPM_HANDLE key_handle;
   if (!GetEndorsementKey(key_type, &key_handle)) {
     LOG(ERROR) << __func__ << ": EK not available.";