Blame SOURCES/0003-advertise-OpenSSL-on-TianoCore-splash-screen-boot-lo.patch

b1192b
From 0b2d90347cb016cc71c2de62e941a2a4ab0f35a3 Mon Sep 17 00:00:00 2001
b1192b
From: Laszlo Ersek <lersek@redhat.com>
b1192b
Date: Wed, 11 Jun 2014 23:33:33 +0200
b1192b
Subject: advertise OpenSSL on TianoCore splash screen / boot logo (RHEL only)
b1192b
b1192b
Because we may include the OpenSSL library in our OVMF and AAVMF builds
b1192b
now, we should advertise it as required by its license. This patch takes
b1192b
the original TianoCore logo, shifts it up by 20 pixels, and adds the
b1192b
horizontally centered message
b1192b
b1192b
  This product includes software developed by the OpenSSL Project
b1192b
  for use in the OpenSSL Toolkit (http://www.openssl.org/)
b1192b
b1192b
below.
b1192b
b1192b
Logo-OpenSSL.bmp: PC bitmap, Windows 3.x format, 469 x 111 x 24
b1192b
Logo.bmp:         PC bitmap, Windows 3.x format, 193 x 58 x 8
b1192b
b1192b
Downstream only because upstream edk2 does not intend to release a
b1192b
secure-boot-enabled OVMF build. (However the advertising requirement in
b1192b
the OpenSSL license,
b1192b
"CryptoPkg/Library/OpensslLib/openssl-1.0.2*/LICENSE", has been discussed
b1192b
nonetheless, which is why I'm changing the logo.)
b1192b
b1192b
Notes about the 9ece15a -> c9e5618 rebase:
b1192b
- Logo.bmp is no longer modified in-place; instead a modified copy is
b1192b
  created. That's because AAVMF includes the logo too, but it doesn't
b1192b
  include OpenSSL / Secure Boot, so we need the original copy too.
b1192b
b1192b
Notes about the c9e5618 -> b9ffeab rebase:
b1192b
- AAVMF gained Secure Boot support, therefore the logo is again modified
b1192b
  in the common location, and no FDF changes are necessary.
b1192b
b1192b
Notes about the d7c0dfa -> 90bb4c5 rebase:
b1192b
b1192b
- squash in the following downstream-only commits (made originally for
b1192b
  <https://bugzilla.redhat.com/show_bug.cgi?id=1308678>):
b1192b
b1192b
  - eef9eb0 restore TianoCore splash logo without OpenSSL advertisment
b1192b
            (RHEL only)
b1192b
b1192b
  - 25842f0 OvmfPkg, ArmVirtPkg: show OpenSSL-less logo without Secure
b1192b
            Boot (RH only)
b1192b
b1192b
  The reason is that ideas keep changing when and where to include the
b1192b
  Secure Boot feature, so the logo must be controllable directly on the
b1192b
  build command line, from the RPM spec file. See the following
b1192b
  references:
b1192b
b1192b
  - https://post-office.corp.redhat.com/mailman/private/virt-devel/2016-March/msg00253.html
b1192b
  - https://post-office.corp.redhat.com/mailman/private/virt-devel/2016-April/msg00118.html
b1192b
  - https://bugzilla.redhat.com/show_bug.cgi?id=1323363
b1192b
b1192b
- This squashed variant should remain the final version of this patch.
b1192b
b1192b
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
b1192b
b1192b
- For more fun, upstream completely changed the way logo bitmaps are
b1192b
  embedded in the firmware binary (see for example commit ab970515d2c6,
b1192b
  "OvmfPkg: Use the new LogoDxe driver", 2016-09-26). Therefore in this
b1192b
  rebase, we reimplement the previous downstream-only commit e775fb20c999,
b1192b
  as described below.
b1192b
b1192b
- Beyond the new bitmap file (which we preserve intact from the last
b1192b
  downstream branch), we introduce:
b1192b
b1192b
  - a new IDF (image description file) referencing the new BMP,
b1192b
b1192b
  - a new driver INF file, referencing the new BMP and new IDF (same C
b1192b
    source code though),
b1192b
b1192b
  - a new UNI (~description) file for the new driver INF file.
b1192b
b1192b
- In the OVMF DSC and FDF files, we select the new driver INF for
b1192b
  inclusion if either SECURE_BOOT_ENABLE or TLS_ENABLE is set, as they
b1192b
  both make use of OpenSSL (although different subsets of it).
b1192b
b1192b
- In the AAVMF DSC and FDF files, we only look at SECURE_BOOT_ENABLE,
b1192b
  because the ArmVirtQemu platform does not support TLS_ENABLE yet.
b1192b
b1192b
- This patch is best displayed with "git show --find-copies-harder".
b1192b
b1192b
Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
b1192b
b1192b
- After picking previous downstream-only commit 32192c62e289, carry new
b1192b
  upstream commit e01e9ae28250 ("MdeModulePkg/LogoDxe: Add missing
b1192b
  dependency gEfiHiiImageExProtocolGuid", 2017-03-16) over to
b1192b
  "LogoOpenSSLDxe.inf".
b1192b
b1192b
Notes about the 20171011-92d07e48907f -> 20180508-ee3198e672e2 rebase:
b1192b
b1192b
- Adapted to upstream 25184ec33c36 ("MdeModulePkg/Logo.idf: Remove
b1192b
  incorrect comments.", 2018-02-28)
b1192b
b1192b
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
b1192b
(cherry picked from commit 32192c62e289f261f5ce74acee48e5a94561f10b)
b1192b
(cherry picked from commit 33a710cd613c2ca7d534b8401e2f9f2178af05be)
b1192b
---
b1192b
 ArmVirtPkg/ArmVirtQemu.dsc           |   4 +++
b1192b
 ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc |   4 +++
b1192b
 ArmVirtPkg/ArmVirtQemuKernel.dsc     |   4 +++
b1192b
 MdeModulePkg/Logo/Logo-OpenSSL.bmp   | Bin 0 -> 156342 bytes
b1192b
 MdeModulePkg/Logo/Logo-OpenSSL.idf   |  15 +++++++++
b1192b
 MdeModulePkg/Logo/LogoOpenSSLDxe.inf |  61 +++++++++++++++++++++++++++++++++++
b1192b
 MdeModulePkg/Logo/LogoOpenSSLDxe.uni |  22 +++++++++++++
b1192b
 OvmfPkg/OvmfPkgIa32.dsc              |   4 +++
b1192b
 OvmfPkg/OvmfPkgIa32.fdf              |   4 +++
b1192b
 OvmfPkg/OvmfPkgIa32X64.dsc           |   4 +++
b1192b
 OvmfPkg/OvmfPkgIa32X64.fdf           |   4 +++
b1192b
 OvmfPkg/OvmfPkgX64.dsc               |   4 +++
b1192b
 OvmfPkg/OvmfPkgX64.fdf               |   4 +++
b1192b
 13 files changed, 134 insertions(+)
b1192b
 create mode 100644 MdeModulePkg/Logo/Logo-OpenSSL.bmp
b1192b
 create mode 100644 MdeModulePkg/Logo/Logo-OpenSSL.idf
b1192b
 create mode 100644 MdeModulePkg/Logo/LogoOpenSSLDxe.inf
b1192b
 create mode 100644 MdeModulePkg/Logo/LogoOpenSSLDxe.uni
b1192b
b1192b
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
b1192b
index d74feb7..7331597 100644
b1192b
--- a/ArmVirtPkg/ArmVirtQemu.dsc
b1192b
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
b1192b
@@ -329,7 +329,11 @@
b1192b
   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
b1192b
   MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
b1192b
   MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
b1192b
+!if $(SECURE_BOOT_ENABLE) == TRUE
b1192b
+  MdeModulePkg/Logo/LogoOpenSSLDxe.inf
b1192b
+!else
b1192b
   MdeModulePkg/Logo/LogoDxe.inf
b1192b
+!endif
b1192b
   MdeModulePkg/Application/UiApp/UiApp.inf {
b1192b
     <LibraryClasses>
b1192b
       NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
b1192b
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
b1192b
index 89f95b2..8941b7f 100644
b1192b
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
b1192b
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
b1192b
@@ -191,7 +191,11 @@ READ_LOCK_STATUS   = TRUE
b1192b
   #
b1192b
   # TianoCore logo (splash screen)
b1192b
   #
b1192b
+!if $(SECURE_BOOT_ENABLE) == TRUE
b1192b
+  INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
b1192b
+!else
b1192b
   INF MdeModulePkg/Logo/LogoDxe.inf
b1192b
+!endif
b1192b
 
b1192b
   #
b1192b
   # Ramdisk support
b1192b
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
b1192b
index 1e823ae..1981aae 100644
b1192b
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
b1192b
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
b1192b
@@ -318,7 +318,11 @@
b1192b
   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
b1192b
   MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
b1192b
   MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
b1192b
+!if $(SECURE_BOOT_ENABLE) == TRUE
b1192b
+  MdeModulePkg/Logo/LogoOpenSSLDxe.inf
b1192b
+!else
b1192b
   MdeModulePkg/Logo/LogoDxe.inf
b1192b
+!endif
b1192b
   MdeModulePkg/Application/UiApp/UiApp.inf {
b1192b
     <LibraryClasses>
b1192b
       NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
b1192b
diff --git a/MdeModulePkg/Logo/Logo-OpenSSL.bmp b/MdeModulePkg/Logo/Logo-OpenSSL.bmp
b1192b
new file mode 100644
b1192b
index 0000000000000000000000000000000000000000..4af5740232ce484a939a5852604e35711ea88a29
b1192b
GIT binary patch
b1192b
literal 156342
b1192b
zcmeI5d(>~$xW~&aw_M64<QfWz7#dP?t3($>NYZ7LkVerMIgB$pYT%5)88Oa?KguvP
b1192b
zI4QXdhfYMHh=?MQLQ0BCrP`(4zMRjyzxCbEZ>}}xTJLYa@9y1uKfkf|+RvQxna_OY
b1192b
zcg^)(&zft#YrS&!|2yzL>&^VO;olbgyJY?K);pa4*I#cF_W4_@5Lmu^`C8SVd%H7l
b1192b
zd)wQ-|NZYj=s^#f&XKk6aIEP)deoyH_4&_#{_lVP`%O39^p&rC<)truY4^x-xPS12
b1192b
zA8_cqMVXTbv=CU+PmfmLR(siwJMQ?$KmPI2kAC#jEw6otV@>bT_rCYN4}IuEk9fo*
b1192b
z9`Jw%JnwnW`{56N_@4K?r+a)K^O(n6am5v{dey7CMVXTbR1sLyPmgNHR(rvH?sK2t
b1192b
z{N^`rdefU$rRBBnaIEP)+Is7)?{~lZ`Iv68#THy*os7a;-tv}T|N7VKug`SBI`Auw
b1192b
z>$~3du0Q?hPm32XzWnmb4?g%{15l_rUji4jU;gr!cieHu#TQ?^!wx%KcinZIMHId8
b1192b
zg)jW^kAJ*q(W0AgzWJNq{N|IN{Nz{>pwXu-Zb?o%?X;&n
b1192b
z|N7Uz;zQR$QEQ9?GD3Gi=7I|@pfCK+KmYs#4?Hjq5uDk6`|VNq*T4RC_0?DJzyJQK
b1192b
zsC})Wq6;y((@r~m>s#NVBjEGTfBy4FKl;%d-}uI8v#o%s?k`p^WRzo0Z5W`_D6$a?
b1192b
zvU$J(2b_EExet8c17m)1nB4m7UiZ3R{Nfi*BE(uTSy+fksx%IV4gTQ|e{hr?Ww-vE
b1192b
z=R5~xhBrCvk;!o>!l1&Sj-5fXjcubxvmIcy6SJ0&Z_&>v*L;pTROffdA%`%YZ@cZb
b1192b
zGtWE|{#~+UiSoP1LngcKx~odp@_mG9&pr2qcDLDP8zy2n62JT1?|jZjwJsve+I;xK
b1192b
zAAazIAN<_sKKHD%&VqxabIv*Ey!XBD-EhMVIrk1f{P45SKHGJ7*<}|lfG>O5%V_KI
b1192b
zkAM6}Kl)MV#-$cwyHQ4=NV*F2hx0h2oI=gXkq*en7r*#LxRv|jhdksVSmqi7p`3W)
b1192b
ziEeb+vSmN}+0U5OqLfQL(CxO{ZYpgwWM>Lj-}=_KUVr`d?|kPwH`!#9``-7y%$@DN
b1192b
z`|iK}?Qi$mYcFXIDioIOXHAIujbYFz!m^E6AoC4xcmv_gBOm$5sDNA?CUW!x)en5&
b1192b
z1NWq6{*TsTvak@7jl&TwoN&SkhBV4Et*-cSkBlh=BJ7dh{qA?)Q#kYgpu(Vzd)LOc
b1192b
z(W5B_Snb5D<
b1192b
zKchfbq0T+_*u#B>LCly@%?cI>&^Fp=BPF>?_bNldT>4z)+u#27YhLpjCu>496=n2`
b1192b
zq%9Qrwd6<#Fw4C#mkJZQ8rook4H!=ZYf93}YhU|X`v8nwlay>URP*iUKmR$=oUKWC
b1192b
z#xtIA)m2wX9#kkS7pA(&sNWa{jUsH?hy^C{fbL08dXidnepD`;;WG1r7rY>5##*sr
b1192b
zEnhmd!x1e*1U}EBY@Jh2J@qF)`H3#H?75jc<&;xgiZG}!QU|p`Y->H5Vt~ai6ep&O
b1192b
ziu?j?sWp5q^a*LXW3%!1z3+Wi=ps)D$Ti!_YqMY!=;Vzz-e?*niA;_
b1192b
zCZ+ter#+36>Zd>bsq6mZAOCpR!ye{jO^BwVjDC@{g(AO}9O(dN&p6|Zcf8{rwr>Gm
b1192b
zcFayIJX>%P5$iSAT%%;8p_*^Ryf$TlM-$gxd##d#3Wa4GsR>cPF$@|-Shf*_BaS%Y
b1192b
z#V>v_F)6o1Zqy1<*`*SIi=M{JSSwbn
b1192b
zPYCS8DxE
b1192b
zdj8N=)=t4F&^=~kG;gb}a*}(FCaQITC`z4#i;q6~=*up<jJqdTY_rWab6qT>7Jr_#
b1192b
zunqzWPDZ&XvQ9U@R%@gK7-TBov5$RhY(g?)l=U={X(e*v{qKMOJMX+xMU94Pz7=gT
b1192b
zK$&oWDS9shD0dYK%Z0&iGV0@SZ5T9)uxTR*oS96Nzv30Ih;3ORDn|w6yY9LR^kQbL
b1192b
z6)V>ArBgc`(K0eOF`Vtnj50aTeC9KGGQs>99pRF|-5VhxgMk|n=?^N5F(Om!2eGa7
b1192b
zXo>+=J27kdxL2Spw;Mhe`W)6csCX6^6$<28Bf(=2BeOOO5d}tDyv8E)+)SNE?coo9
b1192b
zcnyeX1RW>8{N*n*xx=HXCqD6sMO`e%SeuE?E3dq=(21rbGd`rlvoE(&)GG2xa@ttO
b1192b
zr6V1nB10!Wy0xh|N-zrvx`?j*?Qefmve6K=YCQscrpy44
b1192b
zOKl<QH-<r@2>UjIu+>&u@o@F|&wqYw*9uWNDj@g9zr9B=S}P1vR686+b07cs$M@cQ
b1192b
zZ)HZA9HQN?fBowS=bd-nQAZucL
b1192b
za=YO(`jIg>9U`|p;R#QO1`FiZ(fF4s%Qz?d>Q}#-r%VDGuz30;xx0^0QtBkc5pOzT
b1192b
zMP`<n_i+x3u2}-%qy?KI2ieQE8H)@%t3@GJQLXK^+fEA9!X?Qg9Y7gIU_L>$;+{w6
b1192b
zH{5W8a%j}gD#>B0jui_kYBW^q5l}N;zx1Uqap~gzJqA9qIjB&8pjwT6)Nc%fMiIts
b1192b
zL;~R
b1192b
zpZw$}k$H$uzVrtb#u$+)_Ji2gdNjoVtDTs&eB3M0mfH=V(T|M5>A-VBcb3QU(O`l6
b1192b
zIy(Q$Di$8xzvx9TA}Aw%VZuw#mk2g_!UjJ+^{G$gxsyS(5TPW~N!DpGeTFqynDq~e
b1192b
zAXJM7`Yc8PcUBaz3W6s~uYBbzZP0>Ek#qa)w{yJVBdQ#G?6LfPl+~gTtB}u)3
b1192b
zOgDezBOgJQ@<<0zX6g9rU;p~pgk
b1192b
zXWMPJ?Y8KgL4^VYSF8z9zcvi0+bE*cMlA5;4GMOE>HMf%xC9#(>mO=IFj^}NHV#Lj
b1192b
z$@Btox_pQ-IgClIHe-zhH`?@_%%?y7>Aq1LR2XAKO|x%f+vw301FUvp*79+$KwECt
b1192b
zeC{#^7{V
b1192b
zI7SRYrl&O{C>ZHYZoc{E-}%mW2voVQLYHuQRNHUA{h)X_hzVlkSY+9jx!LDA1`EGb
b1192b
zg#`eGHC15}Sv~sHr#__|W)Fy(d7O&p)Q#&m$2fqIefHUh=5WAXA%F>lD`sK7lE(`y
b1192b
z{J8MK3u%RiPAnaZ%DoLWdPG>wn!IQMnYBB|AAh_u2NjH4VWgHU^m~Va>NbjO!~#{A
b1192b
zSpxPWk316D`Q5{0$CzeeHqc3g-XmC8h{?gjVK>wY5AiqMbkjm6)bI=vrBw0ib@-RH
b1192b
z>Vpax9HXOlwXb12*rVAFu-b`P%g4O}G`rpFb1!2Mze6DWl>m3uET-nfk2AvYC~#)Q
b1192b
z#U5^JZ4<b$t--qHc9p*$iO#Qj2f3KD%!onr@|V9{>wkHy#0}}mC!ZV}nnU^RZ+|=Y
b1192b
zYqY`)8dJ|u7}r83g1LuKD}xHN?e%Q+dpm0*7JAi`SsW&7;;JaRFUuvrX05PLByDg|
b1192b
zAllk@-+iSP<-v;UltS$&%oPYmp6Hm>!3=}Bvb><}5SbEG_RcCSXus>u@z*u6a8AYz
b1192b
z7izBaM8PwE{kCWk0uRUH)jPI0Co(scOxLgqhv<*VAC~SFF?CyEOs~<Y{if>z)>P3#
b1192b
z!%lISq9!v@kf~Rp)vOg3iexm{mYHq*+~+
b1192b
zRTB%*&a<BNEN1AqDOiZk)nlLW-p=>98SlwjuW6_)6kV?67iuJ#*kP`pX+h-iwYql3
b1192b
z
b1192b
zB9I8o3j*^!p))T|r_psDfqQG*va*mB>-vj~g?13`Eld^&4y-;r^w2{Wh%;l|SjUgq
b1192b
zSeR08fgx~jjawGs@)w~j^p1arwm`7Cw=h{C-RF%Qyl-TII5XCbb^Mr(g(>wG7y|e1
b1192b
zxc%S<KgjCC1qR8yFA-U2{Vn`qvGClFie8IFrjr)%tnm{2=r>hrZ`6<0RHgQodrAoh
b1192b
zSgFbiHWu-)l-PgPQu`
b1192b
zDB|xddq34N2I_`R4OKfVWC~c?-(29YpLt&li
b1192b
zQEpq{?RT^o-vc0nH9Vtx4RC7Xw(U%#3-Zc;X2wY7mi8}y`3rA*P?7iitvoODi?70Q
b1192b
zk%V}#Vs|Jlk~I(tgDi;yipIBBWO)iq3V&j<{dE;uY%5@@`z!i|LXlG>y9%`-LB*)t
b1192b
z0JfJO;vrk
b1192b
z_I?zDn>hX;mA~d>btkWqVqn>;_z44NA{74Ak~PcLuen4MjgB
b1192b
zSlZuQ;BSZcQxUM`opT8MStqY4@S8si%Z;u@{HFs43mj
b1192b
zZge5`RIgdkcTBiiGoIu7gV5yN6#O|1L=bC5IUX!`M+!07a5Y*(9{lzSI@4hi{lSQn
b1192b
zgI`w}RIsU{FEKf&Qz$fsM0CCZY>gk{AzSHT(Yy+ZOeZa@tiM7kUSc0hsS^LlI)1XD
b1192b
zu-16XJ)ss?51ZxhVqLfPQ4C%L5#O@rx(KctGrRePnv*rlR;al|6OE2EzAq5{Y(Q
b1192b
zsMA2z4y$63Y=3is8xgLBZjr+pt4A4~kzJb(99~t!i$vfrZfN2kST-89du?!P
b1192b
z(FJ3LfCF)Qm&l!0GDZd7tn~i(zn}Ni#LOtW3$j)#YPcG!jQRG88kz!==xX$q36^+L
b1192b
z%bz*_{7TV!?6u@Vp)n+)^9^7J`C-C`qWNB*tYaaX=)S~0mQp3Yku!d>p|I9?%YE^}
b1192b
zI*hok1sdfQXioAP9eoWfIwRRSMNyGoOV%t~-$LOM$wo&S-xsi-ZK$PI=rmA`ep0tc
b1192b
z(oF(eLQ9I+7awKdm9>0KkF$k?%PW5P#p+R}`k1bvHXS&GicEk|{j;C_EWrzcevL-$
b1192b
zUK^a+xNTT&bm1PqX8y;4XdIcl2P^Puz~BG=_e@jpx6Zr{$@x)m7i6tg)NnOc8T0KG
b1192b
zH5A>B=W?T==xX$~`@U03=lt_4MeDKGk_&~#kciGV`a8%E6FwBp_xfZV3#dVMwXaUZ
b1192b
z2B;E&W>opzX3-i|8gIELz=^Lxh%fXhj5tY^-q)GakaeP;-TXq$$(m&=SdjggY;>gY
b1192b
zeStAh*K``FM#qZo4}NojNb{Iuj$sypfk>ygGmX}wjO9kx1d;aBfx`z$^%@;M!5Lrf
b1192b
z+-TJ9wZW;4+lJ*v7h+FwAdY8bDq4Z}&uQj?7ma@66Q6K?6x;
b1192b
zQ()3?FZ#e_HxmwX{`r-n_1L21LZLAvgn()_faOs3GEdRa-JbO3k~#P-fW}Mg?>4>S
b1192b
zKTO5P2=S8*6vcPfH{Np3Gm5CmMc8gzP@_&Vq*guth16s=KKiU#cGDILmq<1`()hl>
b1192b
z7^rJH4OAO`j``+-dZ#@M60IS}<JIU|G%^J^y!n^Qxjym7CvR!UZ{lw>YFFFf)W&VY
b1192b
za-$2er#KLe<3FBAfjbEXm_Akn+3^P3!IK$ly=N;18?Huw#(aAP{le{dE;kyYR_}R)
b1192b
zK~7|@Gz{JO`}_*6#~(K+ykd}PdUv1FI93}&LI|j0qrZdv;HGB;nx9CoNRT=BEr8-y
b1192b
zt7}9#n2J+f%pdua4HU&^;;zX~Gqy})`@0yYpMHAO+;!Jo?Y0FsCxJJh*WPbbRI%qp
b1192b
zKFQt>Vbm
b1192b
zrT~ZUZ!%$LBfO}dN6$(&8g<9p;MB%#!*Zhwb`k*x;#3L49-C4iKYl>=t6%*pub_){
b1192b
zCA$l<)_b;6)NnQ0
b1192b
zLL94&At3}*s{t%Uz06a1B0K&3O9+jX?$;cmiN;Ip?>4>SzuFu1i70ta6~A`DdXC=j
b1192b
zVqk`4D7>weC&k1#JZWL!jy<uUMxErF8jNEmD0xQD`W_yP*emNer>LuB?XwXz%QkDF
b1192b
zYqrr5PP5vlI>ta<(`lgE@N@8+3#
b1192b
zW86ldW8TECWTR1cya7&a++w_8xzPnXiGXpYZWzgo=PkF~lEpbpo=D*v-}naPU}ath
b1192b
z`n9ip%}ERH0y(v_m7<2LHia<e+bgI|he_=`8vMG-ph5&8b|=ccI>4^wr`@sI7!sJZ
b1192b
zwFa<*{1Dw+X))&ZehVNrkKA~Py-jg));`(L`|f%k_;kOEA#2R>F-&>v&SO*N#SDZ6
b1192b
zsm0{}`|r=14;
b1192b
zfx4m7MYa1;k_gL~?
b1192b
z%*32u>04_w9-uBbSZj=1wN<lBX`>7F69
b1192b
zJXj=aXRE3-T(wQ^$8m-+?;He<BY}?J(>NU_jq_;m>nei^@i<1$qui^bsVeoc`^}x+
b1192b
zAt9U5S_9ZFKNN>-rH9d?b9*ygx)6j_@o?%-7_>V+olDczYI`!KG(N+W{yf1l#+jPV
b1192b
zJb^P$W_x?l+g5L8Z}nPcJXou4jWBREe|v>~4Sro^P+?5R3mxu;`Kr^$KK3!bc3Q)B
b1192b
zp7K{7GJLB2)HbE_<iuQ=T@??f{)9o>`RQDmu2$QVk)=!-$B&ZC6D%X0=~bI2aOTPE
b1192b
z_%5uv1My(3x-~rK2`X_PQSi){S60inS7?;G_|^RR6>cv1OD?_>7#DK%9=JKrjE8K%
b1192b
zc
b1192b
zlTfd-hdw)=2qXfDKq8O`Bm#**B9I6q0*OE(kO(9Ki9jNd2qXfDKq8O`Bm#**B9I6q
b1192b
z0*OE(kO(9Ki9jNd2qXfDKq8O`Bm#**B9I6q0*OE(kO(9Ki9jNd2qXfDKq8O`Bm#**
b1192b
zB9I6q0*OE(kO(9Ki9jNd2qXfDKq8O`Bm#**B9I6q0*OE(kO(9Ki9jNd2qXfDKq8O`
b1192b
zBm#**B9I6q0*OE(kO(9Ki9jNd2qXfDKq8O`Bm#**B9I6q0*OE(P$0lJ{_>XytO^3f
b1192b
zh{|LlkO+)LU{y}MteXgcz}TUddWk?HP#};Dk_fCK0>y~RWFn9Vj77lb-f>49a@bDW
b1192b
zvK_w54ib*s{pCdx
b1192b
zhT5$+--ssL_19djJ;F`bU&mfKWG-E@<gUew?^tx3wma{*BMKyygEe<Kg*icB>`+U+
b1192b
zL?96;5bzlY?QXxpdau}UJ@!$syxXQ5q73aGyxmqJXzi(}&18)loO{B59Cgxv9?fRK
b1192b
zGC6E8Cd>;{dpqxp|BbSes6n+?U4Ch?snnTE?z(I7op-|2i*CK8u_ga
b1192b
ziV>B`L?96ui-6BS*c0;IaijISoAXhIH_;?CZfvMU{uK+yJwdei7xpya)&%n}p|03g
b1192b
zVec{f?S)OK87d(k{zVgdCG2(Zi!3fyChT0}-(|~|8H%-D_{5
b1192b
z1QLM)0iT5MDWR^&*Mw_9`6v_rt|I?JzT#r&a#s9HMa_-C-Eb}>vhUWL{rld#LnSaW
b1192b
zdl(rV7+DHj1K8kV;$k8`8bucWQk^8VFrw)cWOAsE9fgM
b1192b
zzkCI2L+;e2U4coXRAG-AITXSB)TL3G;*tQ2m?D!L>ChaRR3Q`NWYVa52T-<54&6jk
b1192b
z&Cv=uR6zkZFhVQH*dZSr$fT4W(VQxhqq!!O$+t`R2|g(6prEYk>W&aoU2^1)_Qi
b1192b
zWFn9Vj77jF60B
b1192b
zvyce
b1192b
zBkEFwpR`C37D!^5e5jDtMSLW2OzyEKiCOqmb;+SojL;%7MOelZT~i0i#4&Q%C{
b1192b
zvBQtLY`Dt)1AFdl9jaiHq|Cza)Wsk=>}i57aDByd`it`*14L?zOuC7O<Up?iP>`Zb
b1192b
zMM~LYoFcX8D~-GwJJeDy5l93I1au0qhakki#Jok=YdS`4B>zGjXmW1XHcBB@&gTa6
b1192b
zs!05+XpS?VO~e5&U>wSTeIObr16HCJ=3h$T8Xn3K^O7k}fl8n!+7)NPDOiU7AT<=|
b1192b
zAg0iv6iR|pQJ^_2tB8suu`CO^6X)`P8r~{yrBQUWrxs@M8M7#08Fr>RnN-mpQ
b1192b
zq=^DVi8ELrX`aOnKQTK3U7)Af!E
b1192b
z_!m<&jbpGj)#WgIoYW<RDl@KxUooOGnFu5TV-fIq#CawDHQN>fr!>mb@vk@wzKEOR
b1192b
zUl^giiGN`YjEEEA6vzVN5F
b1192b
zsD*v
b1192b
zfgE&@+2fLZkg^&=4GWSXN@RS-INqwFWa_FG{*aFwvPP*Kzz$u2<*BFxs_wHVM_92(
b1192b
z2Ytwz9^sxaVb3K^K4?F7sHI*akO&kA_(bBgcjW8%*TU5E51hc-AOg!0X2rkI1QZON
b1192b
z5veIE#2{P%(ZCK+344-o4Q$9B>LCf^F!?L~r8=F3M#awb7i(l9P#3zPvj~*JI}jH6
b1192b
zvH&a53YyTC%;Eq!I3V;C|9bv`y0Dc
b1192b
zN6mbPH8o0qb+telC(*%4O7RD5vB{o%TBIQupGHN^7^JRyhcznV8_KB3Np2~~CkKD%
b1192b
z8p`T5nV97wjVTWsgknTxG7(4w#v
b1192b
zrL*E+g=R1UG$8_os-P0`B|uVe4L9c8M6*YRJ0v^)g{QCpPsth%u%V2@=z{
b1192b
z8G}?OhaW*Stb_oYlSwTlR}?O%A?O&ogbnE(eTM<9jDRu~RhMM3en3gwpcNTJUtv3$
b1192b
zw53e;Vq5k!M?=a-hiPbx$j*#)o(e9TnWGSK!@{_PGG=3sP(Y0z_^3Pbb0#ZPpHaA{
b1192b
zzu*RdGYa81cBrLZB9I6a2>3iAGIIQD!bNZhJgfN!PI&Qb?_NaASq*^_Otm-EAV*Ox
b1192b
z71_`i=aOjw!h&w#6gGH-O)`5(2Q@emuc)h1sN`
b1192b
zU>V1TtIb}6UZ^3OpwW>AaE8mtNaaDbuBl=~Wik;+1jZuZ^Q{*DihtS9mVXuh#+bL@
b1192b
z;@R>q?8C{=X3m9KyurT&nC9F<fP!Zt$|Xw*&UN=wm>PkxLoM|ZfkdD{z-Jwk38Gqf
b1192b
zHpah7vXA`BO=$0i5#66E{x$h3ZiRo9qrLf;XpXS1wxOo@H_~pDMZs
b1192b
zCkPZHDwByoA}|(#IXMHTH!?F*IkZi0J!`HG1jY`v)Jp^sfdT=apgiX0!48uK+ALcj
b1192b
zA7!FcG}(x7wMX!#9Mp(UiE6tWu_~F`6WF@-6xLh>iV>B`L?96ui-1pi)&}t0pQmuO
b1192b
zjkyJsVOUM<GMP{aPNG(uQqU7BO*JrM;MP-Ea}gLj)KV`INCXN5eA>gmwe@7qN10I9
b1192b
zJnQFaaaNa1)QE6v^SRD1_?K{4D-+mj;go%g0uR}&)}73yl*wXNFR*9xaw{yTA~}>Q
b1192b
z^yXO{Nm+}UZVorxR_(zZI&Klm=)3wD;a`iFUw_NQw&>0=^=5RKxw+-`m35JqR3^8{
b1192b
zrxeR
b1192b
zQGn}t5{MdWV43A`5d=ytLU>A9$jrv$M08l~3*$q$_%GvhQ_IVEC`YEO>5ms|O#*GH
b1192b
zA@<#MSL75e(kPl-$q4fcQ$-RIJm=Eod;Hh(Est8h-d+>i#s@Dy=!E5`oxgl>eR>8$
b1192b
zM1krkyE^g?$1Xqq%o*w|ezZlY+Pe6vqHrRKSz1RkS|&+b80r0u9crnU2qXdp0zRW)
b1192b
z4VIvFX*cGe+#CNEER5O|{0mEpG}#kk+p$8R2n9A4Y0!#FVNzIC)uCM}cn`xyUWQdw
b1192b
z3l@f;rKYP((H5Gr$(|rLmcp
b1192b
z;7VB4trSJ>6r6t4$t%^Y9|aV;zhXpXG7(4w#v
b1192b
zwfPq{Ht5g%E27k2izosmhpPf4NTz7fi|S}dy@r3`Ww9rJBxWcq*ep6R{-qbRE;lH`
b1192b
z2v;wBhQ!sJ_Sh`?h-Iiy3~Qc6fKRnKQ>;g_pi8C^6vkSC$P`*s&}yzMDvEz)yfEm_
b1192b
z7UYXRGFxzcmx9L*wbV-l5`h8%pMLP~9LB%3=Wpg;go2x>0+)%o8vF~Zq89m=8Cd=C
b1192b
zh%$?Ne>j>DUY1daGYOG@d*ffVC6^rkGL@mInS2bQ<2aW&VtOG?S1le_8es(DS&^Xk
b1192b
zFeC9Su_qJ3Y**b-5;U4*`X`oDb(k?0LCujvDP6ka&x@(cq=c!tmw#h`jB%3jM^Y`y
b1192b
zNMWHEQJG8x5`nP@_%s{jUojMf0^?{?jOnBWY)-+yFfw#D$iGlCYHW^wp+8SPz>LgA
b1192b
zxKk3KPLxHL@UNLv{EI2rc`*KUEoNYRognNj+EU-$99$e9+{IXuxV83N3s#LmE}Hr=
b1192b
zBkX(#u{+O;T5Q5ZDS8!$I`eL$EB>Pi6EtMq{Y3^R){eiiLoM|ZfkdD{z$en+`~y)W
b1192b
z%9{V}WnN{nM~$enJ^#=f|B6^)w^_x%G{;MG9N{wOK
b1192b
z{sGQaTM#;z83Pyv*j#-<$HWcsnd6{B!qvtvM#?B_A~;&;Wl0Q5M^x*%f*9U*`8UpK
b1192b
zK;OMT)>>c$Hz0j310?+`MpPyffka>|0zQid`L~FF3kr@&Y_87uSIrS}iWU{m5(sm_
b1192b
zfR~|it^|;>m=rY=;$ZwM{#8isTHt^wHkxpzVUz$GcE%h%7-JSj2s6#sVp|2F;#SzO
b1192b
z_ebn31?oCbZO6anda6(t)}~_IlT?l}i>Aj8wbV-l5`h8%pTqEPT
b1192b
zZTvfO{=qRROzP)v^a7gm!!+@u_b@UX%GMkIN^NldLGdq>zaT>uOf~q|a}+cx{*6-y
b1192b
z&|I9i^&uz(0##TKvO`&G(L4zNOLoIpRVO~J@vqptTM_#z8o4J%4&iUU|F<}$GMNaB
b1192b
zM!@I%$oLm#G0)ZnY{HE2X?u(F15{Z>{>1_l!5E<
b1192b
zsOl&<)EyuHs;>AqhNaBmwkID7H=H#8LX<@iYMn@?(6@eye;fR3%8nG=%~X!f%J}H9
b1192b
zmWqi$A~1=7&)c~bc<96*r?r1Yi|~}mZnpEk%p}10SYXp?1Oiq4EgX!@GebgS887A^
b1192b
zplJoOD0mrz9rH8-I^FqS42oN=Z$b0F3c5wy+~Y%S;x9i>v;Ihd(AE6tx!s~}q+095
b1192b
zOig9PT5
b1192b
ztH8EAQWzQkcGo{(ABKfk;X8<uj&xfjD5eO7?)o$FGDSF0RP>`Z>N@_#zD%)aez~YZ
b1192b
z5<7N=$qFe%>YSQ?x$AdKia@Aa{8+&j*FV6U`iXy47lw^b&!j*|>&ruzpwW?n*q^?{
b1192b
z-{`THiitoXFo}RqBw{_Njg6ab36h;eKpBSh#I6J<;T_3@y*4{uSQY-oD<}^_giK*r
b1192b
zE(Z32Kp3w?h?ElWdfvn9e<5ELp{eC-=x`~bme@J2n&9f9Xj--4Xoto`+_4t^U{DA^
b1192b
zg
b1192b
zIiNC?2qXfd5%9SLahPzS+PG
b1192b
zswiJZ{4NW)QZy>damB9JKZs
b1192b
zp{qO67NAAg(`<+U3zGvann1}cnuzlcu`V(di-&tsz$`^
b1192b
zpY8DvD<b(u8RhxoU&X(o!pL0qP=a_?+!y(m*;^(VM3>s5qfIuEVafQ{8IFHZ(DOQ1
b1192b
zL2xbpxXzOgb_Q=@TibU
b1192b
z6XsudInuQ1dOiWQZmI1n+%B9XIXR#*l?WsPqY?1wr1)2%Zsgo3qYUM>gI`Lgj(=e>
b1192b
zMU)Nx<vO9YaXjPljlX-r<pCB}%u85Gl**>~l!_3pH4%7MB!8D7Ym`!#`P^=;NZCbo
b1192b
zYOx$bt!NLA<3PMHxQa+n1P7P-kAtlc1qjqsh;qTF)Ya?(MW}frTqQq}wQSO~Vq}Qh
b1192b
z(-f*jPBe}T?|02&p|)mY^jJ&9L?98EM8M}fR1&GSE3cmU2gQ#K{
b1192b
zUD(j5%f*8#)Gf$*unM)>RlEdP#0v4%e#ImMtXlgq`3qxe(=
b1192b
zyEZsEpfZ&RBm$!m@L5#M|MmvLD9=g!OGL>XJ#6JYIXtR@d=>u^LP`e(>mc9&@wKiE
b1192b
zc&HqAVc`n|ry^h7)I+R9qY#{9VVIYkI8%WpISctWdaR{lB9I77BH$Byb;iFCsAmRr
b1192b
zzpp*yt4)&zWELCVdj1!(?!C=-j~1rjIaU)fH~SDS;V>JF?D
b1192b
zM!@H`<KN!M7si~!`3J&VJ>c?VD+y4lwj$q2yfy#A(Q6|A(gmX6F3%RUOA>-!_~c7>
b1192b
zMvt{rOau~vNd(NlgYhpEjPjh!KVV9MEl;c1khOQTTV%Qv2e=GKpUn9EA$Mer5cK^a
b1192b
z0$zgOF7uMf$_Hj(*NETbfXY-NkO+)Mz-Ku8OK1r*D%6!w>``Ws028(CB@lz_AM`0q
b1192b
zf7)`qfCKTHn1c<ucMDcvF&WReh=>Vw*|W7Di!H#8j2>&Lm
b1192b
zlERvWz~q3+R3eZFj7GqxI<X{ws@vXB9;s%tDXjGfj2>&Lm<S{SlL(j{SPiDtvf8t>
b1192b
z3nA`FS~-P8zz9qZs7xgSiNI(Cd=~L6i)U-?&B`ex0!Co;SWCr3AQ6~Ez-LjxzeQ5K
b1192b
zY~>UZ0V6OupfZ&RBm$!m@L9z4LO1x0ER1aB6cPa=FnX+|Vj_?TOd{a3C{nG6SUEA@
b1192b
z$|)oQMqqM4WhxO!1V$s^v#1gOnu4vILLy)UMvt{rOau~vNd$ZrnPj`O5YDl33W
b1192b
zm>f`<N(2&t(Fph~>WzQnL<F*xQ%D4i!054-iitoXFo}TAq9XoPvdFY@3W<Obm>f`<
b1192b
zN(2&t(Fph~a{Oz~wUF}
b1192b
z2#iL+XOZJy6K+?qateun5g0wzQZW%o1SS#iS(Go
b1192b
zP6WCLj2>&Lm
b1192b
BLUI5A
b1192b
b1192b
literal 0
b1192b
HcmV?d00001
b1192b
b1192b
diff --git a/MdeModulePkg/Logo/Logo-OpenSSL.idf b/MdeModulePkg/Logo/Logo-OpenSSL.idf
b1192b
new file mode 100644
b1192b
index 0000000..a80de29
b1192b
--- /dev/null
b1192b
+++ b/MdeModulePkg/Logo/Logo-OpenSSL.idf
b1192b
@@ -0,0 +1,15 @@
b1192b
+// /** @file
b1192b
+// Platform Logo image definition file.
b1192b
+//
b1192b
+// Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
b1192b
+//
b1192b
+// This program and the accompanying materials
b1192b
+// are licensed and made available under the terms and conditions of the BSD License
b1192b
+// which accompanies this distribution. The full text of the license may be found at
b1192b
+// http://opensource.org/licenses/bsd-license.php
b1192b
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
b1192b
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
b1192b
+//
b1192b
+// **/
b1192b
+
b1192b
+#image IMG_LOGO Logo-OpenSSL.bmp
b1192b
diff --git a/MdeModulePkg/Logo/LogoOpenSSLDxe.inf b/MdeModulePkg/Logo/LogoOpenSSLDxe.inf
b1192b
new file mode 100644
b1192b
index 0000000..2f79d87
b1192b
--- /dev/null
b1192b
+++ b/MdeModulePkg/Logo/LogoOpenSSLDxe.inf
b1192b
@@ -0,0 +1,61 @@
b1192b
+## @file
b1192b
+#  The default logo bitmap picture shown on setup screen.
b1192b
+#
b1192b
+#  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
b1192b
+#
b1192b
+#  This program and the accompanying materials
b1192b
+#  are licensed and made available under the terms and conditions of the BSD License
b1192b
+#  which accompanies this distribution. The full text of the license may be found at
b1192b
+#  http://opensource.org/licenses/bsd-license.php
b1192b
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
b1192b
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
b1192b
+#
b1192b
+#
b1192b
+##
b1192b
+
b1192b
+[Defines]
b1192b
+  INF_VERSION                    = 0x00010005
b1192b
+  BASE_NAME                      = LogoOpenSSLDxe
b1192b
+  MODULE_UNI_FILE                = LogoOpenSSLDxe.uni
b1192b
+  FILE_GUID                      = 9CAE7B89-D48D-4D68-BBC4-4C0F1D48CDFF
b1192b
+  MODULE_TYPE                    = DXE_DRIVER
b1192b
+  VERSION_STRING                 = 1.0
b1192b
+
b1192b
+  ENTRY_POINT                    = InitializeLogo
b1192b
+#
b1192b
+#  This flag specifies whether HII resource section is generated into PE image.
b1192b
+#
b1192b
+  UEFI_HII_RESOURCE_SECTION      = TRUE
b1192b
+
b1192b
+#
b1192b
+# The following information is for reference only and not required by the build tools.
b1192b
+#
b1192b
+#  VALID_ARCHITECTURES           = IA32 X64
b1192b
+#
b1192b
+
b1192b
+[Sources]
b1192b
+  Logo-OpenSSL.bmp
b1192b
+  Logo.c
b1192b
+  Logo-OpenSSL.idf
b1192b
+
b1192b
+[Packages]
b1192b
+  MdeModulePkg/MdeModulePkg.dec
b1192b
+  MdePkg/MdePkg.dec
b1192b
+
b1192b
+[LibraryClasses]
b1192b
+  UefiBootServicesTableLib
b1192b
+  UefiDriverEntryPoint
b1192b
+  DebugLib
b1192b
+
b1192b
+[Protocols]
b1192b
+  gEfiHiiDatabaseProtocolGuid        ## CONSUMES
b1192b
+  gEfiHiiImageExProtocolGuid         ## CONSUMES
b1192b
+  gEfiHiiPackageListProtocolGuid     ## PRODUCES CONSUMES
b1192b
+  gEdkiiPlatformLogoProtocolGuid     ## PRODUCES
b1192b
+
b1192b
+[Depex]
b1192b
+  gEfiHiiDatabaseProtocolGuid AND
b1192b
+  gEfiHiiImageExProtocolGuid
b1192b
+
b1192b
+[UserExtensions.TianoCore."ExtraFiles"]
b1192b
+  LogoDxeExtra.uni
b1192b
diff --git a/MdeModulePkg/Logo/LogoOpenSSLDxe.uni b/MdeModulePkg/Logo/LogoOpenSSLDxe.uni
b1192b
new file mode 100644
b1192b
index 0000000..7227ac3
b1192b
--- /dev/null
b1192b
+++ b/MdeModulePkg/Logo/LogoOpenSSLDxe.uni
b1192b
@@ -0,0 +1,22 @@
b1192b
+// /** @file
b1192b
+// The logo bitmap picture (with OpenSSL advertisment) shown on setup screen.
b1192b
+//
b1192b
+// This module provides the logo bitmap picture (with OpenSSL advertisment)
b1192b
+// shown on setup screen, through EDKII Platform Logo protocol.
b1192b
+//
b1192b
+// Copyright (c) 2016, Intel Corporation. All rights reserved.
b1192b
+//
b1192b
+// This program and the accompanying materials
b1192b
+// are licensed and made available under the terms and conditions of the BSD License
b1192b
+// which accompanies this distribution. The full text of the license may be found at
b1192b
+// http://opensource.org/licenses/bsd-license.php
b1192b
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
b1192b
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
b1192b
+//
b1192b
+// **/
b1192b
+
b1192b
+
b1192b
+#string STR_MODULE_ABSTRACT             #language en-US "Provides the logo bitmap picture (with OpenSSL advertisment) shown on setup screen."
b1192b
+
b1192b
+#string STR_MODULE_DESCRIPTION          #language en-US "This module provides the logo bitmap picture (with OpenSSL advertisment) shown on setup screen, through EDKII Platform Logo protocol."
b1192b
+
b1192b
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
b1192b
index 2d6c4c4..a5bb2b0 100644
b1192b
--- a/OvmfPkg/OvmfPkgIa32.dsc
b1192b
+++ b/OvmfPkg/OvmfPkgIa32.dsc
b1192b
@@ -687,7 +687,11 @@
b1192b
       NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf
b1192b
 !endif
b1192b
   }
b1192b
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
b1192b
+  MdeModulePkg/Logo/LogoOpenSSLDxe.inf
b1192b
+!else
b1192b
   MdeModulePkg/Logo/LogoDxe.inf
b1192b
+!endif
b1192b
   MdeModulePkg/Application/UiApp/UiApp.inf {
b1192b
     <LibraryClasses>
b1192b
       NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
b1192b
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
b1192b
index 0427ded..f552bc9 100644
b1192b
--- a/OvmfPkg/OvmfPkgIa32.fdf
b1192b
+++ b/OvmfPkg/OvmfPkgIa32.fdf
b1192b
@@ -295,7 +295,11 @@ INF  ShellPkg/Application/Shell/Shell.inf
b1192b
 INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
b1192b
 !endif
b1192b
 
b1192b
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
b1192b
+INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
b1192b
+!else
b1192b
 INF MdeModulePkg/Logo/LogoDxe.inf
b1192b
+!endif
b1192b
 
b1192b
 #
b1192b
 # Network modules
b1192b
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
b1192b
index 43158c5..be8fee9 100644
b1192b
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
b1192b
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
b1192b
@@ -696,7 +696,11 @@
b1192b
       NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf
b1192b
 !endif
b1192b
   }
b1192b
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
b1192b
+  MdeModulePkg/Logo/LogoOpenSSLDxe.inf
b1192b
+!else
b1192b
   MdeModulePkg/Logo/LogoDxe.inf
b1192b
+!endif
b1192b
   MdeModulePkg/Application/UiApp/UiApp.inf {
b1192b
     <LibraryClasses>
b1192b
       NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
b1192b
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
b1192b
index 6df47f4..ee77ae1 100644
b1192b
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
b1192b
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
b1192b
@@ -296,7 +296,11 @@ INF  ShellPkg/Application/Shell/Shell.inf
b1192b
 INF  RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf
b1192b
 !endif
b1192b
 
b1192b
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
b1192b
+INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
b1192b
+!else
b1192b
 INF MdeModulePkg/Logo/LogoDxe.inf
b1192b
+!endif
b1192b
 
b1192b
 #
b1192b
 # Network modules
b1192b
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
b1192b
index d1fdf7c..e224b0e 100644
b1192b
--- a/OvmfPkg/OvmfPkgX64.dsc
b1192b
+++ b/OvmfPkg/OvmfPkgX64.dsc
b1192b
@@ -694,7 +694,11 @@
b1192b
       NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf
b1192b
 !endif
b1192b
   }
b1192b
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
b1192b
+  MdeModulePkg/Logo/LogoOpenSSLDxe.inf
b1192b
+!else
b1192b
   MdeModulePkg/Logo/LogoDxe.inf
b1192b
+!endif
b1192b
   MdeModulePkg/Application/UiApp/UiApp.inf {
b1192b
     <LibraryClasses>
b1192b
       NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
b1192b
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
b1192b
index 2e2a174..505d25d 100644
b1192b
--- a/OvmfPkg/OvmfPkgX64.fdf
b1192b
+++ b/OvmfPkg/OvmfPkgX64.fdf
b1192b
@@ -296,7 +296,11 @@ INF  ShellPkg/Application/Shell/Shell.inf
b1192b
 INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
b1192b
 !endif
b1192b
 
b1192b
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
b1192b
+INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
b1192b
+!else
b1192b
 INF MdeModulePkg/Logo/LogoDxe.inf
b1192b
+!endif
b1192b
 
b1192b
 #
b1192b
 # Network modules
b1192b
-- 
b1192b
1.8.3.1
b1192b