From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=chao.b.zhang@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id DA683210BFF4A for ; Fri, 20 Jul 2018 20:31:39 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Jul 2018 20:31:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,382,1526367600"; d="scan'208";a="76597034" Received: from czhan46-mobl1.ccr.corp.intel.com ([10.249.168.149]) by orsmga002.jf.intel.com with ESMTP; 20 Jul 2018 20:31:37 -0700 From: "Zhang, Chao B" To: edk2-devel@lists.01.org Cc: Long, Qin , Yao, Jiewen Date: Sat, 21 Jul 2018 11:31:31 +0800 Message-Id: <20180721033132.19752-2-chao.b.zhang@intel.com> X-Mailer: git-send-email 2.11.0.windows.1 In-Reply-To: <20180721033132.19752-1-chao.b.zhang@intel.com> References: <20180721033132.19752-1-chao.b.zhang@intel.com> Subject: [Patch 1/2] MdeModulePkg: Variable: Re-prioritize TCG/TCG2 protocol X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jul 2018 03:31:40 -0000 TPM1.2 is obsoleted by TPM2.0. switch TCG/TCG2 protocol check to apply this trend Cc: Long, Qin Cc: Yao, Jiewen Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Zhang, Chao B --- MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c index c26616ecfe..28aa2893c6 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/TcgMorLockSmm.c @@ -2,11 +2,11 @@ TCG MOR (Memory Overwrite Request) Lock Control support (SMM version). This module initilizes MemoryOverwriteRequestControlLock variable. This module adds Variable Hook and check MemoryOverwriteRequestControlLock. -Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php @@ -457,18 +457,18 @@ MorLockInitAtEndOfDxe ( // does not produce it. Whether this is the case (from the last OS boot) // can be deduced from the absence of the TCG / TCG2 protocols, as edk2's // MOR implementation depends on (one of) those protocols. // TcgStatus = gBS->LocateProtocol ( - &gEfiTcgProtocolGuid, - NULL, // Registration + &gEfiTcg2ProtocolGuid, + NULL, // Registration &TcgInterface ); if (EFI_ERROR (TcgStatus)) { TcgStatus = gBS->LocateProtocol ( - &gEfiTcg2ProtocolGuid, - NULL, // Registration + &gEfiTcgProtocolGuid, + NULL, // Registration &TcgInterface ); } if (!EFI_ERROR (TcgStatus)) { -- 2.16.2.windows.1