From 44dfde1b27d0e6e6daba7256d2e78648c499bff8 Mon Sep 17 00:00:00 2001
From: Jon Maloy <jmaloy@redhat.com>
Date: Mon, 6 Jan 2025 07:00:18 -0500
Subject: [PATCH] * Mon Jan 06 2025 Jon Maloy <jmaloy@redhat.com> -
 20220126gitbb1bba3d77-13.el8.8

- edk2-ArmVirtPkg-Add-Hash2DxeCrypto-to-ArmVirtPkg.patch [RHEL-71687]
- Resolves: RHEL-71687
  ([Regression] HTTP boot not available [aarch64] [rhel-8.10.z])
---
 ...Pkg-Add-Hash2DxeCrypto-to-ArmVirtPkg.patch | 79 +++++++++++++++++++
 edk2.spec                                     |  9 ++-
 2 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 edk2-ArmVirtPkg-Add-Hash2DxeCrypto-to-ArmVirtPkg.patch

diff --git a/edk2-ArmVirtPkg-Add-Hash2DxeCrypto-to-ArmVirtPkg.patch b/edk2-ArmVirtPkg-Add-Hash2DxeCrypto-to-ArmVirtPkg.patch
new file mode 100644
index 0000000..502ea18
--- /dev/null
+++ b/edk2-ArmVirtPkg-Add-Hash2DxeCrypto-to-ArmVirtPkg.patch
@@ -0,0 +1,79 @@
+From 2013730b133b5ea78691ede3937b98144673fe1d Mon Sep 17 00:00:00 2001
+From: Flickdm <douglas.flick@microsoft.com>
+Date: Mon, 20 May 2024 11:06:38 -0700
+Subject: [PATCH] ArmVirtPkg: Add Hash2DxeCrypto to ArmVirtPkg
+
+RH-Author: Oliver Steffen <osteffen@redhat.com>
+RH-MergeRequest: 112: ArmVirtPkg: Add Hash2DxeCrypto to ArmVirtPkg
+RH-Jira: RHEL-71687
+RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
+RH-Commit: [1/1] c84a2c074eebd93a07079683b5e5cf03d6fcd50f
+
+This patch adds Hash2DxeCrypto to ArmVirtPkg. The Hash2DxeCrypto is
+used to provide the hashing protocol services.
+
+Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
+Cc: Leif Lindholm <quic_llindhol@quicinc.com>
+Cc: Sami Mujawar <sami.mujawar@arm.com>
+Cc: Gerd Hoffmann <kraxel@redhat.com>
+
+Signed-off-by: Doug Flick [MSFT] <doug.edk2@gmail.com>
+Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
+(cherry picked from commit e10d83234c7e3caaf940df79f4b302fca3729fb0)
+---
+ ArmVirtPkg/ArmVirtQemu.dsc           | 5 +++++
+ ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 5 +++++
+ ArmVirtPkg/ArmVirtQemuKernel.dsc     | 5 +++++
+ 3 files changed, 15 insertions(+)
+
+diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
+index 2b23becf30..5d4b639bf2 100644
+--- a/ArmVirtPkg/ArmVirtQemu.dsc
++++ b/ArmVirtPkg/ArmVirtQemu.dsc
+@@ -526,6 +526,11 @@
+   MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
+   MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+ 
++  #
++  # Hash2 Protocol Support
++  #
++  SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf
++
+   #
+   # TPM2 support
+   #
+diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+index 7c655d384d..b4dc286843 100644
+--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
++++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+@@ -180,6 +180,11 @@ READ_LOCK_STATUS   = TRUE
+   INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
+   INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+ 
++  #
++  # Hash2 Protocol producer
++  #
++  INF SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf
++
+   #
+   # TPM2 support
+   #
+diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
+index 344e2c4ed9..dd9230e5b7 100644
+--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
++++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
+@@ -455,6 +455,11 @@
+   MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
+   MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+ 
++  #
++  # Hash2 Protocol Support
++  #
++  SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf
++
+   #
+   # ACPI Support
+   #
+-- 
+2.47.1
+
diff --git a/edk2.spec b/edk2.spec
index 3095a93..605e836 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -7,7 +7,7 @@ ExclusiveArch: x86_64 aarch64
 
 Name:       edk2
 Version:    %{GITDATE}git%{GITCOMMIT}
-Release:    13%{?dist}.7
+Release:    13%{?dist}.8
 Summary:    UEFI firmware for 64-bit virtual machines
 Group:      Applications/Emulators
 License:    BSD-2-Clause-Patent and OpenSSL and MIT
@@ -394,6 +394,8 @@ Patch118: edk2-OvmfPkg-Add-a-Fallback-RNG-RH-only.patch
 Patch119: edk2-OvmfPkg-ArmVirtPkg-Add-a-Fallback-RNG-RH-only.patch
 # For RHEL-66188 - [Regression] HTTP Boot fails to work with edk2-ovmf-20231122-6.el9_4.2 and greater [rhel-8.10]
 Patch120: edk2-OvmfPkg-Rerun-dispatcher-after-initializing-virtio-r.patch
+# For RHEL-71687 - [Regression] HTTP boot not available [aarch64] [rhel-8.10.z]
+Patch121: edk2-ArmVirtPkg-Add-Hash2DxeCrypto-to-ArmVirtPkg.patch
 
 
 # python3-devel and libuuid-devel are required for building tools.
@@ -840,6 +842,11 @@ true
 %endif
 
 %changelog
+* Mon Jan 06 2025 Jon Maloy <jmaloy@redhat.com> - 20220126gitbb1bba3d77-13.el8.8
+- edk2-ArmVirtPkg-Add-Hash2DxeCrypto-to-ArmVirtPkg.patch [RHEL-71687]
+- Resolves: RHEL-71687
+  ([Regression] HTTP boot not available [aarch64] [rhel-8.10.z])
+
 * Fri Dec 06 2024 Jon Maloy <jmaloy@redhat.com> - 20220126gitbb1bba3d77-13.el8.7
 - edk2-redhat-Fix-ovmf-vars-generator-RH-only.patch [RHEL-66236]
 - Resolves: RHEL-66236