- Add RPi4 platform

- Update edk2 to version 202002:
* changelog: https://github.com/tianocore/edk2/releases/tag/edk2-stable202002
* changelog of 201911 (skipped):
https://github.com/tianocore/edk2/releases/tag/edk2-stable201911
- Update edk2-non-osi to version 0.0~20200421T141136~96ec764
- Update edk2-platforms to version 0.0~20200421T131746~5a60c2de3c

- Update edk2 to version 201908:
* changelog: https://github.com/tianocore/edk2/releases/tag/edk2-stable201908
- Update edk2-non-osi to version 0.0~20191021T153136~243e55f
- Update edk2-platforms to version 0.0~20191021T153232~03f36b8fcf

- Update edk2-non-osi to version 0.0~20190610T165749~eb114ec
- Update edk2-platforms to version 0.0~20190626T215631~1710027938

- Update edk2 to version 201905
- Update edk2-platforms to version 0.0~20190604T211045~1098e7ec3e

- Switch to _multibuild

- Add Armada80x0McBin platform

- Update edk2 to version 201903
- Update edk2-platforms to version 0.0~20190513T092206~ffac728623
- Update edk2-non-osi to version 0.0~20190423T233527~596043f
- Remove upstreamed patches:
* edk2-cve-2018-12181-1.patch
* edk2-cve-2018-12181-2.patch

- Add RPi3 platform
- Build in DEBUG mode by default

old: hardware:boot/edk2
new: home:Guillaume_G:branches:hardware:boot/edk2 rev None
Index: _service
===================================================================
--- _service (revision 2)
+++ _service (revision 35)
@@ -6,7 +6,7 @@
git
edk2-platforms
0.0~%ci~%h
- 397bbaf
+ 5a60c2de3c017e649a867e7ddc7f7242da34f9d4


*edk2-platforms*.tar
@@ -18,7 +18,7 @@
git
edk2-non-osi
0.0~%ci~%h
- 047bb77
+ 96ec764b947c53595991191458741638117c0c42


*edk2-non-osi*.tar
Index: edk2.changes
===================================================================
--- edk2.changes (revision 2)
+++ edk2.changes (revision 35)
@@ -1,4 +1,61 @@
-------------------------------------------------------------------
+Thu Apr 23 15:22:50 UTC 2020 - Guillaume GARDET
+
+- Add RPi4 platform
+
+-------------------------------------------------------------------
+Thu Apr 23 14:06:48 UTC 2020 - Guillaume GARDET
+
+- Update edk2 to version 202002:
+ * changelog: https://github.com/tianocore/edk2/releases/tag/edk2-stable202002
+ * changelog of 201911 (skipped):
+ https://github.com/tianocore/edk2/releases/tag/edk2-stable201911
+- Update edk2-non-osi to version 0.0~20200421T141136~96ec764
+- Update edk2-platforms to version 0.0~20200421T131746~5a60c2de3c
+
+-------------------------------------------------------------------
+Thu Oct 24 13:49:18 UTC 2019 - Guillaume GARDET
+
+- Update edk2 to version 201908:
+ * changelog: https://github.com/tianocore/edk2/releases/tag/edk2-stable201908
+- Update edk2-non-osi to version 0.0~20191021T153136~243e55f
+- Update edk2-platforms to version 0.0~20191021T153232~03f36b8fcf
+
+-------------------------------------------------------------------
+Thu Jun 27 12:42:48 UTC 2019 - Guillaume GARDET
+
+- Update edk2-non-osi to version 0.0~20190610T165749~eb114ec
+- Update edk2-platforms to version 0.0~20190626T215631~1710027938
+
+-------------------------------------------------------------------
+Fri Jun 7 08:47:23 UTC 2019 - Guillaume GARDET
+
+- Update edk2 to version 201905
+- Update edk2-platforms to version 0.0~20190604T211045~1098e7ec3e
+
+-------------------------------------------------------------------
+Tue May 28 12:31:53 UTC 2019 - Guillaume GARDET
+
+- Switch to _multibuild
+
+-------------------------------------------------------------------
+Tue May 28 11:35:56 UTC 2019 - Guillaume GARDET
+
+- Add Armada80x0McBin platform
+
+-------------------------------------------------------------------
+Mon May 13 08:51:09 UTC 2019 - Guillaume GARDET
+
+- Update edk2 to version 201903
+- Update edk2-platforms to version 0.0~20190513T092206~ffac728623
+- Update edk2-non-osi to version 0.0~20190423T233527~596043f
+- Remove upstreamed patches:
+ * edk2-cve-2018-12181-1.patch
+ * edk2-cve-2018-12181-2.patch
+- Add RPi3 platform
+- Build in DEBUG mode by default
+
+-------------------------------------------------------------------
Fri Mar 8 12:22:47 UTC 2019 - Guillaume GARDET

- Add patches to fix boo#1128503 (CVE 2018-12181):
Index: _multibuild
===================================================================
--- _multibuild (added)
+++ _multibuild (revision 35)
@@ -0,0 +1,7 @@
+
+ Armada80x0McBin
+ hikey
+ hikey960
+ RPi3
+ RPi4
+
Index: edk2-non-osi-0.0~20200421T141136~96ec764.tar.xz
===================================================================
Binary file edk2-non-osi-0.0~20200421T141136~96ec764.tar.xz (revision 35) added
Index: edk2-platforms-0.0~20200421T131746~5a60c2de3c.tar.xz
===================================================================
Binary file edk2-platforms-0.0~20200421T131746~5a60c2de3c.tar.xz (revision 35) added
Index: edk2-stable202002.tar.gz
===================================================================
Binary file edk2-stable202002.tar.gz (revision 35) added
Index: edk2.spec
===================================================================
--- edk2.spec (added)
+++ edk2.spec (revision 35)
@@ -0,0 +1,157 @@
+#
+# spec file for package edk2-hikey
+#
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+%define platform @BUILD_FLAVOR@%{nil}
+%define edk2_platforms_version 0.0~20200421T131746~5a60c2de3c
+%define edk2_non_osi_version 0.0~20200421T141136~96ec764
+%global openssl_version 1.1.1d
+
+# Build with edk2-non-osi
+%bcond_without edk2_non_osi
+
+# Build in debug mode by default
+%bcond_without edk2_debug
+%if %{with edk2_debug}
+%define build_mode DEBUG
+%else
+%define build_mode RELEASE
+%endif
+
+Name: edk2-%{platform}
+Version: 202002
+Release: 0
+Summary: Firmware required to run the %{platform}
+Url: https://github.com/tianocore/edk2
+License: SUSE-Firmware
+Group: System/Boot
+Source0: https://github.com/tianocore/edk2/archive/edk2-stable%{version}.tar.gz
+Source1: edk2-platforms-%{edk2_platforms_version}.tar.xz
+Source2: edk2-non-osi-%{edk2_non_osi_version}.tar.xz
+Source10: https://www.openssl.org/source/openssl-%{openssl_version}.tar.gz
+Source11: https://www.openssl.org/source/openssl-%{openssl_version}.tar.gz.asc
+Source12: openssl.keyring
+#!BuildIgnore: gcc-PIE
+%if "%{platform}" == "Armada80x0McBin" || "%{platform}" == "RPi3" || "%{platform}" == "RPi4"
+BuildRequires: acpica
+%endif
+BuildRequires: bc
+BuildRequires: dos2unix
+%if "%{platform}" == "Armada80x0McBin"
+BuildRequires: dtc
+%endif
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: libuuid-devel
+BuildRequires: python3
+BuildRequires: python
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if "%{platform}" == ""
+ExclusiveArch: do_not_build
+%else
+ExclusiveArch: aarch64
+%endif
+
+%description
+Firmware required to run the %{platform}
+
+%prep
+%setup -q -n edk2-edk2-stable%{version} -a 1 -a 2
+
+ln -sf edk2-platforms-%{edk2_platforms_version} edk2-platforms
+ln -sf edk2-non-osi-%{edk2_non_osi_version} edk2-non-osi
+
+# add openssl
+pushd CryptoPkg/Library/OpensslLib/openssl
+tar -xf %{SOURCE10} --strip 1
+# Fix 1.1.1d error:
+sed -i 's/return return 0;/return 0;/' crypto/threads_none.c
+popd
+
+%build
+%if %{with edk2_non_osi}
+export PACKAGES_PATH=$PWD:$PWD/edk2-platforms:$PWD/edk2-platforms/Drivers:$PWD/edk2-non-osi
+%else
+export PACKAGES_PATH=$PWD:$PWD/edk2-platforms:$PWD/edk2-platforms/Drivers
+%endif
+%if "%{platform}" == "hikey"
+DSC_PATH="edk2-platforms/Platform/Hisilicon/HiKey/HiKey.dsc"
+%endif
+%if "%{platform}" == "hikey960"
+DSC_PATH="edk2-platforms/Platform/Hisilicon/HiKey960/HiKey960.dsc"
+%endif
+%if "%{platform}" == "Armada80x0McBin"
+DSC_PATH="edk2-platforms/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc"
+%endif
+%if "%{platform}" == "RPi3"
+DSC_PATH="edk2-platforms/Platform/RaspberryPi/RPi3/RPi3.dsc"
+%endif
+%if "%{platform}" == "RPi4"
+DSC_PATH="edk2-platforms/Platform/RaspberryPi/RPi4/RPi4.dsc"
+%endif
+BUILD_OPTIONS="-a AARCH64 -p $DSC_PATH -b %{build_mode} -t GCC5 %{?jobs:-n %jobs}"
+# BaseTools does not support parallel builds, so no -jN here
+ARCH=AARCH64 make -C BaseTools BUILD_CC=gcc BUILD_CXX=g++ BUILD_AS=gcc
+
+. ./edksetup.sh
+
+build $BUILD_OPTIONS
+
+%install
+%if "%{platform}" == "hikey"
+%if %{with edk2_non_osi}
+install -D -m 0644 edk2-non-osi/Platform/Hisilicon/HiKey/mcuimage.bin %{buildroot}/boot/mcuimage.bin
+%endif
+%define outdir Build/HiKey/%{build_mode}_GCC5
+%define fd_file BL33_AP_UEFI.fd
+%endif
+%if "%{platform}" == "hikey960"
+%if %{with edk2_non_osi}
+install -D -m 0644 edk2-non-osi/Platform/Hisilicon/HiKey960/lpm3.img %{buildroot}/boot/lpm3.img
+%endif
+%define outdir Build/HiKey960/%{build_mode}_GCC5
+%define fd_file BL33_AP_UEFI.fd
+%endif
+%if "%{platform}" == "Armada80x0McBin"
+%define outdir Build/Armada80x0McBin-AARCH64/%{build_mode}_GCC5
+%define fd_file ARMADA_EFI.fd
+%endif
+%if "%{platform}" == "RPi3"
+%define outdir Build/RPi3/%{build_mode}_GCC5
+%define fd_file RPI_EFI.fd
+%endif
+%if "%{platform}" == "RPi4"
+%define outdir Build/RPi4/%{build_mode}_GCC5
+%define fd_file RPI_EFI.fd
+%endif
+
+find %{outdir} -name *.fd
+
+install -D -m 0644 %{outdir}/FV/%{fd_file} %{buildroot}/boot/%{fd_file}
+
+%files
+%defattr(-,root,root)
+%if %{with edk2_non_osi}
+%if "%{platform}" == "hikey"
+/boot/mcuimage.bin
+%endif
+%if "%{platform}" == "hikey960"
+/boot/lpm3.img
+%endif
+%endif
+/boot/%{fd_file}
+
+%changelog
Index: openssl-1.1.1d.tar.gz
===================================================================
Binary file openssl-1.1.1d.tar.gz (revision 35) added
Index: openssl-1.1.1d.tar.gz.asc
===================================================================
--- openssl-1.1.1d.tar.gz.asc (added)
+++ openssl-1.1.1d.tar.gz.asc (revision 35)
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEhlersmDwVrHlGQg52cTSbQ5gRJEFAl13oWoACgkQ2cTSbQ5g
+RJH0Agf+IekQXtSPsrn/5RMgXFGSyK+S1BpFhyoJRvDocVZAxwgvd4F1fcYkFVXH
+5+Q6o6s6tIDb+VkuIajcDxTQvrFoXKWMbsFsu3NBAan5R0OlYINRYtXULg0ZqQv4
+zxclCSLQTpuMyptuGGbg0/8+9IAhGFk2XSA5EEI+SC6lswRQiT7p6dbULj4CvH3m
+7mqovojAAaEJpgfG8b+L+QBJ4XId99uC6tiLM1tTMCsn1ErLsTd366fzEpC1w12a
+V/gWQ1mVs+bmSRySPx8mO4CpHfhAI+sZrSsWG+UXP9Guf9YKHFLJDiSrX7EmvszR
+B+/LvZqce4iCnwCUoIuYhxM6EybDdQ==
+=v5CI
+-----END PGP SIGNATURE-----
Index: openssl.keyring
===================================================================
--- openssl.keyring (added)
+++ openssl.keyring (revision 35)
@@ -0,0 +1,158 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mQENBFGALsIBCADBkh6zfxbewW2KJjaMaishSrpxuiVaUyvWgpe6Moae7JNCW8ay
+hJbwAtsQ69SGA4gUkyrR6PBvDMVYEiYqZwXB/3IErStESjcu+gkbmsa0XcwHpkE3
+iN7I8aU66yMt710nGEmcrR5E4u4NuNoHtnOBKEh+RCLGp5mo6hwbUYUzG3eUI/zi
+2hLApPpaATXnD3ZkhgtHV3ln3Z16nUWQAdIVToxYhvVno2EQsqe8Q3ifl2Uf0Ypa
+N19BDBrxM3WPOAKbJk0Ab1bjgEadavrFBCOl9CrbThewRGmkOdxJWaVkERXMShlz
+UzjJvKOUEUGOxJCmnfQimPQoCdQyVFLgHfRFABEBAAG0IE1hdHQgQ2Fzd2VsbCA8
+ZnJvZG9AYmFnZ2lucy5vcmc+iQE4BBMBAgAiBQJRgC7CAhsDBgsJCAcDAgYVCAIJ
+CgsEFgIDAQIeAQIXgAAKCRDZxNJtDmBEkWP+B/0SsWSeLGo+viob8935Uirei4Fv
+nzGOUV1w/dgDLSzavmysVxb4q9psp1vj1KEtm18vzZO79AeARGwWTQYGmFmrNRWZ
+2DgbjGyJ4LS5kLBqQ9FaF7vUFtml6R04yx+RTgQTg601XsAjeU8uSarmeZgGVMAI
+nsdMrUc74lJeWKSnovr4IFOdgiU/env19tK355bsfTvb0ksE5Q7wnnoRXdLyNet0
+AWf4ednWDEnRb6cIVDF28URjxH6yIfqAVe7VnuDB4Sfuck4R4gYFS/xGfTgocPUD
+Z4rUz8wleGLwDIiU7GpilmtZTl1FTPkFa/mqbcJgdVTJqLZO5vISJkZvqE5UiQEc
+BBABAgAGBQJUV6uPAAoJEPI0eUVcUbJ8A/4H/2h9ONzArTOEl5y/eN6jJrZc1Af3
+sC/CKxOVBJzpfVnda9O9Ldc4IFJG40ksNWuetDvShQTQtTy7dgne1lkfhud/uUG0
+uo5W2ZoYaHIXOqoC0uxCR3ctOQg5hiVsL5XPjR7YQT+0c/bDK4HWr2GgX7Fo03dt
+8LETRSjovUO2xPb8MFUNc9eZNokLPq9CbOMvmEdbZIt2EEXBOnhktdT0SvXu5E0t
+AC6HqZXAo+my1vSqDxxF9MlpDHysLKIM9G2mvLDbG583pYB3+DEYyr0F/vQIVEb+
+O8qUFaYCFaZKmEhIb3NC4SqLXV24+QKVu2NWtKY7wrg/rsmSI5/DmHVejXeJARwE
+EwECAAYFAlRX/6sACgkQumzaRh/o4CMu2AgAl1Th443nVuobOv3tKlC89l0m048J
+LG7fg8uMV0ejogQ7MAHkzQt/9uq5pQfDEtuIdLaoKqz93RtPECXfj/cBUT5iEkWl
+PmOOR4UXfKUahU3qHED9+niOmlip3vZII/92oGSHv4KXPHZHOFUPn+nvaNypnIWG
+TUJODueW9neoa+D8y3CC0KlZ9jTbwxSHVWTZjo8pezpJ1Fr4tE9bDibkWEm3pIcp
+demSodBatNliSFcj/VeOF2AV4ABSKH0PGSrZazrefdTKPGiz01ZHmPAb6qsbLd66
+94/brzuVz9YhoSRJCTqSmXmEowPbs8TsjfMeSQkkx4STSr86+DNYmG3Kc4kCHAQQ
+AQIABgUCVDuigAAKCRDfq1kqvdUvHHktD/9je36p4LXhLda0+NqWsh1Vm9dC9RxM
+023LqwoMNw6khLiLzzhmXKyazvV/q/lidPYCr3rWR3tCrmEkULogHf60unBghxYH
+xva5XvObFDVXDmMBTP2M3XvKIAQXhNk9I22HtfgYTIhI2Bs/D7HDFgszoBurLLQK
+l+rjDevDbeWbdXJZ7J4Z63kb0GaIIHnNXnvxWo7muomXfdKJEL8LIlmeUOh/ZYcI
+u8HMoGvDKYMeRZ9ph7f2Z7iJDCUmtMauLM/qPP9wiyzZKZE/wwapWkWL1KgAC+vt
+hwrFzcirkhvI2rnWUOeec+nEjmnnnPzA5tDtpyOQYqkcIf9hewkfA6l9js3fbf1i
+jCluP+nZjsbYb7MO9IT+bBQ1Jm0tjwu8MiX3HJZGl8CNBzk0UXImIl+0kSzSAnQg
+MK6EweTzDkCMIjVLRQAmpNw/8smvzu4JF3bX+w1S1MWZ5NNebCT5hs4kVhXT8Uvw
+TLmdt+afRpxtlKFxhJ05v6lNgV1o8CaOm1tmmgyqWM53/nGUi1XqtXu1+0uoO65f
+JMoJOjCoK+tHzNUvyoPmU/qhyCC0yftZHA0k1BRaI7Kf0ll+i+8laJceFlFr+k6/
+Be2Mzp/C/3KyK04nU3/jY9oyUKAjq5D1mb/Ht5TWEOPoSuUtlqzgWWpNxJWTq0xe
+jsLg/e/q5z7mR4kCHAQQAQIABgUCVDumsQAKCRDV6eQ/ffnujDUSD/9ar/zoYKhJ
+/SsEuhEZ+taED4YRgKy0eeaT7YPqtmGVcs4meww06Og9L9FeK/8Qn/pa3xnFtTvX
+K6XriSLly4DtmAZnwmtARidgXeXp+hfjEoeIXoAUpY88Af4FQhIkmJwcWRZYtM6x
+/Gno8+LyzQGrGNmeoNNLJ5t7RsvBHYRR44LQNbGpv8dN0LTOAWKCmnGmNn5cN9Uq
+BvrgJRsJvvBRtF/V53Y5giHX4N9C4VT21odQ4sEq3HrsofwEWDHnl0hEoWOpu3zu
+AcxsAdm4A113z2+WnTLcQnCRjmG7mGpDStLTiBcw45MsGOLnR2CgtNXEQOYp97/C
+wkgNF5rUyx/Owr63uw0EWOFkaqDWd8KPt4ZTmOcOUChVnEyFCXu9F3oD2ypbaM5O
+ielMwj3Uq8Br5c21g0qCeDAIUaNQLl6cFfPtD6jDiYNhVBgOGrlvHyGP3+mm+Ix3
+w2CpKmHv6z0ed2XWqQElBuOr2I8vcSos8SAK5oJz50t1joLP5PQ4T/FlbBBfXYgW
+PtEGsae9K/cXVSV6NSxcfXDtNggfDG1S4AkwH1Ka96AtrGutJCPm1xSMpMJ7m3+G
+5EfEqHnF5lnn/By+gZTvC+nnqGM4UolcAyz6FFVha/CtfoYBiXekUXnz6dDEgxm5
+fA7CVeo+TDg4LgvvHh+P+EuJKQ4lQqGQl4kCHAQQAQIABgUCVEJylwAKCRBDFxH3
+bRiS9VfrD/9yo5fWTBHdCMAVRsLa/rKSk0oB2jKXg+5Jo1m/FM3UF4JibDor8VLo
+TgKUXTn2eyqX3Dr6/3UiGFzU43kg+IG9ZdCLx8FwGAEo0MA7Tef7W0Drq00kAdVy
+dhS+1gi4NZc4Hj+rSYcYkto2/e+zlSmD5CB3X3kgTK3+qv7bQbGlLMxZfP1sWsUd
+jI2gWpxIeqqUZXM1CwIzqXWFEktKTov2CRLftk3pSQ6pS4sw60dpq2+e7EeARZfp
+WIHAG8PXCgbq2M8mhAZ1NADWgXRPHCN3MeDV3qM5Lj6ov2/i3Crmy1IV5Bxt6QLD
+A04Sbv5TpJ1tecriW2wTWUU3b/QWzFuCS+FUNSKWJe7tbQJyWQY+BtVZsMeFdjiY
+B8QrUY5WOc97tgBVXZG7+5ustM5d0VDk83sHnQrGxPVqQq57Pwi1JFTxM7YDzePX
+3KZVNXi5NR+EI69+Ej3cBRKpOUdAsq7ywKzlqiYtpcZD/uzJKi0F+AyOKLPFG4Ny
+f8eGqr75tDAXqdoE4fu6IKSybc3MKlX9+LiDyTlQmgoZIRmczHPfbCBQQln7NNk/
+6BegL87/yJYSZuR10SLzRNdYa2E1wliPZezrUxu6Y4OeYEIxL0/w6j7I1YFGqwR4
+83B2SdTXC1NKQVDUR6tbm/oDhNVo7mZ4VjUFJ7oS8en5+rbNv30svokCHAQQAQoA
+BgUCVD7PygAKCRAgZMU2QcJeXYG/D/9KUEi7mN50xURhILUp7KKJnS3WbGP32N+/
+/XXr1QIEiOuRhbCBp49Y9/Q9TGYFYGm42ClkMyGLW9Dp7zcyejjVrVRO5srQ5e9g
+q5IPgfeoa6Wu301YzsvO3RBa10dg9thA6HJsDlU+vyCnU8fKThdSS1aaYtBqEAUJ
+IzdFK0KIShqHyjKB31iVg2NL8AziBKHWIqr5Tyh84DFRuT+PAwwSYW5sy5j9wsyX
+FK1ZAfkmS9fJsrr3n0l9KsUYW8dJzLcdEmtS+dbJLAPrqbhssK1wk/NE1/N+8+Y6
+ocegn2lFfMheA6s+d1ejBnk0angY8ZGgLIvCuB/iTfivDefqM2KtbQBOqbw6rf3B
+TLlVVfiCbFo/RJgxoAQTKs4D+OH8RnWoNANoIOitpIpieBD2I0pFmVDob9sh0toV
+Hk8aDO6s6lNoEiLEJVWoh/6+qxsRX/rDAGyWO+4Oz6ctyS/laQjT2FxLGODZBMxj
+XrdyRXrC/nIcwYUlFfB3xX54xAo1j38OIauO9u93338LFLYAcpHhkW78nmkRxNa5
+SjiribecDj5/bzOI7G7gfTCKmEkUuZltCrG5MwSHorhGP/v8M+TeLsjkvzgm1Hd6
+0pf1+NXOPbZpiCq1S/yIs1zBEj1Q1t1PuJT+BYkOzlR/RhSJFSY/B4dBA+HxN/cY
+KzwNZN88HLQfTWF0dCBDYXN3ZWxsIDxtYXR0QG9wZW5zc2wub3JnPokBOAQTAQIA
+IgUCU96+vAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ2cTSbQ5gRJGg
+PQf/WUQld+vrqt2+yTI6LTNTQBG9RceNuaZiRnsROR1eHtVr9OOfzVPenCavcXgh
+wsY0sPPgSDrvFur9PyuuwQ87HmdX+ZGdRP3tSaxC4udHbAsZtEG7bgUozuhfcpC+
+Ah0lZ3EccmyOkYJWITWYgUBEDOU37qne09udDMA2NHLuL89hT+eIZ2pVwyFydkJf
+kXtgfrDq3RmZgfebVB5ESdap/G7t7Iewi95syApMj9swbxnsqUtmFr0fCsVdAA8h
+JPqx9zVuUon0g1QMz2IroNH+6WTDt7SGYcuqNapizk/PJd6g2ew9cm3r3CIANiqP
+go0Mh02nVGgX2p9vWcT4MzquBokCHAQQAQoABgUCVD7PygAKCRAgZMU2QcJeXSx6
+EACM2ZWwnTz0FwLaQfqcAUEUee2rX03GwXgZsw00fIv+IRtCGvZ+c5OyP6Blujb+
+gylHK6sohL/JBqPO6y49HlQ+VOjo2iFzeFdoC8No936fKxfvM1NeocsXShb1rXak
+LDtiUj3UEqFbfdwrt7s6xqpNF6cEcci8sE8vGTSazNePui0C9NqV5Gh924MCNTwC
+EasEhXvyurKB8Sgo2X5lH3OutDlHnUuiNtJ10n8rRNe87ZKgKcPahjpsMKC87rqK
+55/sGLdqAndyXmnasHUKEd7bwQzq396SZgdKxlEruwQPyrecjaqf0CpHhGVsTpCi
+78IQ7jR6xZWdBBAAn6SeFKfxnDypx5thqXsWDRrzH5gTXAqN3BNUluTn0gQgqGVx
+dU5/uY0fHXlXjjyS/CcEBQlhMeMbXvnWCQ+IGOToRedpUwTENB1+TkdUz/RuQm/U
+EP2Lmkfx4XDj+R+lgbftQ6cfJtZccmvh+euWRcbJUlPXIeM6DJVRaL700R1VHrSi
+2oPXQi9YcMlyzh4BZ9fe3DIBiIDBDOURMGB75ULlCxi39H1H2Anf0/E11aPOOkr7
+oavD6AVziihQJ8LqNI2obdX+UwivoU35NXZMCifmTOcCbrCxw+Xih+X6EPC0qwhR
+pDevf7mqWxWVyu30hLv3YJOgmHEh+++GRzS7SL9iovev+4kBHAQQAQIABgUCU/p2
+2gAKCRA1IssGdHjPYDuZB/9arXoSdE0WGasdEfG+Qup0lL2rsfAYYXyCP08wVsZ0
+pBVmoby+hpIHEkcVH47Au+lYW9UTrvK3yMKEhSrxTzA9LIjC9Q0Mfms1CEo9oRa8
+2p2jM9Yy9thCMR21Xhq/GmCkaKuR3oK5ofMXngTf4eyMwCQYPcYhL69OVx+/60w0
+DbG6/nJ553Rd0qDTGxjk/gzji4VYe0rJcATZSIO5TjJdd2VATkDDvRWa2asvMMN+
+CcPL6U2iZi8g4s413CmImz5W8/u7R2v7dkRJ0FLbP3+OAiHFD6n7uD0WAhZKT4+H
+HSKbOnh6mMnyGMnyn2N5IvrEL3FM0cflUrKfqnbFa/KyiQEcBBABAgAGBQJUV6uP
+AAoJEPI0eUVcUbJ8OaoIALRdJKgFzcsDqtX4SeJpefJ4796u8O5B7w/16nXwOw7i
+2lDUpmz9+bwEliVOc8etFCRvB6nl/NSq8OUCdha5MIIJVoJn3EWz4LNHCcplxE0g
+zHfVMBaV8eB/+AEyvJ6QlaeN+PKBW3VPPGHxnBQBDdXmfIh2ceAkB9pCU6zN/lHV
+95fs+E3X028OAaN/uwbyaJYCmWxRYOA0nIA7A9C2UWugrnka1qISR6XtiOhjTe9u
+G9/K9FclJueW0FnFVXXwl+/O0epy4oOq199UoJvF0FEDChNvnAjjrS1iUOxGcvJ7
+/sSgCV3t8sYyNm+euCCXbKTdF5iPkpRvpSKauPjO5nmJARwEEwECAAYFAlRX/6sA
+CgkQumzaRh/o4CM5egf+J/+ia/Iqes82Gd5Q5I+I9yrNy+itjtEpBHNX3XrT+iJH
+BrRfVUN2MGW/ovElEOkxo7ZuA6c5zSnPBqsrzuLdacFR5LNMVrE2i5B7H5bcMGJ9
+AZPXud1YBTzbGaKCzdVnvW9EnrYSQK5eiDTQkPPJiHjrvz1QLrng7AJUFfWm4/xh
+RchpPT8cVHBRP7qAInkP1IYJ7dVDKOJRFsEM7J1Jx5M6vmSi1du1IvNsSeD19+8a
+fyWc5q88fJRx/DlRZ+y/R4OH8wj4fbwRwuMTqWLXAlY4A8r0AGXYhR5BN4jKZAyx
+pyq7hY64D9WNhojqYRYwxOADWn9GqxMfSesSCr1gzokCHAQQAQIABgUCVDuigAAK
+CRDfq1kqvdUvHGVQD/9WuFZgc24DIw3mAJKk2dNG+zIEmJx+EKRTqhwrs97y48xP
+0KWKGtmuEwx6fHDhBnHiOB41pixk2GD7K0XGy9sqTL3PBINgECgEPEhkmSLATqrp
+bYFA6IiAGlDtc7ySZ3qlajUgLGoUTuen5HfMxrF8waldv1IUm2MarkCYShz7/RD8
+Zq6VpnkqNAlUch9f3hnZgRI2MpuTRl2aij/vtPVzg01t5KFvfZLYI8OkJx57A1L+
+/8w6BEmKyC5WhNEEaH9uF5qhnZjZHsien7BZS7Tvkgb+6OMowS3ShNqUH3A2YVbW
+AupaLq1nRwvs7rTWDuoRMVZGGUm0SM08TUKkl16hWxsAJEzCCdVxO+8l5Ul26LkC
+KJLdeFPrJmutgQnPJOQ6Q/EsYYua3iNAbJp+hZ9quw0R0oiyO5b7Cn8P9KffpiY0
+01GQ4SqYrll80WJn1kUWp+QqvIvZC595aVmF9Fplqp24qXdXt2OMhzZF6FdSB0GS
+xplHgjR866XD2EjH6RgHZ/PTUYI9zjEEro2gk/BG5dshSa42nBkD+aJfmvjQ4CDI
+sccsHdYlLdtvujsN0F/rFRRKdIAPZhnbVB45AqNL81AUDEaXXWa93GyW58GjZy0i
+l29i0Zg/hMn7vhqt3pZY8GL9ND3J90rJuvls/zmeITIUR3wDH20ZdTw07P62RIkC
+HAQQAQIABgUCVDumsQAKCRDV6eQ/ffnujPWzD/43HZVkH0GTm9LpXlEvXGNGTmce
+y5majqUTmEOmqD2j3wJZZatW8uOCDCclKdjcwiL3B1DOZbrtVZqit4mK6uhxN/MW
+lgPnH3lO8o3xtmLNED3POZXkTUD1+VkOJRFiekg9Y9tVAn5CfUlu8/V/1p0smBvI
+HArJmhgpOy4ZzGtMTrlJHxNCuxlj+IAGL48xw+3zIrgpjuUoGHZwiLO0+bTls3Tt
+/xUvPH192OQlbBWIrby2uGfjaoM+iiRuuvztYzd/BpxLlbU61E7yYe9T/9Or35jh
+40T20KC9Ugv9etHER5QdtoNxrXJhkBGfGz9av/apTTgEuG2WeSlyFlom2scfuEsV
+XwXIHHewv9Hqpr9yIEi5vwSwEtn5/FFoAUl5cY3hN+6BMUTn7DEOIrKjuzyOwPTM
+mrS+BL8nUg/FgiO6KvdNBHMwW2cB97DTCo3ThL0Hr87i3J8bg0mB7jUIWcldAox2
+5vsKdGo9UBygEtHIHPojc5n3ludmeMpkMdM7pI8WvWfHqiOstaJhyyfWw+0RWr/c
+n5e2RaK9Ieef5PwCn6yrFmzR/KOnSV34XkBgfzMBf8J3OJzDZXDuZzw9ns/3fU25
+om3OsiCDLuXkRESLBCYBbYnenWiaUacDOkS+DqLw9P9SsPWIKOaz0cVnbPmZFIzu
+67KxPiPHmY9DZ0xuFYkCHAQQAQIABgUCVEJylwAKCRBDFxH3bRiS9VzQEACuEjJC
+doXPGk+e8orcS1Xq7/Y4FbtChfuYaqjreccV1fmTmY7EPMj6YARyVslM39TcwDwN
+gYhZ52pn7BtAGUVoz+p+A+kEerwUE2Id7J3yViH0kFk2ar3FZTUXA8rp3HhBKOZj
+P+d0FBEzTCEhS44s3SyoD+ByY7jZeTg0F9f2p4HBoEeEbTBcOR1fJv0NG/A+5lsc
+zfD6YDgJsT9C3TCLKV4AMRy/wDZjkHMoXYB0ttXASlFzjsMGsy0FwbgyAdg9XIIt
+7jrDuWHy9M9eVHCp8JBW+gEMq116Jmq1FT7/5VMBdK+o1fiU5zRRAPdYGfr9PWy5
+ygH7g6nl/jFV5XmRnnrgL7etWI07pjpoPWqHqjUTGg5UbnzMfRk9TnPBAJGXFJIw
+S2QszDEU3ApESc14NHrUUYVH4GvyeG5DYKZlz7HCpwtdpoYJ4DL2adE8U8qUmQkc
+izaoE8x8rf0h6qrQcOOw4H1vX/RdhDtxbcK/fOgaHeQYOa5+lcNAlE7lU3z/bl6f
+iB2hWlQdyzajceEoFJpxMm+QvRV/Z3wmwWeVPjZexFChbQVtaGagPJxXhid7rc2T
+o8egQq5gAAfUOPwB5YWnvmFnmq3o1zCy5wZGUcm9aU0/sNZjBa9J7Fisv6uCQblQ
+HA90wVUJ351GEm5Nh+j8oOpNafAgVim/zTaYS7kBDQRRgC7CAQgAz2dQkASmxUFj
+Ar3Y8/0yWjX961enomAEjryw4InFPDMGttPMiV69VBepb3N04MPo5spyAY24b4bo
+3Cfng/oxxGl3Z3Giv1gD7JojTJPoJWeHGxePBz++5Di0EAvq1+4wBdFUh4RWTbZw
+qTgckHrwiZcIJF3JGL0cgTmJOtkewcLiyMCyKuGVzSjyFTeCqQqHYSHBrr5TyXM3
+HTqGgURnEhVG16jPWPMIciYXsRfO0RwMhqY7y5yRUoC4psmAUaRTduS82BaVzw+D
+Hi1FQ0kYLUsTidippITB57VKkD9V7CIM5uP3s+jMJMXNEJQEKdK9oCVOekD3ROc4
+Mftqv4vloQARAQABiQEfBBgBAgAJBQJRgC7CAhsMAAoJENnE0m0OYESRCzYH/3pc
+H2HIWlf9uG7jVg2vudIDrl0OL134+Qyq8ummJyQbdVHjFdbLDMQlPDpbYM0zIU7q
+Y611daA12AMXscpli8cGvqnK20sAw/sF9YG9Tthjn24qZRJzm+XQ3OxpJvHk8NJA
+SRIgIsj7+EjC4Rc5vpnuA6tfsXW7LzdOYcU46MPaYuXmKxTMWFotWTR9lJj6YKCD
+f+KdvBvyDfX3VhuTYt9ead1oSx0TMwutPSDrAiCbJvPpR1W5U99I8aXLRVZUAbWw
+084KkC4mk1Xr5XGt1WIDHe9A9vHdfOoMVLUhKWd3SpL/tFfAy4UOlUf8EO/NByiK
+RaelFj+Wg8aRKDhMHto=
+=m5FY
+-----END PGP PUBLIC KEY BLOCK-----
Index: edk2-cve-2018-12181-1.patch
===================================================================
--- edk2-cve-2018-12181-1.patch (revision 2)
+++ edk2-cve-2018-12181-1.patch (deleted)
@@ -1,236 +0,0 @@
-REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1135
-
-Contributed-under: TianoCore Contribution Agreement 1.1
-Signed-off-by: Ray Ni
-Cc: Dandan Bi
-Cc: Hao A Wu
----
- MdeModulePkg/Universal/HiiDatabaseDxe/Image.c | 126 ++++++++++++++----
- 1 file changed, 103 insertions(+), 23 deletions(-)
-
-diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
-index 71ebc559c0..80a4ec1114 100644
---- a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
-+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
-@@ -16,6 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
- #include "HiiDatabase.h"
-
-+#define MAX_UINT24 0xFFFFFF
-
- /**
- Get the imageid of last image block: EFI_HII_IIBT_END_BLOCK when input
-@@ -651,8 +652,16 @@ HiiNewImage (
-
- EfiAcquireLock (&mHiiDatabaseLock);
-
-- NewBlockSize = sizeof (EFI_HII_IIBT_IMAGE_24BIT_BLOCK) - sizeof (EFI_HII_RGB_PIXEL) +
-- BITMAP_LEN_24_BIT ((UINT32) Image->Width, Image->Height);
-+ //
-+ // Calcuate the size of new image.
-+ // Make sure the size doesn't overflow UINT32.
-+ // Note: 24Bit BMP occpuies 3 bytes per pixel.
-+ //
-+ NewBlockSize = (UINT32)Image->Width * Image->Height;
-+ if (NewBlockSize > (MAX_UINT32 - (sizeof (EFI_HII_IIBT_IMAGE_24BIT_BLOCK) - sizeof (EFI_HII_RGB_PIXEL))) / 3) {
-+ return EFI_OUT_OF_RESOURCES;
-+ }
-+ NewBlockSize = NewBlockSize * 3 + (sizeof (EFI_HII_IIBT_IMAGE_24BIT_BLOCK) - sizeof (EFI_HII_RGB_PIXEL));
-
- //
- // Get the image package in the package list,
-@@ -671,6 +680,18 @@ HiiNewImage (
- //
- // Update the package's image block by appending the new block to the end.
- //
-+
-+ //
-+ // Make sure the final package length doesn't overflow.
-+ // Length of the package header is represented using 24 bits. So MAX length is MAX_UINT24.
-+ //
-+ if (NewBlockSize > MAX_UINT24 - ImagePackage->ImagePkgHdr.Header.Length) {
-+ return EFI_OUT_OF_RESOURCES;
-+ }
-+ //
-+ // Because ImagePackage->ImageBlockSize < ImagePackage->ImagePkgHdr.Header.Length,
-+ // So (ImagePackage->ImageBlockSize + NewBlockSize) <= MAX_UINT24
-+ //
- ImageBlocks = AllocatePool (ImagePackage->ImageBlockSize + NewBlockSize);
- if (ImageBlocks == NULL) {
- EfiReleaseLock (&mHiiDatabaseLock);
-@@ -701,6 +722,13 @@ HiiNewImage (
- PackageListNode->PackageListHdr.PackageLength += NewBlockSize;
-
- } else {
-+ //
-+ // Make sure the final package length doesn't overflow.
-+ // Length of the package header is represented using 24 bits. So MAX length is MAX_UINT24.
-+ //
-+ if (NewBlockSize > MAX_UINT24 - (sizeof (EFI_HII_IMAGE_PACKAGE_HDR) + sizeof (EFI_HII_IIBT_END_BLOCK))) {
-+ return EFI_OUT_OF_RESOURCES;
-+ }
- //
- // The specified package list does not contain image package.
- // Create one to add this image block.
-@@ -902,8 +930,11 @@ IGetImage (
- // Use the common block code since the definition of these structures is the same.
- //
- CopyMem (&Iibt1bit, CurrentImageBlock, sizeof (EFI_HII_IIBT_IMAGE_1BIT_BLOCK));
-- ImageLength = sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) *
-- ((UINT32) Iibt1bit.Bitmap.Width * Iibt1bit.Bitmap.Height);
-+ ImageLength = (UINTN) Iibt1bit.Bitmap.Width * Iibt1bit.Bitmap.Height;
-+ if (ImageLength > MAX_UINTN / sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)) {
-+ return EFI_OUT_OF_RESOURCES;
-+ }
-+ ImageLength *= sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL);
- Image->Bitmap = AllocateZeroPool (ImageLength);
- if (Image->Bitmap == NULL) {
- return EFI_OUT_OF_RESOURCES;
-@@ -952,9 +983,13 @@ IGetImage (
- // fall through
- //
- case EFI_HII_IIBT_IMAGE_24BIT:
-- Width = ReadUnaligned16 ((VOID *) &((EFI_HII_IIBT_IMAGE_24BIT_BLOCK *) CurrentImageBlock)->Bitmap.Width);
-+ Width = ReadUnaligned16 ((VOID *) &((EFI_HII_IIBT_IMAGE_24BIT_BLOCK *) CurrentImageBlock)->Bitmap.Width);
- Height = ReadUnaligned16 ((VOID *) &((EFI_HII_IIBT_IMAGE_24BIT_BLOCK *) CurrentImageBlock)->Bitmap.Height);
-- ImageLength = sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) * ((UINT32) Width * Height);
-+ ImageLength = (UINTN)Width * Height;
-+ if (ImageLength > MAX_UINTN / sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)) {
-+ return EFI_OUT_OF_RESOURCES;
-+ }
-+ ImageLength *= sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL);
- Image->Bitmap = AllocateZeroPool (ImageLength);
- if (Image->Bitmap == NULL) {
- return EFI_OUT_OF_RESOURCES;
-@@ -1124,8 +1159,23 @@ HiiSetImage (
- //
- // Create the new image block according to input image.
- //
-- NewBlockSize = sizeof (EFI_HII_IIBT_IMAGE_24BIT_BLOCK) - sizeof (EFI_HII_RGB_PIXEL) +
-- BITMAP_LEN_24_BIT ((UINT32) Image->Width, Image->Height);
-+
-+ //
-+ // Make sure the final package length doesn't overflow.
-+ // Length of the package header is represented using 24 bits. So MAX length is MAX_UINT24.
-+ // 24Bit BMP occpuies 3 bytes per pixel.
-+ //
-+ NewBlockSize = (UINT32)Image->Width * Image->Height;
-+ if (NewBlockSize > (MAX_UINT32 - (sizeof (EFI_HII_IIBT_IMAGE_24BIT_BLOCK) - sizeof (EFI_HII_RGB_PIXEL))) / 3) {
-+ return EFI_OUT_OF_RESOURCES;
-+ }
-+ NewBlockSize = NewBlockSize * 3 + (sizeof (EFI_HII_IIBT_IMAGE_24BIT_BLOCK) - sizeof (EFI_HII_RGB_PIXEL));
-+ if ((NewBlockSize > OldBlockSize) &&
-+ (NewBlockSize - OldBlockSize > MAX_UINT24 - ImagePackage->ImagePkgHdr.Header.Length)
-+ ) {
-+ return EFI_OUT_OF_RESOURCES;
-+ }
-+
- //
- // Adjust the image package to remove the original block firstly then add the new block.
- //
-@@ -1219,8 +1269,8 @@ HiiDrawImage (
- EFI_IMAGE_OUTPUT *ImageOut;
- EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer;
- UINTN BufferLen;
-- UINTN Width;
-- UINTN Height;
-+ UINT16 Width;
-+ UINT16 Height;
- UINTN Xpos;
- UINTN Ypos;
- UINTN OffsetY1;
-@@ -1280,6 +1330,13 @@ HiiDrawImage (
- // Otherwise a new bitmap will be allocated to hold this image.
- //
- if (*Blt != NULL) {
-+ //
-+ // Make sure the BltX and BltY is inside the Blt area.
-+ //
-+ if ((BltX >= (*Blt)->Width) || (BltY >= (*Blt)->Height)) {
-+ return EFI_INVALID_PARAMETER;
-+ }
-+
- //
- // Clip the image by (Width, Height)
- //
-@@ -1287,15 +1344,23 @@ HiiDrawImage (
- Width = Image->Width;
- Height = Image->Height;
-
-- if (Width > (*Blt)->Width - BltX) {
-- Width = (*Blt)->Width - BltX;
-+ if (Width > (*Blt)->Width - (UINT16)BltX) {
-+ Width = (*Blt)->Width - (UINT16)BltX;
- }
-- if (Height > (*Blt)->Height - BltY) {
-- Height = (*Blt)->Height - BltY;
-+ if (Height > (*Blt)->Height - (UINT16)BltY) {
-+ Height = (*Blt)->Height - (UINT16)BltY;
- }
-
-- BufferLen = Width * Height * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL);
-- BltBuffer = (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *) AllocateZeroPool (BufferLen);
-+ //
-+ // Prepare the buffer for the temporary image.
-+ // Make sure the buffer size doesn't overflow UINTN.
-+ //
-+ BufferLen = Width * Height;
-+ if (BufferLen > MAX_UINTN / sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)) {
-+ return EFI_OUT_OF_RESOURCES;
-+ }
-+ BufferLen *= sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL);
-+ BltBuffer = AllocateZeroPool (BufferLen);
- if (BltBuffer == NULL) {
- return EFI_OUT_OF_RESOURCES;
- }
-@@ -1358,11 +1423,26 @@ HiiDrawImage (
- //
- // Allocate a new bitmap to hold the incoming image.
- //
-- Width = Image->Width + BltX;
-- Height = Image->Height + BltY;
-
-- BufferLen = Width * Height * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL);
-- BltBuffer = (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *) AllocateZeroPool (BufferLen);
-+ //
-+ // Make sure the final width and height doesn't overflow UINT16.
-+ //
-+ if ((BltX > (UINTN)MAX_UINT16 - Image->Width) || (BltY > (UINTN)MAX_UINT16 - Image->Height)) {
-+ return EFI_INVALID_PARAMETER;
-+ }
-+
-+ Width = Image->Width + (UINT16)BltX;
-+ Height = Image->Height + (UINT16)BltY;
-+
-+ //
-+ // Make sure the output image size doesn't overflow UINTN.
-+ //
-+ BufferLen = Width * Height;
-+ if (BufferLen > MAX_UINTN / sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)) {
-+ return EFI_OUT_OF_RESOURCES;
-+ }
-+ BufferLen *= sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL);
-+ BltBuffer = AllocateZeroPool (BufferLen);
- if (BltBuffer == NULL) {
- return EFI_OUT_OF_RESOURCES;
- }
-@@ -1372,8 +1452,8 @@ HiiDrawImage (
- FreePool (BltBuffer);
- return EFI_OUT_OF_RESOURCES;
- }
-- ImageOut->Width = (UINT16) Width;
-- ImageOut->Height = (UINT16) Height;
-+ ImageOut->Width = Width;
-+ ImageOut->Height = Height;
- ImageOut->Image.Bitmap = BltBuffer;
-
- //
-@@ -1387,7 +1467,7 @@ HiiDrawImage (
- return Status;
- }
- ASSERT (FontInfo != NULL);
-- for (Index = 0; Index < Width * Height; Index++) {
-+ for (Index = 0; Index < (UINTN)Width * Height; Index++) {
- BltBuffer[Index] = FontInfo->BackgroundColor;
- }
- FreePool (FontInfo);
Index: edk2-cve-2018-12181-2.patch
===================================================================
--- edk2-cve-2018-12181-2.patch (revision 2)
+++ edk2-cve-2018-12181-2.patch (deleted)
@@ -1,42 +0,0 @@
-REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1135
-
-For 4bit BMP, there are only 2^4 = 16 colors in the palette.
-But when a corrupted BMP contains more than 16 colors in the palette,
-today's implementation wrongly copies all colors to the local
-PaletteValue[16] array which causes stack overflow.
-
-The similar issue also exists in the logic to handle 8bit BMP.
-
-The patch fixes the issue by only copies the first 16 or 256 colors
-in the palette depending on the BMP type.
-
-Contributed-under: TianoCore Contribution Agreement 1.1
-Signed-off-by: Ray Ni
-Cc: Liming Gao
-Cc: Jiewen Yao
----
- MdeModulePkg/Universal/HiiDatabaseDxe/Image.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
-index 80a4ec1114..8532f272eb 100644
---- a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
-+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
-@@ -370,7 +370,7 @@ Output4bitPixel (
- PaletteNum = (UINT16)(Palette->PaletteSize / sizeof (EFI_HII_RGB_PIXEL));
-
- ZeroMem (PaletteValue, sizeof (PaletteValue));
-- CopyRgbToGopPixel (PaletteValue, Palette->PaletteValue, PaletteNum);
-+ CopyRgbToGopPixel (PaletteValue, Palette->PaletteValue, MIN (PaletteNum, ARRAY_SIZE (PaletteValue)));
- FreePool (Palette);
-
- //
-@@ -447,7 +447,7 @@ Output8bitPixel (
- CopyMem (Palette, PaletteInfo, PaletteSize);
- PaletteNum = (UINT16)(Palette->PaletteSize / sizeof (EFI_HII_RGB_PIXEL));
- ZeroMem (PaletteValue, sizeof (PaletteValue));
-- CopyRgbToGopPixel (PaletteValue, Palette->PaletteValue, PaletteNum);
-+ CopyRgbToGopPixel (PaletteValue, Palette->PaletteValue, MIN (PaletteNum, ARRAY_SIZE (PaletteValue)));
- FreePool (Palette);
-
- //
Index: edk2-hikey.changes
===================================================================
--- edk2-hikey.changes (revision 2)
+++ edk2-hikey.changes (deleted)
@@ -1,59 +0,0 @@
--------------------------------------------------------------------
-Fri Mar 8 12:22:47 UTC 2019 - Guillaume GARDET
-
-- Add patches to fix boo#1128503 (CVE 2018-12181):
- * edk2-cve-2018-12181-1.patch
- * edk2-cve-2018-12181-2.patch
-
--------------------------------------------------------------------
-Mon Nov 26 15:06:50 UTC 2018 - Guillaume GARDET
-
-- Switch to upstream edk2 release
-- Use a template file to add more platforms easily
-- Remove all patches:
- * gcc7.diff
- * edk2_genvtf_gcc8.patch
- * edk2_genvtf_gcc8.diff
- * ovmf-pie.patch
-
--------------------------------------------------------------------
-Sun Jun 24 00:16:04 UTC 2018 - afaerber@suse.de
-
-- Revert to gcc7
- gcc7.diff
-
--------------------------------------------------------------------
-Tue Jun 12 23:52:51 UTC 2018 - afaerber@suse.de
-
-- Try to fix gcc8 build
- edk2_genvtf_gcc8.patch
- edk2_genvtf_gcc8.diff
-
--------------------------------------------------------------------
-Thu May 31 20:58:04 UTC 2018 - afaerber@suse.de
-
-- Update sources
-
--------------------------------------------------------------------
-Thu Feb 8 10:55:58 UTC 2018 - afaerber@suse.de
-
-- Update sources
-* Drop OpenPlatformPkg_uart_fifo.patch (upstream)
-
--------------------------------------------------------------------
-Wed Feb 7 17:17:52 UTC 2018 - afaerber@suse.de
-
-- Build HiKey, too
-- Fix arrow keys (b9o#659)
- OpenPlatformPkg_uart_fifo.patch
-
--------------------------------------------------------------------
-Sun Jan 7 16:06:59 UTC 2018 - afaerber@suse.de
-
-- Update to edk2 2.5 + OpenPlatformPkg 1.3.4
-
--------------------------------------------------------------------
-Mon Dec 26 08:01:27 UTC 2016 - afaerber@suse.de
-
-- Initial
-
Index: edk2-hikey.spec
===================================================================
--- edk2-hikey.spec (revision 2)
+++ edk2-hikey.spec (deleted)
@@ -1,109 +0,0 @@
-#
-# spec file for package edk2-hikey
-#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
-#
-
-
-%define platform hikey
-%define edk2_platforms_version 0.0~20181123T185023~397bbafdbf
-%define edk2_non_osi_version 0.0~20181120T112747~047bb77
-
-# Build with edk2-non-osi
-%bcond_without edk2_non_osi
-
-Name: edk2-hikey
-Version: 201811
-Release: 0
-Summary: Firmware required to run the HiKey
-License: SUSE-Firmware
-Group: System/Boot
-Url: https://github.com/tianocore/edk2
-Source0: https://github.com/tianocore/edk2/archive/edk2-stable%{version}.tar.gz
-Source1: edk2-platforms-%{edk2_platforms_version}.tar.xz
-Source2: edk2-non-osi-%{edk2_non_osi_version}.tar.xz
-#!BuildIgnore: gcc-PIE
-BuildRequires: dos2unix
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: libuuid-devel
-BuildRequires: python
-# PATCH-FIX-UPSTREAM: CVE 2018-12181: boo#1128503
-Patch1: edk2-cve-2018-12181-1.patch
-Patch2: edk2-cve-2018-12181-2.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch: aarch64
-
-%description
-Firmware required to run the hikey
-
-%prep
-%setup -q -n edk2-edk2-stable%{version} -a 1 -a 2
-
-dos2unix MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
-%patch1 -p1
-%patch2 -p1
-
-ln -sf edk2-platforms-%{edk2_platforms_version} edk2-platforms
-ln -sf edk2-non-osi-%{edk2_non_osi_version} edk2-non-osi
-
-%build
-%if %{with edk2_non_osi}
-export PACKAGES_PATH=$PWD:$PWD/edk2-platforms:$PWD/edk2-non-osi
-%else
-export PACKAGES_PATH=$PWD:$PWD/edk2-platforms
-%endif
-%if "%{platform}" == "hikey"
-DSC_PATH="edk2-platforms/Platform/Hisilicon/HiKey/HiKey.dsc"
-%endif
-%if "%{platform}" == "hikey960"
-DSC_PATH="edk2-platforms/Platform/Hisilicon/HiKey960/HiKey960.dsc"
-%endif
-BUILD_OPTIONS="-a AARCH64 -p $DSC_PATH -b RELEASE -t GCC5 %{?jobs:-n %jobs}"
-# BaseTools does not support parallel builds, so no -jN here
-ARCH=AARCH64 make -C BaseTools BUILD_CC=gcc BUILD_CXX=g++ BUILD_AS=gcc
-
-. ./edksetup.sh
-
-build $BUILD_OPTIONS
-
-%install
-%if "%{platform}" == "hikey"
-%if %{with edk2_non_osi}
-install -D -m 0644 edk2-non-osi/Platform/Hisilicon/HiKey/mcuimage.bin %{buildroot}/boot/mcuimage.bin
-%endif
-%define outdir Build/HiKey/RELEASE_GCC5
-%endif
-%if "%{platform}" == "hikey960"
-%if %{with edk2_non_osi}
-install -D -m 0644 edk2-non-osi/Platform/Hisilicon/HiKey960/lpm3.img %{buildroot}/boot/lpm3.img
-%endif
-%define outdir Build/HiKey960/RELEASE_GCC5
-%endif
-
-install -D -m 0644 %{outdir}/FV/BL33_AP_UEFI.fd %{buildroot}/boot/BL33_AP_UEFI.fd
-
-%files
-%defattr(-,root,root)
-%if %{with edk2_non_osi}
-%if "%{platform}" == "hikey"
-/boot/mcuimage.bin
-%endif
-%if "%{platform}" == "hikey960"
-/boot/lpm3.img
-%endif
-%endif
-/boot/BL33_AP_UEFI.fd
-
-%changelog
Index: edk2-hikey960.changes
===================================================================
--- edk2-hikey960.changes (revision 2)
+++ edk2-hikey960.changes (deleted)
@@ -1,59 +0,0 @@
--------------------------------------------------------------------
-Fri Mar 8 12:22:47 UTC 2019 - Guillaume GARDET
-
-- Add patches to fix boo#1128503 (CVE 2018-12181):
- * edk2-cve-2018-12181-1.patch
- * edk2-cve-2018-12181-2.patch
-
--------------------------------------------------------------------
-Mon Nov 26 15:06:50 UTC 2018 - Guillaume GARDET
-
-- Switch to upstream edk2 release
-- Use a template file to add more platforms easily
-- Remove all patches:
- * gcc7.diff
- * edk2_genvtf_gcc8.patch
- * edk2_genvtf_gcc8.diff
- * ovmf-pie.patch
-
--------------------------------------------------------------------
-Sun Jun 24 00:16:04 UTC 2018 - afaerber@suse.de
-
-- Revert to gcc7
- gcc7.diff
-
--------------------------------------------------------------------
-Tue Jun 12 23:52:51 UTC 2018 - afaerber@suse.de
-
-- Try to fix gcc8 build
- edk2_genvtf_gcc8.patch
- edk2_genvtf_gcc8.diff
-
--------------------------------------------------------------------
-Thu May 31 20:58:04 UTC 2018 - afaerber@suse.de
-
-- Update sources
-
--------------------------------------------------------------------
-Thu Feb 8 10:55:58 UTC 2018 - afaerber@suse.de
-
-- Update sources
-* Drop OpenPlatformPkg_uart_fifo.patch (upstream)
-
--------------------------------------------------------------------
-Wed Feb 7 17:17:52 UTC 2018 - afaerber@suse.de
-
-- Build HiKey, too
-- Fix arrow keys (b9o#659)
- OpenPlatformPkg_uart_fifo.patch
-
--------------------------------------------------------------------
-Sun Jan 7 16:06:59 UTC 2018 - afaerber@suse.de
-
-- Update to edk2 2.5 + OpenPlatformPkg 1.3.4
-
--------------------------------------------------------------------
-Mon Dec 26 08:01:27 UTC 2016 - afaerber@suse.de
-
-- Initial
-
Index: edk2-hikey960.spec
===================================================================
--- edk2-hikey960.spec (revision 2)
+++ edk2-hikey960.spec (deleted)
@@ -1,109 +0,0 @@
-#
-# spec file for package edk2-hikey960
-#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
-#
-
-
-%define platform hikey960
-%define edk2_platforms_version 0.0~20181123T185023~397bbafdbf
-%define edk2_non_osi_version 0.0~20181120T112747~047bb77
-
-# Build with edk2-non-osi
-%bcond_without edk2_non_osi
-
-Name: edk2-hikey960
-Version: 201811
-Release: 0
-Summary: Firmware required to run the HiKey
-License: SUSE-Firmware
-Group: System/Boot
-Url: https://github.com/tianocore/edk2
-Source0: https://github.com/tianocore/edk2/archive/edk2-stable%{version}.tar.gz
-Source1: edk2-platforms-%{edk2_platforms_version}.tar.xz
-Source2: edk2-non-osi-%{edk2_non_osi_version}.tar.xz
-#!BuildIgnore: gcc-PIE
-BuildRequires: dos2unix
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: libuuid-devel
-BuildRequires: python
-# PATCH-FIX-UPSTREAM: CVE 2018-12181: boo#1128503
-Patch1: edk2-cve-2018-12181-1.patch
-Patch2: edk2-cve-2018-12181-2.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch: aarch64
-
-%description
-Firmware required to run the hikey960
-
-%prep
-%setup -q -n edk2-edk2-stable%{version} -a 1 -a 2
-
-dos2unix MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
-%patch1 -p1
-%patch2 -p1
-
-ln -sf edk2-platforms-%{edk2_platforms_version} edk2-platforms
-ln -sf edk2-non-osi-%{edk2_non_osi_version} edk2-non-osi
-
-%build
-%if %{with edk2_non_osi}
-export PACKAGES_PATH=$PWD:$PWD/edk2-platforms:$PWD/edk2-non-osi
-%else
-export PACKAGES_PATH=$PWD:$PWD/edk2-platforms
-%endif
-%if "%{platform}" == "hikey"
-DSC_PATH="edk2-platforms/Platform/Hisilicon/HiKey/HiKey.dsc"
-%endif
-%if "%{platform}" == "hikey960"
-DSC_PATH="edk2-platforms/Platform/Hisilicon/HiKey960/HiKey960.dsc"
-%endif
-BUILD_OPTIONS="-a AARCH64 -p $DSC_PATH -b RELEASE -t GCC5 %{?jobs:-n %jobs}"
-# BaseTools does not support parallel builds, so no -jN here
-ARCH=AARCH64 make -C BaseTools BUILD_CC=gcc BUILD_CXX=g++ BUILD_AS=gcc
-
-. ./edksetup.sh
-
-build $BUILD_OPTIONS
-
-%install
-%if "%{platform}" == "hikey"
-%if %{with edk2_non_osi}
-install -D -m 0644 edk2-non-osi/Platform/Hisilicon/HiKey/mcuimage.bin %{buildroot}/boot/mcuimage.bin
-%endif
-%define outdir Build/HiKey/RELEASE_GCC5
-%endif
-%if "%{platform}" == "hikey960"
-%if %{with edk2_non_osi}
-install -D -m 0644 edk2-non-osi/Platform/Hisilicon/HiKey960/lpm3.img %{buildroot}/boot/lpm3.img
-%endif
-%define outdir Build/HiKey960/RELEASE_GCC5
-%endif
-
-install -D -m 0644 %{outdir}/FV/BL33_AP_UEFI.fd %{buildroot}/boot/BL33_AP_UEFI.fd
-
-%files
-%defattr(-,root,root)
-%if %{with edk2_non_osi}
-%if "%{platform}" == "hikey"
-/boot/mcuimage.bin
-%endif
-%if "%{platform}" == "hikey960"
-/boot/lpm3.img
-%endif
-%endif
-/boot/BL33_AP_UEFI.fd
-
-%changelog
Index: edk2-non-osi-0.0~20181120T112747~047bb77.tar.xz
===================================================================
Binary file edk2-non-osi-0.0~20181120T112747~047bb77.tar.xz (revision 2) deleted
Index: edk2-platforms-0.0~20181123T185023~397bbafdbf.tar.xz
===================================================================
Binary file edk2-platforms-0.0~20181123T185023~397bbafdbf.tar.xz (revision 2) deleted
Index: edk2-stable201811.tar.gz
===================================================================
Binary file edk2-stable201811.tar.gz (revision 2) deleted
Index: edk2.spec.in
===================================================================
--- edk2.spec.in (revision 2)
+++ edk2.spec.in (deleted)
@@ -1,108 +0,0 @@
-#
-# spec file for package edk2-hikey
-#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-%define platform
-%define edk2_platforms_version 0.0~20181123T185023~397bbafdbf
-%define edk2_non_osi_version 0.0~20181120T112747~047bb77
-
-# Build with edk2-non-osi
-%bcond_without edk2_non_osi
-
-Name: edk2-%{platform}
-Version: 201811
-Release: 0
-Summary: Firmware required to run the HiKey
-Url: https://github.com/tianocore/edk2
-License: SUSE-Firmware
-Group: System/Boot
-Source0: https://github.com/tianocore/edk2/archive/edk2-stable%{version}.tar.gz
-Source1: edk2-platforms-%{edk2_platforms_version}.tar.xz
-Source2: edk2-non-osi-%{edk2_non_osi_version}.tar.xz
-#!BuildIgnore: gcc-PIE
-BuildRequires: dos2unix
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: libuuid-devel
-BuildRequires: python
-# PATCH-FIX-UPSTREAM: CVE 2018-12181: boo#1128503
-Patch1: edk2-cve-2018-12181-1.patch
-Patch2: edk2-cve-2018-12181-2.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch: aarch64
-
-%description
-Firmware required to run the %{platform}
-
-%prep
-%setup -q -n edk2-edk2-stable%{version} -a 1 -a 2
-
-dos2unix MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
-%patch1 -p1
-%patch2 -p1
-
-ln -sf edk2-platforms-%{edk2_platforms_version} edk2-platforms
-ln -sf edk2-non-osi-%{edk2_non_osi_version} edk2-non-osi
-
-%build
-%if %{with edk2_non_osi}
-export PACKAGES_PATH=$PWD:$PWD/edk2-platforms:$PWD/edk2-non-osi
-%else
-export PACKAGES_PATH=$PWD:$PWD/edk2-platforms
-%endif
-%if "%{platform}" == "hikey"
-DSC_PATH="edk2-platforms/Platform/Hisilicon/HiKey/HiKey.dsc"
-%endif
-%if "%{platform}" == "hikey960"
-DSC_PATH="edk2-platforms/Platform/Hisilicon/HiKey960/HiKey960.dsc"
-%endif
-BUILD_OPTIONS="-a AARCH64 -p $DSC_PATH -b RELEASE -t GCC5 %{?jobs:-n %jobs}"
-# BaseTools does not support parallel builds, so no -jN here
-ARCH=AARCH64 make -C BaseTools BUILD_CC=gcc BUILD_CXX=g++ BUILD_AS=gcc
-
-. ./edksetup.sh
-
-build $BUILD_OPTIONS
-
-%install
-%if "%{platform}" == "hikey"
-%if %{with edk2_non_osi}
-install -D -m 0644 edk2-non-osi/Platform/Hisilicon/HiKey/mcuimage.bin %{buildroot}/boot/mcuimage.bin
-%endif
-%define outdir Build/HiKey/RELEASE_GCC5
-%endif
-%if "%{platform}" == "hikey960"
-%if %{with edk2_non_osi}
-install -D -m 0644 edk2-non-osi/Platform/Hisilicon/HiKey960/lpm3.img %{buildroot}/boot/lpm3.img
-%endif
-%define outdir Build/HiKey960/RELEASE_GCC5
-%endif
-
-install -D -m 0644 %{outdir}/FV/BL33_AP_UEFI.fd %{buildroot}/boot/BL33_AP_UEFI.fd
-
-%files
-%defattr(-,root,root)
-%if %{with edk2_non_osi}
-%if "%{platform}" == "hikey"
-/boot/mcuimage.bin
-%endif
-%if "%{platform}" == "hikey960"
-/boot/lpm3.img
-%endif
-%endif
-/boot/BL33_AP_UEFI.fd
-
-%changelog
Index: pre_checkin.sh
===================================================================
--- pre_checkin.sh (revision 2)
+++ pre_checkin.sh (deleted)
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-for p in hikey hikey960; do
- plat=$p
- p="$(echo $p | tr -d '_' )"
- sed -e "s/^%define platform\$/%define platform ${plat}/" \
- -e "s/^Name: edk2-%{platform}\$/Name: edk2-${p}/" \
- -e "s/the %{platform}/the ${p}/" \
- edk2.spec.in > edk2-$p.spec
- cp edk2.changes edk2-$p.changes
-done
-
-osc service localrun format_spec_file