On Thu, Sep 19, 2013 at 5:47 AM, Laszlo Ersek <ler...@redhat.com> wrote:
> (1) OVMF depends on
>
> MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
>
> unconditionally.
>
> (2) When OVMF is built with -D SECURE_BOOT_ENABLE, then
>
> SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
>
> is injected into SecurityStubDxe above.
>
> (3) SVN r14687 ("Add TPM2 implementation.") has made
> DxeImageVerificationLib dependent on TpmMeasurementLib.
Wow. r14687 certainly is a mega-patch. :(
Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com>
and, applied. Thanks for the contribution.
I think NT32 might have a similar issue. ??
And, another note... It seems like EmulatorPkg could support
SECURE_BOOT_ENABLE as well. But, if it did, then I guess it would have
this bug as well. :)
-Jordan
> Currently the last link of the
>
> OVMF -> SecurityStubDxe -> DxeImageVerificationLib -> TpmMeasurementLib
>
> dependency chain is unresolved:
>
> build.py...
> /.../OvmfPkg/OvmfPkgX64.dsc(...): error 4000: Instance of library class
> [TpmMeasurementLib] is not found
> in
> [/.../SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf]
> [X64]
> consumed by module
> [/.../MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf]
>
> Let's provide a library instance for TpmMeasurementLib the same way as
> "SecurityPkg/SecurityPkg.dsc" does (SVN r13964.)
>
> Contributed-under: TianoCore Contribution Agreement 1.0
>
> Signed-off-by: Laszlo Ersek <ler...@redhat.com>
> ---
> OvmfPkg/OvmfPkgIa32.dsc | 1 +
> OvmfPkg/OvmfPkgIa32X64.dsc | 1 +
> OvmfPkg/OvmfPkgX64.dsc | 1 +
> 3 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
> index 5f3c6eb..ae49562 100644
> --- a/OvmfPkg/OvmfPkgIa32.dsc
> +++ b/OvmfPkg/OvmfPkgIa32.dsc
> @@ -119,6 +119,7 @@
> PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf
> IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
> OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> +
> TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
> !endif
>
> [LibraryClasses.common]
> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
> index d883ba0..35a4ec6 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> @@ -124,6 +124,7 @@
> PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf
> IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
> OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> +
> TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
> !endif
>
> [LibraryClasses.common]
> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
> index dfb1580..2d56a35 100644
> --- a/OvmfPkg/OvmfPkgX64.dsc
> +++ b/OvmfPkg/OvmfPkgX64.dsc
> @@ -124,6 +124,7 @@
> PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf
> IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
> OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> +
> TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
> !endif
>
> [LibraryClasses.common]
> --
> 1.7.1
>
>
> ------------------------------------------------------------------------------
> LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
> 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
> 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
> Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13.
> http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/edk2-devel
------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/22/13.
http://pubads.g.doubleclick.net/gampad/clk?id=64545871&iu=/4140/ostg.clktrk
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel
