From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=mk+UF/L5; spf=pass (domain: linaro.org, ip: 209.85.166.67, mailfrom: ard.biesheuvel@linaro.org) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by groups.io with SMTP; Tue, 25 Jun 2019 01:50:29 -0700 Received: by mail-io1-f67.google.com with SMTP id i10so155804iol.13 for ; Tue, 25 Jun 2019 01:50:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=yZa1zSiKHFTlh8roMIQlrqv76NV4l/5B5A46HKruAkQ=; b=mk+UF/L5iJqSiw9ZCMnwjUm7VWX2p1q486tRzl8ZP4Tv5dWv11QS2amdRRAyZ2yAD1 lvzm3By5YDWXxEgpuprIZD0gZG7ojNgigeKaPYm6A+PMxq3LJM7i/2lyg+20vcXpToTQ gqR/ate2OX2lxLVjs7veNCMshkxDXFub0V+FtVuACKM8qv1ciZuBoxfIuzbLA7ozaE1a 4SRDlKXFUDvmDk7gPlfJ+JDZ7K6lz9UNwmVpmp1vexZsk9UTE0pADUdC9dQfjjuOUlX+ Xk4SVrP3ouYyz5DK2rOAm+kE4voFKee1+ymQgeI9QkJYVkpslLk9IurMcrVAvWVxeJgr g8Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=yZa1zSiKHFTlh8roMIQlrqv76NV4l/5B5A46HKruAkQ=; b=k3PqEuxPZXkQEF46W6txINgWU2//jap9dirU4MVRc+Jb2DstpfguY0fShIBConw2I9 j8H3byef4XufvIYQRIHrvofZK8a7NbM8r5E3GR8ep9t9h3YxwjODLpmRZfJ7jcP4PS3s uhBXemlJlT2/nD5DzSYjnDWUz5tQXMp9EAu/mCke8kDBk1zwPpixfbrLc4/yuTQjkSJ9 pJLWLnIEZUX2E0Rcq/BcIRFn1L9+tVu+RBr0GBgwhrcgoGkrl/0YT7Ddwt2+aKIT9ers HJeeuFARnmt/S+OGGTIPUsHk/u6nTPOAIPUIEzTyY7k+XYZ52uWanaEF4ylTrvCH/jGc szyw== X-Gm-Message-State: APjAAAWBOdhDbBuopmoI6q0Cu8nnQg0MgZYgy0RMDQppdM3wghzgiYRP C3rIUe5vZNyovrq7smoU3Bfka3Dc3tQk85rFyLHv0w== X-Google-Smtp-Source: APXvYqzhTM+Aqnb2hjD7SXFAP4hLgyZZO0aYGh5beUKun2tAQTDkfrjkZCKWxrVJH/zzporD7ftv3uohUjU8vMJmDrc= X-Received: by 2002:a02:5a89:: with SMTP id v131mr23157358jaa.130.1561452627651; Tue, 25 Jun 2019 01:50:27 -0700 (PDT) MIME-Version: 1.0 References: <20190624191336.31611-1-lersek@redhat.com> In-Reply-To: <20190624191336.31611-1-lersek@redhat.com> From: "Ard Biesheuvel" Date: Tue, 25 Jun 2019 10:50:14 +0200 Message-ID: Subject: Re: [PATCH] ArmVirtPkg: handle NETWORK_TLS_ENABLE in ArmVirtQemu* To: Laszlo Ersek Cc: edk2-devel-groups-io , Gary Lin , Guillaume GARDET , Julien Grall Content-Type: text/plain; charset="UTF-8" On Mon, 24 Jun 2019 at 21:13, Laszlo Ersek wrote: > > Port the [LibraryClasses], [PcdsFixedAtBuild] and [Components] settings > that are related to NETWORK_TLS_ENABLE from OvmfPkg to ArmVirtPkg. > ArmVirtXen is not modified because it doesn't include the edk2 network > stack. > > (This change is now simpler than it would have been when TianoCore#1009 > was originally filed, due to ArmVirtPkg consuming the NetworkPkg include > fragments meanwhile, from TianoCore#1293 / commit 157a3b1aa50f.) > > The usage hints from "OvmfPkg/README", section "HTTPS Boot", apply. > > Cc: Ard Biesheuvel > Cc: Gary Lin > Cc: Guillaume GARDET > Cc: Julien Grall > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1009 > Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel > --- > > Notes: > Repo: https://github.com/lersek/edk2.git > Branch: armvirt_tls_bz1009 > > ArmVirtPkg/ArmVirt.dsc.inc | 7 +++++++ > ArmVirtPkg/ArmVirtQemu.dsc | 18 ++++++++++++++---- > ArmVirtPkg/ArmVirtQemuKernel.dsc | 18 ++++++++++++++---- > 3 files changed, 35 insertions(+), 8 deletions(-) > > diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc > index 20bf011617a1..a4ae25d982a2 100644 > --- a/ArmVirtPkg/ArmVirt.dsc.inc > +++ b/ArmVirtPkg/ArmVirt.dsc.inc > @@ -71,6 +71,9 @@ [LibraryClasses.common] > > # Networking Requirements > !include NetworkPkg/NetworkLibs.dsc.inc > +!if $(NETWORK_TLS_ENABLE) == TRUE > + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf > +!endif > > > # > @@ -136,7 +139,11 @@ [LibraryClasses.common] > # CryptoPkg libraries needed by multiple firmware features > # > IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > +!if $(NETWORK_TLS_ENABLE) == TRUE > + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > +!else > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > +!endif > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > > # > diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc > index cf28478977e1..7ae6702ac1f0 100644 > --- a/ArmVirtPkg/ArmVirtQemu.dsc > +++ b/ArmVirtPkg/ArmVirtQemu.dsc > @@ -43,10 +43,6 @@ [Defines] > !error "NETWORK_SNP_ENABLE is IA32/X64/EBC only" > !endif > > -!if $(NETWORK_TLS_ENABLE) == TRUE > - !error "NETWORK_TLS_ENABLE is tracked at " > -!endif > - > !include NetworkPkg/NetworkDefines.dsc.inc > > !include ArmVirtPkg/ArmVirt.dsc.inc > @@ -113,6 +109,14 @@ [PcdsFixedAtBuild.common] > gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x4000 > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000 > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800 > +!if $(NETWORK_TLS_ENABLE) == TRUE > + # > + # The cumulative and individual VOLATILE variable size limits should be set > + # high enough for accommodating several and/or large CA certificates. > + # > + gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x80000 > + gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVolatileVariableSize|0x40000 > +!endif > > # Size of the region used by UEFI in permanent memory (Reserved 64MB) > gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000 > @@ -372,6 +376,12 @@ [Components.common] > # Networking stack > # > !include NetworkPkg/NetworkComponents.dsc.inc > +!if $(NETWORK_TLS_ENABLE) == TRUE > + NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf { > + > + NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf > + } > +!endif > > # > # SCSI Bus and Disk Driver > diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc > index 596e59739cab..3b0f04967a4b 100644 > --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc > +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc > @@ -43,10 +43,6 @@ [Defines] > !error "NETWORK_SNP_ENABLE is IA32/X64/EBC only" > !endif > > -!if $(NETWORK_TLS_ENABLE) == TRUE > - !error "NETWORK_TLS_ENABLE is tracked at " > -!endif > - > !include NetworkPkg/NetworkDefines.dsc.inc > > !include ArmVirtPkg/ArmVirt.dsc.inc > @@ -118,6 +114,14 @@ [PcdsFixedAtBuild.common] > gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x4000 > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000 > gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800 > +!if $(NETWORK_TLS_ENABLE) == TRUE > + # > + # The cumulative and individual VOLATILE variable size limits should be set > + # high enough for accommodating several and/or large CA certificates. > + # > + gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x80000 > + gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVolatileVariableSize|0x40000 > +!endif > > # Size of the region used by UEFI in permanent memory (Reserved 64MB) > gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000 > @@ -356,6 +360,12 @@ [Components.common] > # Networking stack > # > !include NetworkPkg/NetworkComponents.dsc.inc > +!if $(NETWORK_TLS_ENABLE) == TRUE > + NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf { > + > + NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf > + } > +!endif > > # > # SCSI Bus and Disk Driver > -- > 2.19.1.3.g30247aa5d201 >