From nobody Thu May 2 07:32:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67932+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67932+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1606280891; cv=none; d=zohomail.com; s=zohoarc; b=ebEY1N1orKbyOsy71AqlKY2UZurHuFWsige/rs5No6eFfi68gCuAxu6oyislEC5Ydqsnyvon7Spdcp7K0QVOtF51S3be6V9khy0aBeCSBYN7yHTLh69ixmsCo1YS83pyrtGyKTwaBMchFB9LK4IdS5q+UTwaLtIdGZSs/KKVfNM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606280891; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=hiiwc95K+nAg7RyWtoAoTq5w4zmz75boZtsZeuQvgmA=; b=gru5O3Aj34l8HWWrm7oF02+eE2DtMolJdG5TD9KwgZWDrPtCMxpamNfv79LbuRseHrkUTmoUYoqKhvT8lThShkFzYft7ZxoJGGBlVzoBrm8LMELL+gSPhLA6lDywqMB1z3tByAXIyABaIaISlRNeOxHnlygrWBdSBvxBeJHSS90= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67932+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1606280891285354.7427253457555; Tue, 24 Nov 2020 21:08:11 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id YWPfYY1788612xoMpv4mq45W; Tue, 24 Nov 2020 21:08:10 -0800 X-Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web08.2756.1606280890399694011 for ; Tue, 24 Nov 2020 21:08:10 -0800 IronPort-SDR: YlREJ0kc9994J73vdUP2ItFQMyPPE+GgylgASLmqduKVD6HEunfOFgtql4MwDemXRdWOvSnCmH KMjbjidBbsCg== X-IronPort-AV: E=McAfee;i="6000,8403,9815"; a="169505953" X-IronPort-AV: E=Sophos;i="5.78,368,1599548400"; d="scan'208";a="169505953" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2020 21:08:09 -0800 IronPort-SDR: lxBKpcs6sqp+MejY11TRM+fX1U+FRYAhcXzL6tcKKDvHq9IEAZW1dppAvMsOxHL9wkZrYs3151 s7nyOOstkLAQ== X-IronPort-AV: E=Sophos;i="5.78,368,1599548400"; d="scan'208";a="332842096" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.212.122.89]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2020 21:08:05 -0800 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Sean Brogan , Bret Barkelew , Liming Gao Subject: [edk2-devel] [Patch v2][edk2-stable202011 1/4] .azurepipelines/templates/pr-gate-steps.yml: Fetch target branch Date: Tue, 24 Nov 2020 21:07:55 -0800 Message-Id: <20201125050758.1507-2-michael.d.kinney@intel.com> In-Reply-To: <20201125050758.1507-1-michael.d.kinney@intel.com> References: <20201125050758.1507-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com X-Gm-Message-State: vuCkbE5ktVZN9pa6kdIIXaBTx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1606280890; bh=sL29LJ9eQbqDF382co+SogP2LRCC86uThFPDlXtqJnc=; h=Cc:Date:From:Reply-To:Subject:To; b=djWK4UfSONewZFbYzLlz9GxKqaHGPw56XvuDAgzA390h6xUiqU2/0hpJUOqzH8OqAEu nQ5SfDJzoVFdAdlKhIlUcEpkMfF7kIkqrnWmC5C+Dqa3+0HggTp4FyOiTDJGIS4rV/QVq bdu/YGixOax/SlDHGw7upI7YS3NugyS+kl0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Sean Brogan Add step to fetch target branch so that PR_EVAL can resolve diff Cc: Bret Barkelew Cc: Michael D Kinney Cc: Liming Gao Signed-off-by: Sean Brogan Reviewed-by: Michael D Kinney --- .azurepipelines/templates/pr-gate-steps.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.azurepipelines/templates/pr-gate-steps.yml b/.azurepipelines/= templates/pr-gate-steps.yml index c1c0c04d6c17..70c19a462194 100644 --- a/.azurepipelines/templates/pr-gate-steps.yml +++ b/.azurepipelines/templates/pr-gate-steps.yml @@ -31,6 +31,12 @@ steps: echo "##vso[task.setvariable variable=3Dpkgs_to_build]${{ parameters.b= uild_pkgs }}" echo "##vso[task.setvariable variable=3Dpkg_count]${{ 1 }}" =20 +# Fetch the target branch so that pr_eval can diff them. +# Seems like azure pipelines/github changed checkout process in nov 2020. +- script: git fetch origin $(System.PullRequest.targetBranch) + displayName: fetch target branch + condition: eq(variables['Build.Reason'], 'PullRequest') + # trim the package list if this is a PR - task: CmdLine@1 displayName: Check if ${{ parameters.build_pkgs }} need testing --=20 2.29.2.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#67932): https://edk2.groups.io/g/devel/message/67932 Mute This Topic: https://groups.io/mt/78494331/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Thu May 2 07:32:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67934+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67934+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1606280892; cv=none; d=zohomail.com; s=zohoarc; b=H1rWDK4H/xeGapUOD8qQCIjKAIuBgY9Xz5mLkW9PBmj5o6aJA822MbuwHZE3ePva/e+frEe8LKK/4N4K527Ml8HLvhRralEyIm24w6FiRAIPP/S69IxEY4fPqobCgyqoztNnG7vhr4mFp6HztnsYHJAWbLpqtISVmlNSWc2o9CI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606280892; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=/q9pnYJHPWF+aIp+HhKy7lJI95qciCQcqw/+TQG8L2c=; b=C6SR5NDGncrk1Bm9Ibj4au6Vfep2jr4pTfzcL5BtYHQjpj+hp3p7nnUTXR14dRErd7VmFhBWwujABPhKY/5PS+AOV0Kfs3eCz7Zjb7oUps5cmffIIIAr3o6etaG88fE0iBYNrFw8cHXb/WGQKUCJcAjKUl5mvATZKieTQ2dxHI0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67934+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1606280892810522.1887842776314; Tue, 24 Nov 2020 21:08:12 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id GtGAYY1788612xYiybtE53L9; Tue, 24 Nov 2020 21:08:12 -0800 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web08.2757.1606280890402594249 for ; Tue, 24 Nov 2020 21:08:10 -0800 IronPort-SDR: E8qiCvXxMgeJ4B/mauR8/wTDP3JdYUwV9X1VX3FYJwLO/5vxBPxOMmXG3+vneIx6svshEihkz3 Xfs92MdqofuA== X-IronPort-AV: E=McAfee;i="6000,8403,9815"; a="151325316" X-IronPort-AV: E=Sophos;i="5.78,368,1599548400"; d="scan'208";a="151325316" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2020 21:08:09 -0800 IronPort-SDR: tHcKrg5s11CDng7y7pPvUrFRoVotgyXj7L/Bg26hdJWEHhQfGNy27kEFcc18aq2j2AgqfvZ78L LTWOgWqjOAQA== X-IronPort-AV: E=Sophos;i="5.78,368,1599548400"; d="scan'208";a="332842098" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.212.122.89]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2020 21:08:05 -0800 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Sean Brogan , Bret Barkelew , Liming Gao Subject: [edk2-devel] [Patch v2][edk2-stable202011 2/4] .azurepipelines/templates/platform-build-run-steps.yml: Fetch target branch Date: Tue, 24 Nov 2020 21:07:56 -0800 Message-Id: <20201125050758.1507-3-michael.d.kinney@intel.com> In-Reply-To: <20201125050758.1507-1-michael.d.kinney@intel.com> References: <20201125050758.1507-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com X-Gm-Message-State: lU3zIux8c5IoR3aN8bAGIfPkx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1606280892; bh=ml6oX84m1WB/SkFLWDEIyJlyQPqhQZtVU94godCHdVQ=; h=Cc:Date:From:Reply-To:Subject:To; b=tshjEeQt7dpSoKaDmAwojeTvudJ8NHTS1hG/unKl9DGEYoVrsBG3fRfWnt1K2eDJvhu lAjuP4hI+2nyjeKJU3fXQOI9A2lU9L01JajAAYa6iNHML+FlMj2zSatRcVo/r+r1l0Z6x dwxgWmWIBYUE12ZdEp0EcXu3QXGEAY2hhQo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Sean Brogan Update Platform build steps process to fetch target branch Cc: Bret Barkelew Cc: Michael D Kinney Cc: Liming Gao Signed-off-by: Sean Brogan Reviewed-by: Michael D Kinney --- .azurepipelines/templates/platform-build-run-steps.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.azurepipelines/templates/platform-build-run-steps.yml b/.azur= epipelines/templates/platform-build-run-steps.yml index ebf674bfc7d8..97e7faa26682 100644 --- a/.azurepipelines/templates/platform-build-run-steps.yml +++ b/.azurepipelines/templates/platform-build-run-steps.yml @@ -51,6 +51,12 @@ steps: # Set default - bash: echo "##vso[task.setvariable variable=3Dpkg_count]${{ 1 }}" =20 +# Fetch the target branch so that pr_eval can diff them. +# Seems like azure pipelines/github changed checkout process in nov 2020. +- script: git fetch origin $(System.PullRequest.targetBranch) + displayName: fetch target branch + condition: eq(variables['Build.Reason'], 'PullRequest') + # trim the package list if this is a PR - task: CmdLine@1 displayName: Check if ${{ parameters.build_pkg }} need testing --=20 2.29.2.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#67934): https://edk2.groups.io/g/devel/message/67934 Mute This Topic: https://groups.io/mt/78494333/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Thu May 2 07:32:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67933+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67933+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1606280892; cv=none; d=zohomail.com; s=zohoarc; b=IxEBx9JXO4DTjMX2PMF7NsIHMRODx/tnSilzPNpc2JByOhlQEcfjRUDrWnFJEW+og7hiDPpDszLHgSsLDq5/5G6gVCwTsM7qZ4dWEhWVEoFbcraIUb20QTrg01O0J+eFNFmbBo9eimQX3Mun5vhq//TRKn8zeHmatZ2WXJ4OWq8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606280892; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=36IHrwc+BN8o/C3uYyVGyfv1UiMy5HPGe9zKno63cLY=; b=C0SfzG14SAmGTVtbcQotCoC/RaVh8+lHyNnZfDk2KdGhZuxn1z8BzQX7kZwHMSytKVDOderF5Yhs5rBvrGtflmKgmHy9pXMNY3QkIkiwVh1Rsc4RniGuClWemuJ+Z+4520sucjDcWCUWbd4PnXkrqxhSw9WRkEO6K/Gr0tB/79w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67933+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1606280892188799.6231483296388; Tue, 24 Nov 2020 21:08:12 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id vQfHYY1788612x11ulH5Izmb; Tue, 24 Nov 2020 21:08:11 -0800 X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web11.2684.1606280890536499845 for ; Tue, 24 Nov 2020 21:08:10 -0800 IronPort-SDR: l4dwp5/PUA2PEkKll7tf5YE6hBTvOm6x0a1tARYQr4ATxeHbsgl4OcIsT157FBqkTFT6+g/PAN vx+D5eAS2dKA== X-IronPort-AV: E=McAfee;i="6000,8403,9815"; a="168558276" X-IronPort-AV: E=Sophos;i="5.78,368,1599548400"; d="scan'208";a="168558276" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2020 21:08:10 -0800 IronPort-SDR: T+9PSbfUc8jc4ZtGfS9NogoU2Qs74S2bzgGCY3ltR17wHskpnLTPos2EY2kzqtQBmF1CdTFQRh lZDLapUa9f+Q== X-IronPort-AV: E=Sophos;i="5.78,368,1599548400"; d="scan'208";a="332842112" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.212.122.89]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2020 21:08:09 -0800 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Sean Brogan , Bret Barkelew , Liming Gao , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [edk2-devel] [Patch v2][edk2-stable202011 3/4] OvmfPkg/PlatformCI/.azurepiplines: Use stable release of QEMU Date: Tue, 24 Nov 2020 21:07:57 -0800 Message-Id: <20201125050758.1507-4-michael.d.kinney@intel.com> In-Reply-To: <20201125050758.1507-1-michael.d.kinney@intel.com> References: <20201125050758.1507-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com X-Gm-Message-State: SBYZbUf07no8s6rBudjcbemBx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1606280891; bh=aPPVjtKMVDaLkTv5RW3VHKrItMsTTvibM/a6kJNp9RQ=; h=Cc:Date:From:Reply-To:Subject:To; b=GtH9s+Wk+uSlJhYbfByUlLztv1EUTpiXkXIWqqNPXHRgKlz1RraJz2fKIHLxrXge65J AZjE8Qy0tKezTaBihvfp/eIX7KeCzTvPUJ7dXDiqH0zDGsw3B7k6OKAQO12/mZfQpos97 cj3IGot6LyjjDAjwtw+/ynMSAJAjZoPnlnE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Install the 2020.08.14 release of QEMU for Windows. The QEMU release from 2020.11.20 is installed into the incorrect directory and is causing EDK II CI failures in the run to shell step. Cc: Sean Brogan Cc: Bret Barkelew Cc: Liming Gao Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Michael D Kinney Acked-by: Laszlo Ersek Reviewed-by: Philippe Mathieu-Daude --- OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPk= g/PlatformCI/.azurepipelines/Windows-VS2019.yml index 02ed233fdb60..dd19fff50066 100644 --- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml +++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml @@ -132,7 +132,7 @@ jobs: build_flags: $(Build.Flags) run_flags: $(Run.Flags) extra_install_step: - - powershell: choco install qemu; Write-Host "##vso[task.prependpa= th]c:\Program Files\qemu" + - powershell: choco install qemu --version=3D2020.08.14; Write-Hos= t "##vso[task.prependpath]c:\Program Files\qemu" displayName: Install QEMU and Set QEMU on path # friendly name d= isplayed in the UI condition: and(gt(variables.pkg_count, 0), succeeded()) =20 --=20 2.29.2.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#67933): https://edk2.groups.io/g/devel/message/67933 Mute This Topic: https://groups.io/mt/78494332/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Thu May 2 07:32:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67935+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67935+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1606280893; cv=none; d=zohomail.com; s=zohoarc; b=SrCJnT1opH/lHjlZ1wHk354Fop+J7DjvnJEcK4d4B8Ws0BodJKa9FkmrLvSaArLm10Yq7FiTB++ZNJjEm7V4YuM6y2l48k5HUFlqmvtw/amX5yJhC0kqEefSHFAIp7HRaxqw5PPH8FMjaxYzu5z+E9AOIOdRBDkT5r6/JgamoN0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606280893; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=3HNCLxYSFGyCz/fUmxdg0Qm9vU04oyTtanEBcXyYlxg=; b=GDqMB2bMgsa17OPj2NMQWoxYqRDfigCgJGoN+mm8y4V5u/4+n690/b4Qo+ndFLQJhB+QNZeNt9LHVZEJcSBS3Ubu0hRFOcCj4PayGEwLsgnt20+k+GPSySGhmzsVwYE6qNPA6nYhIN1HFDhlVLVyBBVg0noDtz7Pe8XQHAP2udo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67935+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1606280893333145.87340693433282; Tue, 24 Nov 2020 21:08:13 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id Eku2YY1788612xEfhY3QCIBS; Tue, 24 Nov 2020 21:08:12 -0800 X-Received: from mga11.intel.com (mga11.intel.com []) by mx.groups.io with SMTP id smtpd.web11.2684.1606280890536499845 for ; Tue, 24 Nov 2020 21:08:10 -0800 IronPort-SDR: lTY5mpSxcUJ54RpvaNQcNmp2ezp8bhs2iMJqzwnRfDFdpVvmLt7U/jVE6aR3avsHWMlQxtC/MC 5CtYlebue5VQ== X-IronPort-AV: E=McAfee;i="6000,8403,9815"; a="168558277" X-IronPort-AV: E=Sophos;i="5.78,368,1599548400"; d="scan'208";a="168558277" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2020 21:08:10 -0800 IronPort-SDR: up6SBrLYAJ1jRMAm8UQN9LIkMnPFM33ifhp9Z3NHoAIQTU9t8vnb8ha5An5vT+URSduIVcD/z7 UjDL0hzJjJag== X-IronPort-AV: E=Sophos;i="5.78,368,1599548400"; d="scan'208";a="332842115" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.212.122.89]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2020 21:08:09 -0800 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang , Xiaoyu Lu , Guomin Jiang Subject: [edk2-devel] [Patch v2][edk2-stable202011 4/4] CryptoPkg/Test/UnitTest/Library/BaseCryptLib: Fix MD5 Hash tests Date: Tue, 24 Nov 2020 21:07:58 -0800 Message-Id: <20201125050758.1507-5-michael.d.kinney@intel.com> In-Reply-To: <20201125050758.1507-1-michael.d.kinney@intel.com> References: <20201125050758.1507-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com X-Gm-Message-State: DMebT8UyQEGYo7jKD9UBTPCdx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1606280892; bh=8MelaO7hUBnsr/ZK20zXySOwVS7EpcI48aVy++lLKdg=; h=Cc:Date:From:Reply-To:Subject:To; b=pczmQ0IVPUlOHifetQIjKKxFbWgmw3uDolzQ/8bArcGc4PaMr8+0wJVVYgmksukoeOb dcGw3Mjdxk8+V6awxgp2qzqpYJiUmLPzV7Oh9MsYYI2dw0dkYw9lPcO9Fc3N1VeMZevKZ yb2QY2YMLvPSc3FVEM4H8gDJX2lSQkohG74= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Only include MD5 unit tests if ENABLE_MD5_DEPRECATED_INTERFACES is defined. Cc: Jiewen Yao Cc: Jian J Wang Cc: Xiaoyu Lu Cc: Guomin Jiang Signed-off-by: Michael D Kinney Reviewed-by: Jiewen Yao --- CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c b/Cry= ptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c index bc47c5736246..24919053324a 100644 --- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c +++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c @@ -21,10 +21,11 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 *HashData =3D= "abc"; // // Result for MD5("abc"). (From "A.5 Test suite" of IETF RFC1321) // +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Md5Digest[MD5_DIGEST_SIZE] =3D { 0x90, 0x01, 0x50, 0x98, 0x3c, 0xd2, 0x4f, 0xb0, 0xd6, 0x96, 0x3f, 0x7d, = 0x28, 0xe1, 0x7f, 0x72 - }; +#endif =20 // // Result for SHA-1("abc"). (From "A.1 SHA-1 Example" of NIST FIPS 180-2) @@ -107,7 +108,9 @@ typedef struct { VOID *HashCtx; } HASH_TEST_CONTEXT; =20 +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES HASH_TEST_CONTEXT mMd5TestCtx =3D {MD5_DIGEST_SIZE, Md5GetCont= extSize, Md5Init, Md5Update, Md5Final, Md5HashAll, Md5Digest= }; +#endif HASH_TEST_CONTEXT mSha1TestCtx =3D {SHA1_DIGEST_SIZE, Sha1GetCon= textSize, Sha1Init, Sha1Update, Sha1Final, Sha1HashAll, Sha1Diges= t}; HASH_TEST_CONTEXT mSha256TestCtx =3D {SHA256_DIGEST_SIZE, Sha256GetC= ontextSize, Sha256Init, Sha256Update, Sha256Final, Sha256HashAll, Sha256Dig= est}; HASH_TEST_CONTEXT mSha384TestCtx =3D {SHA384_DIGEST_SIZE, Sha384GetC= ontextSize, Sha384Init, Sha384Update, Sha384Final, Sha384HashAll, Sha384Dig= est}; @@ -187,7 +190,9 @@ TEST_DESC mHashTest[] =3D { // // -----Description----------------Class---------------------Function-= --------------Pre------------------Post------------Context // +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES {"TestVerifyMd5()", "CryptoPkg.BaseCryptLib.Hash", TestVerifyHash= , TestVerifyHashPreReq, TestVerifyHashCleanUp, &mMd5TestCtx}, +#endif {"TestVerifySha1()", "CryptoPkg.BaseCryptLib.Hash", TestVerifyHash= , TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha1TestCtx}, {"TestVerifySha256()", "CryptoPkg.BaseCryptLib.Hash", TestVerifyHash= , TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha256TestCtx}, {"TestVerifySha384()", "CryptoPkg.BaseCryptLib.Hash", TestVerifyHash= , TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha384TestCtx}, --=20 2.29.2.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#67935): https://edk2.groups.io/g/devel/message/67935 Mute This Topic: https://groups.io/mt/78494334/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-