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.24; helo=mga09.intel.com; envelope-from=chao.b.zhang@intel.com; receiver=edk2-devel@lists.01.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 C06E32034B430 for ; Wed, 27 Dec 2017 17:47:11 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Dec 2017 17:52:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,468,1508828400"; d="scan'208";a="190279891" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga005.fm.intel.com with ESMTP; 27 Dec 2017 17:52:07 -0800 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 27 Dec 2017 17:52:07 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 27 Dec 2017 17:52:06 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.159]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.93]) with mapi id 14.03.0319.002; Thu, 28 Dec 2017 09:52:05 +0800 From: "Zhang, Chao B" To: "Gao, Liming" , "edk2-devel@lists.01.org" CC: "Long, Qin" Thread-Topic: [edk2] [Patch] SecurityPkg: Convert source file to DOS format Thread-Index: AQHTf3iqh7CIMwoU/UGzgBmbFZZjXKNX/eQw Date: Thu, 28 Dec 2017 01:52:04 +0000 Message-ID: References: <1514423387-5676-1-git-send-email-liming.gao@intel.com> In-Reply-To: <1514423387-5676-1-git-send-email-liming.gao@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYzQ4ODNkY2UtOGVhNC00MDk5LWIyMjAtMDI5MDdkZTc4OWViIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjIuNS4xOCIsIlRydXN0ZWRMYWJlbEhhc2giOiJIcWg3U3BwYlZLQ3JzRmxNZmtmMk1RSDZxSFZScm93UEhcL2c5YWlBN0lva2tZVFwvUW4zTWJXSGkxU3F5M0FFdSsifQ== dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] SecurityPkg: Convert source file to DOS format X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Dec 2017 01:47:12 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Chao Zhang -----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Limi= ng Gao Sent: Thursday, December 28, 2017 9:10 AM To: edk2-devel@lists.01.org Cc: Long, Qin Subject: [edk2] [Patch] SecurityPkg: Convert source file to DOS format Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao Cc: Qin Long --- .../Include/Ppi/FirmwareVolumeInfoPrehashedFV.h | 148 ++++++++++-------= ---- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h b/Secu= rityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h index 80fb783..23a5671 100644 --- a/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h +++ b/SecurityPkg/Include/Ppi/FirmwareVolumeInfoPrehashedFV.h @@ -1,74 +1,74 @@ -/** @file -PPI to describe all hash digests for a given FV - -Copyright (c) 2017, Intel Corporation. All rights reserved.
-This prog= ram and the accompanying materials -are licensed and made available under t= he terms and conditions of the BSD License -which accompanies this distribu= tion. The full text of the license may be found at -http://opensource.org/= licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WIT= HOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ -/** -PPI to describe all hash digests for a given FV - -Copyright (c) 2017, Microsoft Corporation - -All rights reserved. -Redistribution and use in source and binary forms, with or without -modifi= cation, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, = -this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notic= e, -this list of conditions and the following disclaimer in the documentati= on - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS= " AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, TH= E IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO= SE ARE DISCLAIMED. -IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY D= IRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES = (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICE= S; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED= AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR= TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE US= E OF THIS SOFTWARE, EVEN IF -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -**/ - -#ifndef __PEI_FIRMWARE_VOLUME_INFO_PREHASHED_FV_H__ -#define __PEI_FIRMWARE_VOLUME_INFO_PREHASHED_FV_H__ - -#define EDKII_PEI_FIRMWARE_VOLUME_INFO_PREHASHED_FV_PPI_GUID \ - { 0x3ce1e631, 0x7008, 0x477c, { 0xad, 0xa7, 0x5d, 0xcf, 0xc7, 0xc1, 0x49,= 0x4b } } - -// -// HashAlgoId is TPM_ALG_ID in Tpm20.h -// -typedef struct _HASH_INFO { - UINT16 HashAlgoId; - UINT16 HashSize; - //UINT8 Hash[]; -} HASH_INFO; - -// -// This PPI carries prehashsed data for one FV. Platform should ensure 1:= 1 mapping between pre-hashed PPI and corresponding FV. -// The Count field in PPI is followed by Count number of FV hash info entr= ies, which can be extended to PCR and logged to TCG event log directly by T= CG modules. -// TCG module checks TPM required hash algorithms(PcdTpm2HashMask) with ea= ch pre-hased PPIs -// For each pre-hashed PPI -// If PPI carries hash generated by equivalent or larger algorithm set= than TPM required, directly use PPI -// else, drops PPI data and cacluate all hash again -// -typedef struct { - UINT32 FvBase; - UINT32 FvLength; - UINT32 Count; - //HASH_INFO HashInfo[]; -} EDKII_PEI_FIRMWARE_VOLUME_INFO_PREHASHED_FV_PPI; - -extern EFI_GUID gEdkiiPeiFirmwareVolumeInfoPrehashedFvPpiGuid; - -#endif - +/** @file +PPI to describe all hash digests for a given FV + +Copyright (c) 2017, Intel Corporation. All rights reserved.
This=20 +program and the accompanying materials are licensed and made available=20 +under the terms and conditions of the BSD License which accompanies=20 +this distribution. The full text of the license may be found at=20 +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,=20 +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI= ED. + +**/ +/** +PPI to describe all hash digests for a given FV + +Copyright (c) 2017, Microsoft Corporation + +All rights reserved. +Redistribution and use in source and binary forms, with or without=20 +modification, are permitted provided that the following conditions are met= : +1. Redistributions of source code must retain the above copyright=20 +notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright=20 +notice, this list of conditions and the following disclaimer in the=20 +documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS=20 +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED=20 +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR= PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR=20 +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL=20 +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS=20 +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)=20 +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,=20 +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING=20 +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBI= LITY OF SUCH DAMAGE. + +**/ + +#ifndef __PEI_FIRMWARE_VOLUME_INFO_PREHASHED_FV_H__ +#define __PEI_FIRMWARE_VOLUME_INFO_PREHASHED_FV_H__ + +#define EDKII_PEI_FIRMWARE_VOLUME_INFO_PREHASHED_FV_PPI_GUID \ {=20 +0x3ce1e631, 0x7008, 0x477c, { 0xad, 0xa7, 0x5d, 0xcf, 0xc7, 0xc1, 0x49,=20 +0x4b } } + +// +// HashAlgoId is TPM_ALG_ID in Tpm20.h +// +typedef struct _HASH_INFO { + UINT16 HashAlgoId; + UINT16 HashSize; + //UINT8 Hash[]; +} HASH_INFO; + +// +// This PPI carries prehashsed data for one FV. Platform should ensure 1:= 1 mapping between pre-hashed PPI and corresponding FV. +// The Count field in PPI is followed by Count number of FV hash info entr= ies, which can be extended to PCR and logged to TCG event log directly by T= CG modules. +// TCG module checks TPM required hash algorithms(PcdTpm2HashMask) with ea= ch pre-hased PPIs +// For each pre-hashed PPI +// If PPI carries hash generated by equivalent or larger algorithm set= than TPM required, directly use PPI +// else, drops PPI data and cacluate all hash again +// +typedef struct { + UINT32 FvBase; + UINT32 FvLength; + UINT32 Count; + //HASH_INFO HashInfo[]; +} EDKII_PEI_FIRMWARE_VOLUME_INFO_PREHASHED_FV_PPI; + +extern EFI_GUID gEdkiiPeiFirmwareVolumeInfoPrehashedFvPpiGuid; + +#endif + -- 2.8.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel