[update] : Added edk2

diff --git a/alter-stable/any/edk2/.SRCINFO b/alter-stable/any/edk2/.SRCINFO
index fc906c8..0c66ef7 100644 (file)
--- a/alter-stable/any/edk2/.SRCINFO
+++ b/alter-stable/any/edk2/.SRCINFO
@@ -1,39 +1,43 @@
 pkgbase = edk2
        pkgdesc = Modern, feature-rich firmware development environment for the UEFI specifications
-       pkgver = 202005
-       pkgrel = 3
+       pkgver = 202011
+       pkgrel = 1
        url = https://github.com/tianocore/edk2
        arch = any
        license = BSD
+       makedepends = aarch64-linux-gnu-gcc
        makedepends = acpica
        makedepends = iasl
        makedepends = util-linux-libs
        makedepends = nasm
        makedepends = python
        options = !makeflags
-       source = edk2-202005.tar.gz::https://github.com/tianocore/edk2/archive/edk2-stable202005.tar.gz
-       source = https://www.openssl.org/source/openssl-1.1.1g.tar.gz
+       source = edk2-202011.tar.gz::https://github.com/tianocore/edk2/archive/edk2-stable202011.tar.gz
+       source = https://www.openssl.org/source/openssl-1.1.1h.tar.gz
        source = brotli-1.0.7.tar.gz::https://github.com/google/brotli/archive/v1.0.7.tar.gz
-       source = edk2-202005-openssl-1.1.1g.patch
        source = 50-edk2-ovmf-i386-secure.json
        source = 50-edk2-ovmf-x86_64-secure.json
        source = 60-edk2-ovmf-i386.json
        source = 60-edk2-ovmf-x86_64.json
-       sha512sums = 864e5b8babb28eea05f59e17581209c853c004993842a7a6b104e96bd1fd29d9dd3a1545fb44639f2442acc51b078c4996621e1f927fbf449dc1b86421b432ac
-       sha512sums = 01e3d0b1bceeed8fb066f542ef5480862001556e0f612e017442330bbd7e5faee228b2de3513d7fc347446b7f217e27de1003dc9d7214d5833b97593f3ec25ab
+       source = 70-edk2-armvirt-aarch64.json
+       sha512sums = 53e9d2dcc2d4a885e6c48b87195e361ea1263de5501c62b22ad37a4ec350b4e171ea580fbb151874ec474a6b202fa7114d440ef9d2673bc9aff7a295c89ea2a0
+       sha512sums = da50fd99325841ed7a4367d9251c771ce505a443a73b327d8a46b2c6a7d2ea99e43551a164efc86f8743b22c2bdb0020bf24a9cbd445e9d68868b2dc1d34033a
        sha512sums = a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a
-       sha512sums = 3605c67d9c8870562086f63e96ffe8039cb394266298b382df61e12c777b6c37a2d2eb3fd5147cb3f00fabddc6dba139ba53da42ea81b1cbeb8f587c6d4cc251
        sha512sums = 55e4187b11b27737f61e528c02ff43b9381c0cb09140e803531616766f9cb9401115d88d946b56171784cc028f9571279640eb39b6a9fa8e02ec0c8d1b036a3e
        sha512sums = a1236585b30d720540de2e9527d8c90ff2d428e800b3da545b23461dc698dc91fe441b62bb8cbca76e08f4ec1eb485619e9ab26157deb06e7fb33e7f5f9dd8b6
        sha512sums = c81e072aabfb01d29cf5194111524e2c4c8684979de6b6793db10299c95bb94f7b1d0a98b057df0664d7a894a2b40e9b4c3576112fae400a95eaf5fe5fc9369b
        sha512sums = 2030dc1d49d56fce8af56c5777fd40f04041e39ff806dd8c021e161227bdd646982024db6758230b8332dc68f16bc6918e1d54ad3c022e21e148d6b65ea778b3
+       sha512sums = fa6d36a3c0225e4a5df532e77b18a035d65b0856d6a48875def5007de3f83d8d1d202d5b91e887d424112a3fa377dc9a09bdf44e5fcdccc36854675f95a211a4
+
+pkgname = edk2-armvirt
+       pkgdesc = Firmware for Virtual Machines (aarch64)
 
 pkgname = edk2-shell
        pkgdesc = EDK2 UEFI Shell
        provides = uefi-shell
 
 pkgname = edk2-ovmf
-       pkgdesc = Open Virtual Machine Firmware to support firmware for Virtual Machines
+       pkgdesc = Firmware for Virtual Machines (x86_64, i686)
        install = edk2-ovmf.install
        license = BSD
        license = MIT

diff --git a/alter-stable/any/edk2/70-edk2-armvirt-aarch64.json b/alter-stable/any/edk2/70-edk2-armvirt-aarch64.json
new file mode 100644 (file)
index 0000000..3d60f67
--- /dev/null
+++ b/alter-stable/any/edk2/70-edk2-armvirt-aarch64.json
@@ -0,0 +1,31 @@
+{
+    "description": "UEFI firmware for aarch64",
+    "interface-types": [
+        "uefi"
+    ],
+    "mapping": {
+        "device": "flash",
+        "executable": {
+            "filename": "/usr/share/edk2-armvirt/aarch64/QEMU_CODE.fd",
+            "format": "raw"
+        },
+        "nvram-template": {
+            "filename": "/usr/share/edk2-armvirt/aarch64/QEMU_VARS.fd",
+            "format": "raw"
+        }
+    },
+    "targets": [
+        {
+            "architecture": "aarch64",
+            "machines": [
+                "virt-*"
+            ]
+        }
+    ],
+    "features": [
+        "verbose-static"
+    ],
+    "tags": [
+
+    ]
+}

diff --git a/alter-stable/any/edk2/PKGBUILD b/alter-stable/any/edk2/PKGBUILD
index 52d2e07..8a588d5 100644 (file)
--- a/alter-stable/any/edk2/PKGBUILD
+++ b/alter-stable/any/edk2/PKGBUILD
@@ -1,34 +1,35 @@
 # Maintainer: David Runge <dvzrv@archlinux.org>
 
 _brotli_ver=1.0.7
-_openssl_ver=1.1.1g
+_openssl_ver=1.1.1h
 pkgbase=edk2
-pkgname=('edk2-shell' 'edk2-ovmf')
-pkgver=202005
-pkgrel=3
+pkgname=('edk2-armvirt' 'edk2-shell' 'edk2-ovmf')
+pkgver=202011
+pkgrel=1
 pkgdesc="Modern, feature-rich firmware development environment for the UEFI specifications"
 arch=('any')
 url="https://github.com/tianocore/edk2"
 license=('BSD')
-makedepends=('acpica' 'iasl' 'util-linux-libs' 'nasm' 'python')
+makedepends=('aarch64-linux-gnu-gcc' 'acpica' 'iasl' 'util-linux-libs' 'nasm' 'python')
 options=(!makeflags)
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/tianocore/${pkgbase}/archive/${pkgbase}-stable${pkgver}.tar.gz"
         "https://www.openssl.org/source/openssl-${_openssl_ver}.tar.gz"
         "brotli-${_brotli_ver}.tar.gz::https://github.com/google/brotli/archive/v${_brotli_ver}.tar.gz"
-        "${pkgbase}-202005-openssl-1.1.1g.patch"
         "50-edk2-ovmf-i386-secure.json"
         "50-edk2-ovmf-x86_64-secure.json"
         "60-edk2-ovmf-i386.json"
-        "60-edk2-ovmf-x86_64.json")
-sha512sums=('864e5b8babb28eea05f59e17581209c853c004993842a7a6b104e96bd1fd29d9dd3a1545fb44639f2442acc51b078c4996621e1f927fbf449dc1b86421b432ac'
-            '01e3d0b1bceeed8fb066f542ef5480862001556e0f612e017442330bbd7e5faee228b2de3513d7fc347446b7f217e27de1003dc9d7214d5833b97593f3ec25ab'
+        "60-edk2-ovmf-x86_64.json"
+        "70-edk2-armvirt-aarch64.json")
+sha512sums=('53e9d2dcc2d4a885e6c48b87195e361ea1263de5501c62b22ad37a4ec350b4e171ea580fbb151874ec474a6b202fa7114d440ef9d2673bc9aff7a295c89ea2a0'
+            'da50fd99325841ed7a4367d9251c771ce505a443a73b327d8a46b2c6a7d2ea99e43551a164efc86f8743b22c2bdb0020bf24a9cbd445e9d68868b2dc1d34033a'
             'a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a'
-            '3605c67d9c8870562086f63e96ffe8039cb394266298b382df61e12c777b6c37a2d2eb3fd5147cb3f00fabddc6dba139ba53da42ea81b1cbeb8f587c6d4cc251'
             '55e4187b11b27737f61e528c02ff43b9381c0cb09140e803531616766f9cb9401115d88d946b56171784cc028f9571279640eb39b6a9fa8e02ec0c8d1b036a3e'
             'a1236585b30d720540de2e9527d8c90ff2d428e800b3da545b23461dc698dc91fe441b62bb8cbca76e08f4ec1eb485619e9ab26157deb06e7fb33e7f5f9dd8b6'
             'c81e072aabfb01d29cf5194111524e2c4c8684979de6b6793db10299c95bb94f7b1d0a98b057df0664d7a894a2b40e9b4c3576112fae400a95eaf5fe5fc9369b'
-            '2030dc1d49d56fce8af56c5777fd40f04041e39ff806dd8c021e161227bdd646982024db6758230b8332dc68f16bc6918e1d54ad3c022e21e148d6b65ea778b3')
-_arch_list=('IA32' 'X64')
+            '2030dc1d49d56fce8af56c5777fd40f04041e39ff806dd8c021e161227bdd646982024db6758230b8332dc68f16bc6918e1d54ad3c022e21e148d6b65ea778b3'
+            'fa6d36a3c0225e4a5df532e77b18a035d65b0856d6a48875def5007de3f83d8d1d202d5b91e887d424112a3fa377dc9a09bdf44e5fcdccc36854675f95a211a4')
+
+_arch_list=('AARCH64' 'IA32' 'X64')
 _build_type='RELEASE'
 _build_plugin='GCC5'
 
@@ -36,13 +37,9 @@ prepare() {
   mv -v "$pkgbase-$pkgbase-stable$pkgver" "$pkgbase-$pkgver"
   cd "$pkgbase-$pkgver"
 
-  # applying fixes to build against openssl-1.1.1g
-  patch -Np1 -i "../${pkgbase}-202005-openssl-1.1.1g.patch"
   # symlinking openssl into place
   rm -rfv CryptoPkg/Library/OpensslLib/openssl
   ln -sfv "${srcdir}/openssl-$_openssl_ver" CryptoPkg/Library/OpensslLib/openssl
-  # copying required pre-generated header into place (to not also have to patch openssl)
-  cp -v CryptoPkg/Library/Include/internal/dso_conf.h CryptoPkg/Library/OpensslLib/openssl/include/crypto/
 
   # symlinking brotli into place
   rm -rfv BaseTools/Source/C/BrotliCompress/brotli MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
@@ -56,7 +53,13 @@ prepare() {
 
 build() {
   cd "$pkgbase-$pkgver"
+  export GCC5_IA32_PREFIX="x86_64-linux-gnu-"
+  export GCC5_X64_PREFIX="x86_64-linux-gnu-"
+  export GCC5_AARCH64_PREFIX="aarch64-linux-gnu-"
   local _arch
+  echo "Building base tools (AARCH64)"
+  ARCH=AARCH64 make -C BaseTools
+  echo "Building base tools"
   make -C BaseTools
   . edksetup.sh
   for _arch in ${_arch_list[@]}; do
@@ -127,12 +130,56 @@ build() {
                        -D TLS_ENABLE \
                        -D HTTP_BOOT_ENABLE
     fi
+    if [[ "${_arch}" == 'AARCH64' ]]; then
+      echo "Building ovmf (${_arch}) with secure boot"
+      BaseTools/BinWrappers/PosixLike/build -p "ArmVirtPkg/ArmVirtQemu.dsc" \
+                                            -a "${_arch}" \
+                                            -b "${_build_type}" \
+                                            -n "$(nproc)" \
+                                            -t "${_build_plugin}" \
+                                            -D NETWORK_IP6_ENABLE \
+                                            -D NETWORK_HTTP_BOOT_ENABLE \
+                                            -D NETWORK_TLS_ENABLE \
+                                            -D SECURE_BOOT_ENABLE \
+                                            -D TPM_ENABLE \
+                                            -D TPM_CONFIG_ENABLE
+      dd if="/dev/zero" \
+        of="Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/FV/QEMU_CODE.fd" \
+        bs=1M count=64
+      dd if="Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/FV/QEMU_EFI.fd" \
+        of="Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/FV/QEMU_CODE.fd" \
+        conv=notrunc
+      dd if="/dev/zero" \
+        of="Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/FV/QEMU_VARS.fd" \
+        bs=1M count=64
+    fi
   done
 }
 
+package_edk2-armvirt() {
+  pkgdesc="Firmware for Virtual Machines (aarch64)"
+  local _arch=AARCH64
+
+  cd "$pkgbase-$pkgver"
+  install -vDm 644 "Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/FV/"*.fd \
+    -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}/"
+  # add libvirt compatibility (which hardcodes the following paths)
+  install -vdm 755 "${pkgdir}/usr/share/AAVMF"
+  ln -svf "/usr/share/${pkgname}/${_arch,,}/QEMU_CODE.fd" \
+    "${pkgdir}/usr/share/AAVMF/AAVMF_CODE.fd"
+  ln -svf "/usr/share/${pkgname}/${_arch,,}/QEMU_VARS.fd" \
+    "${pkgdir}/usr/share/AAVMF/AAVMF_VARS.fd"
+  # install qemu descriptors in accordance with qemu:
+  # https://git.qemu.org/?p=qemu.git;a=tree;f=pc-bios/descriptors
+  install -vDm 644 ../*"${pkgname}"*.json -t "${pkgdir}/usr/share/qemu/firmware"
+  # license
+  install -vDm 644 License.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
 package_edk2-shell() {
   pkgdesc="EDK2 UEFI Shell"
   provides=('uefi-shell')
+
   cd "$pkgbase-$pkgver"
   local _arch
   # minimal UEFI shell, as defined in ShellPkg/Application/Shell/ShellPkg.inf
@@ -140,10 +187,15 @@ package_edk2-shell() {
   # full UEFI shell, as defined in ShellPkg/ShellPkg.dsc
   local _full='EA4BB293-2D7F-4456-A681-1F22F42CD0BC'
   for _arch in ${_arch_list[@]}; do
-    install -vDm 644 "Build/Shell/${_build_type}_${_build_plugin}/${_arch}/Shell_${_min}.efi" \
-      "${pkgdir}/usr/share/${pkgname}/${_arch,,}/Shell.efi"
-    install -vDm 644 "Build/Shell/${_build_type}_${_build_plugin}/${_arch}/Shell_${_full}.efi" \
-      "${pkgdir}/usr/share/${pkgname}/${_arch,,}/Shell_Full.efi"
+    if [[ "${_arch}" == 'AARCH64' ]]; then
+      install -vDm 644 "Build/ArmVirtQemu-${_arch}/${_build_type}_${_build_plugin}/${_arch}/Shell.efi" \
+        -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}/"
+    else
+      install -vDm 644 "Build/Shell/${_build_type}_${_build_plugin}/${_arch}/Shell_${_min}.efi" \
+        "${pkgdir}/usr/share/${pkgname}/${_arch,,}/Shell.efi"
+      install -vDm 644 "Build/Shell/${_build_type}_${_build_plugin}/${_arch}/Shell_${_full}.efi" \
+        "${pkgdir}/usr/share/${pkgname}/${_arch,,}/Shell_Full.efi"
+    fi
   done
   # license
   install -vDm 644 License.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
@@ -153,25 +205,30 @@ package_edk2-shell() {
 }
 
 package_edk2-ovmf() {
-  pkgdesc="Open Virtual Machine Firmware to support firmware for Virtual Machines"
+  pkgdesc="Firmware for Virtual Machines (x86_64, i686)"
   provides=('ovmf')
   conflicts=('ovmf')
   replaces=('ovmf')
   license+=('MIT')
   install="${pkgname}.install"
+
   cd "$pkgbase-$pkgver"
   local _arch
   # installing the various firmwares
   for _arch in ${_arch_list[@]}; do
-    # installing OVMF.fd for xen: https://bugs.archlinux.org/task/58635
-    install -vDm 644 "Build/Ovmf${_arch}/${_build_type}_${_build_plugin}/FV/OVMF.fd" \
-      -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}"
-    install -vDm 644 "Build/Ovmf${_arch}/${_build_type}_${_build_plugin}/FV/OVMF_CODE.fd" \
-      -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}"
-    install -vDm 644 "Build/Ovmf${_arch}/${_build_type}_${_build_plugin}/FV/OVMF_VARS.fd" \
-      -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}"
-    install -vDm 644 "Build/Ovmf${_arch}-secure/${_build_type}_${_build_plugin}/FV/OVMF_CODE.fd" \
-      "${pkgdir}/usr/share/${pkgname}/${_arch,,}/OVMF_CODE.secboot.fd"
+    if [[ "${_arch}" == 'AARCH64' ]]; then
+      continue
+    else
+      # installing OVMF.fd for xen: https://bugs.archlinux.org/task/58635
+      install -vDm 644 "Build/Ovmf${_arch}/${_build_type}_${_build_plugin}/FV/OVMF.fd" \
+        -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}"
+      install -vDm 644 "Build/Ovmf${_arch}/${_build_type}_${_build_plugin}/FV/OVMF_CODE.fd" \
+        -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}"
+      install -vDm 644 "Build/Ovmf${_arch}/${_build_type}_${_build_plugin}/FV/OVMF_VARS.fd" \
+        -t "${pkgdir}/usr/share/${pkgname}/${_arch,,}"
+      install -vDm 644 "Build/Ovmf${_arch}-secure/${_build_type}_${_build_plugin}/FV/OVMF_CODE.fd" \
+        "${pkgdir}/usr/share/${pkgname}/${_arch,,}/OVMF_CODE.secboot.fd"
+    fi
   done
   # installing qemu descriptors in accordance with qemu:
   # https://git.qemu.org/?p=qemu.git;a=tree;f=pc-bios/descriptors

diff --git a/alter-stable/any/edk2/edk2-202005-openssl-1.1.1g.patch b/alter-stable/any/edk2/edk2-202005-openssl-1.1.1g.patch
deleted file mode 100644 (file)
index 746d3a6..0000000
--- a/alter-stable/any/edk2/edk2-202005-openssl-1.1.1g.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-diff -ruN a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec
---- a/CryptoPkg/CryptoPkg.dec  2020-06-02 09:05:21.000000000 +0200
-+++ b/CryptoPkg/CryptoPkg.dec  2020-06-09 15:21:52.055912797 +0200
-@@ -23,7 +23,6 @@
-   Private\r
-   Library/Include\r
-   Library/OpensslLib/openssl/include\r
--  Library/OpensslLib/openssl/crypto/include\r
- \r
- [LibraryClasses]\r
-   ##  @libraryclass  Provides basic library functions for cryptographic primitives.\r
-diff -ruN a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c
---- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c   2020-06-02 09:05:21.000000000 +0200
-+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c   2020-06-09 15:26:52.686439106 +0200
-@@ -7,7 +7,7 @@
- **/\r
- \r
- #include "InternalCryptLib.h"\r
--#include "internal/sm3.h"\r
-+#include <crypto/sm3.h>\r
- \r
- /**\r
-   Retrieves the size, in bytes, of the context buffer required for SM3 hash operations.\r
-diff -ruN a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c
---- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c  2020-06-02 09:05:21.000000000 +0200
-+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c  2020-06-09 15:22:47.512057737 +0200
-@@ -15,13 +15,12 @@
- #include <openssl/asn1.h>\r
- #include <openssl/x509.h>\r
- #include <openssl/bio.h>\r
--#include <internal/x509_int.h>\r
- #include <openssl/pkcs7.h>\r
- #include <openssl/bn.h>\r
- #include <openssl/x509_vfy.h>\r
- #include <openssl/pem.h>\r
- #include <openssl/evp.h>\r
--#include <internal/asn1_int.h>\r
-+#include <crypto/asn1.h>\r
- \r
- /**\r
-   This function will return the leaf signer certificate in a chain.  This is\r
-diff -ruN a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
---- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf      2020-06-02 09:05:21.000000000 +0200
-+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf      2020-06-09 11:08:33.349121703 +0200
-@@ -477,45 +477,44 @@
-   $(OPENSSL_PATH)/crypto/s390x_arch.h\r
-   $(OPENSSL_PATH)/crypto/sparc_arch.h\r
-   $(OPENSSL_PATH)/crypto/vms_rms.h\r
--  $(OPENSSL_PATH)/crypto/aes/aes_locl.h\r
-+  $(OPENSSL_PATH)/crypto/aes/aes_local.h\r
-   $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h\r
--  $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h\r
-+  $(OPENSSL_PATH)/crypto/asn1/asn1_local.h\r
-   $(OPENSSL_PATH)/crypto/asn1/charmap.h\r
-   $(OPENSSL_PATH)/crypto/asn1/standard_methods.h\r
-   $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h\r
--  $(OPENSSL_PATH)/crypto/async/async_locl.h\r
-+  $(OPENSSL_PATH)/crypto/async/async_local.h\r
-   $(OPENSSL_PATH)/crypto/async/arch/async_null.h\r
-   $(OPENSSL_PATH)/crypto/async/arch/async_posix.h\r
-   $(OPENSSL_PATH)/crypto/async/arch/async_win.h\r
--  $(OPENSSL_PATH)/crypto/bio/bio_lcl.h\r
--  $(OPENSSL_PATH)/crypto/bn/bn_lcl.h\r
-+  $(OPENSSL_PATH)/crypto/bio/bio_local.h\r
-+  $(OPENSSL_PATH)/crypto/bn/bn_local.h\r
-   $(OPENSSL_PATH)/crypto/bn/bn_prime.h\r
-   $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h\r
--  $(OPENSSL_PATH)/crypto/comp/comp_lcl.h\r
-+  $(OPENSSL_PATH)/crypto/comp/comp_local.h\r
-   $(OPENSSL_PATH)/crypto/conf/conf_def.h\r
--  $(OPENSSL_PATH)/crypto/conf/conf_lcl.h\r
--  $(OPENSSL_PATH)/crypto/dh/dh_locl.h\r
--  $(OPENSSL_PATH)/crypto/dso/dso_locl.h\r
--  $(OPENSSL_PATH)/crypto/evp/evp_locl.h\r
--  $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h\r
--  $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h\r
--  $(OPENSSL_PATH)/crypto/md5/md5_locl.h\r
--  $(OPENSSL_PATH)/crypto/modes/modes_lcl.h\r
-+  $(OPENSSL_PATH)/crypto/conf/conf_local.h\r
-+  $(OPENSSL_PATH)/crypto/dh/dh_local.h\r
-+  $(OPENSSL_PATH)/crypto/dso/dso_local.h\r
-+  $(OPENSSL_PATH)/crypto/evp/evp_local.h\r
-+  $(OPENSSL_PATH)/crypto/hmac/hmac_local.h\r
-+  $(OPENSSL_PATH)/crypto/lhash/lhash_local.h\r
-+  $(OPENSSL_PATH)/crypto/md5/md5_local.h\r
-+  $(OPENSSL_PATH)/crypto/modes/modes_local.h\r
-   $(OPENSSL_PATH)/crypto/objects/obj_dat.h\r
--  $(OPENSSL_PATH)/crypto/objects/obj_lcl.h\r
-+  $(OPENSSL_PATH)/crypto/objects/obj_local.h\r
-   $(OPENSSL_PATH)/crypto/objects/obj_xref.h\r
--  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h\r
--  $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h\r
--  $(OPENSSL_PATH)/crypto/rand/rand_lcl.h\r
--  $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h\r
--  $(OPENSSL_PATH)/crypto/sha/sha_locl.h\r
-+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_local.h\r
-+  $(OPENSSL_PATH)/crypto/pkcs12/p12_local.h\r
-+  $(OPENSSL_PATH)/crypto/rand/rand_local.h\r
-+  $(OPENSSL_PATH)/crypto/rsa/rsa_local.h\r
-+  $(OPENSSL_PATH)/crypto/sha/sha_local.h\r
-   $(OPENSSL_PATH)/crypto/siphash/siphash_local.h\r
--  $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h\r
--  $(OPENSSL_PATH)/crypto/store/store_locl.h\r
--  $(OPENSSL_PATH)/crypto/ui/ui_locl.h\r
--  $(OPENSSL_PATH)/crypto/x509/x509_lcl.h\r
-+  $(OPENSSL_PATH)/crypto/sm3/sm3_local.h\r
-+  $(OPENSSL_PATH)/crypto/store/store_local.h\r
-+  $(OPENSSL_PATH)/crypto/ui/ui_local.h\r
-+  $(OPENSSL_PATH)/crypto/x509/x509_local.h\r
-   $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h\r
--  $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h\r
-   $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h\r
-   $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h\r
-   $(OPENSSL_PATH)/ssl/bio_ssl.c\r
-@@ -562,13 +561,13 @@
-   $(OPENSSL_PATH)/ssl/t1_trce.c\r
-   $(OPENSSL_PATH)/ssl/tls13_enc.c\r
-   $(OPENSSL_PATH)/ssl/tls_srp.c\r
--  $(OPENSSL_PATH)/ssl/packet_locl.h\r
-+  $(OPENSSL_PATH)/ssl/packet_local.h\r
-   $(OPENSSL_PATH)/ssl/ssl_cert_table.h\r
--  $(OPENSSL_PATH)/ssl/ssl_locl.h\r
-+  $(OPENSSL_PATH)/ssl/ssl_local.h\r
-   $(OPENSSL_PATH)/ssl/record/record.h\r
--  $(OPENSSL_PATH)/ssl/record/record_locl.h\r
-+  $(OPENSSL_PATH)/ssl/record/record_local.h\r
-   $(OPENSSL_PATH)/ssl/statem/statem.h\r
--  $(OPENSSL_PATH)/ssl/statem/statem_locl.h\r
-+  $(OPENSSL_PATH)/ssl/statem/statem_local.h\r
- # Autogenerated files list ends here\r
-   buildinf.h\r
-   rand_pool_noise.h\r
-diff -ruN a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
---- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf        2020-06-02 09:05:21.000000000 +0200
-+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf        2020-06-09 11:17:31.877356870 +0200
-@@ -477,45 +477,44 @@
-   $(OPENSSL_PATH)/crypto/s390x_arch.h\r
-   $(OPENSSL_PATH)/crypto/sparc_arch.h\r
-   $(OPENSSL_PATH)/crypto/vms_rms.h\r
--  $(OPENSSL_PATH)/crypto/aes/aes_locl.h\r
-+  $(OPENSSL_PATH)/crypto/aes/aes_local.h\r
-   $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h\r
--  $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h\r
-+  $(OPENSSL_PATH)/crypto/asn1/asn1_local.h\r
-   $(OPENSSL_PATH)/crypto/asn1/charmap.h\r
-   $(OPENSSL_PATH)/crypto/asn1/standard_methods.h\r
-   $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h\r
--  $(OPENSSL_PATH)/crypto/async/async_locl.h\r
-+  $(OPENSSL_PATH)/crypto/async/async_local.h\r
-   $(OPENSSL_PATH)/crypto/async/arch/async_null.h\r
-   $(OPENSSL_PATH)/crypto/async/arch/async_posix.h\r
-   $(OPENSSL_PATH)/crypto/async/arch/async_win.h\r
--  $(OPENSSL_PATH)/crypto/bio/bio_lcl.h\r
--  $(OPENSSL_PATH)/crypto/bn/bn_lcl.h\r
-+  $(OPENSSL_PATH)/crypto/bio/bio_local.h\r
-+  $(OPENSSL_PATH)/crypto/bn/bn_local.h\r
-   $(OPENSSL_PATH)/crypto/bn/bn_prime.h\r
-   $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h\r
--  $(OPENSSL_PATH)/crypto/comp/comp_lcl.h\r
-+  $(OPENSSL_PATH)/crypto/comp/comp_local.h\r
-   $(OPENSSL_PATH)/crypto/conf/conf_def.h\r
--  $(OPENSSL_PATH)/crypto/conf/conf_lcl.h\r
--  $(OPENSSL_PATH)/crypto/dh/dh_locl.h\r
--  $(OPENSSL_PATH)/crypto/dso/dso_locl.h\r
--  $(OPENSSL_PATH)/crypto/evp/evp_locl.h\r
--  $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h\r
--  $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h\r
--  $(OPENSSL_PATH)/crypto/md5/md5_locl.h\r
--  $(OPENSSL_PATH)/crypto/modes/modes_lcl.h\r
-+  $(OPENSSL_PATH)/crypto/conf/conf_local.h\r
-+  $(OPENSSL_PATH)/crypto/dh/dh_local.h\r
-+  $(OPENSSL_PATH)/crypto/dso/dso_local.h\r
-+  $(OPENSSL_PATH)/crypto/evp/evp_local.h\r
-+  $(OPENSSL_PATH)/crypto/hmac/hmac_local.h\r
-+  $(OPENSSL_PATH)/crypto/lhash/lhash_local.h\r
-+  $(OPENSSL_PATH)/crypto/md5/md5_local.h\r
-+  $(OPENSSL_PATH)/crypto/modes/modes_local.h\r
-   $(OPENSSL_PATH)/crypto/objects/obj_dat.h\r
--  $(OPENSSL_PATH)/crypto/objects/obj_lcl.h\r
-+  $(OPENSSL_PATH)/crypto/objects/obj_local.h\r
-   $(OPENSSL_PATH)/crypto/objects/obj_xref.h\r
--  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h\r
--  $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h\r
--  $(OPENSSL_PATH)/crypto/rand/rand_lcl.h\r
--  $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h\r
--  $(OPENSSL_PATH)/crypto/sha/sha_locl.h\r
-+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_local.h\r
-+  $(OPENSSL_PATH)/crypto/pkcs12/p12_local.h\r
-+  $(OPENSSL_PATH)/crypto/rand/rand_local.h\r
-+  $(OPENSSL_PATH)/crypto/rsa/rsa_local.h\r
-+  $(OPENSSL_PATH)/crypto/sha/sha_local.h\r
-   $(OPENSSL_PATH)/crypto/siphash/siphash_local.h\r
--  $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h\r
--  $(OPENSSL_PATH)/crypto/store/store_locl.h\r
--  $(OPENSSL_PATH)/crypto/ui/ui_locl.h\r
--  $(OPENSSL_PATH)/crypto/x509/x509_lcl.h\r
-+  $(OPENSSL_PATH)/crypto/sm3/sm3_local.h\r
-+  $(OPENSSL_PATH)/crypto/store/store_local.h\r
-+  $(OPENSSL_PATH)/crypto/ui/ui_local.h\r
-+  $(OPENSSL_PATH)/crypto/x509/x509_local.h\r
-   $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h\r
--  $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h\r
-   $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h\r
-   $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h\r
- # Autogenerated files list ends here\r
-diff -ruN a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Library/OpensslLib/process_files.pl
---- a/CryptoPkg/Library/OpensslLib/process_files.pl    2020-06-02 09:05:21.000000000 +0200
-+++ b/CryptoPkg/Library/OpensslLib/process_files.pl    2020-06-09 12:36:16.400775802 +0200
-@@ -111,8 +111,8 @@
-             # Generate dso_conf.h per config data\r
-             system(\r
-                 "perl -I. -Mconfigdata util/dofile.pl " .\r
--                "crypto/include/internal/dso_conf.h.in " .\r
--                "> include/internal/dso_conf.h"\r
-+                "include/crypto/dso_conf.h.in " .\r
-+                "> include/crypto/dso_conf.h"\r
-                 ) == 0 ||\r
-                     die "Failed to generate dso_conf.h!\n";\r
- \r
-diff -ruN a/CryptoPkg/Library/OpensslLib/rand_pool.c b/CryptoPkg/Library/OpensslLib/rand_pool.c
---- a/CryptoPkg/Library/OpensslLib/rand_pool.c 2020-06-02 09:05:21.000000000 +0200
-+++ b/CryptoPkg/Library/OpensslLib/rand_pool.c 2020-06-17 21:00:46.335684557 +0200
-@@ -7,9 +7,8 @@
- \r
- **/\r
- \r
--#include "internal/rand_int.h"\r
- #include <openssl/aes.h>\r
--\r
-+#include <crypto/rand.h>\r
- #include <Uefi.h>\r
- #include <Library/TimerLib.h>\r
- \r