From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.groups.io with SMTP id smtpd.web11.4841.1582814470630124893 for ; Thu, 27 Feb 2020 06:41:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=koSdoYIT; spf=pass (domain: linaro.org, ip: 209.85.128.65, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f65.google.com with SMTP id z12so3841033wmi.4 for ; Thu, 27 Feb 2020 06:41:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ef7a7GlcrAF/qsTg0XJeuoemiDD2yEwgRhw42Tqci14=; b=koSdoYIT72HZOxz+KdQ1i54ktXL30cIx0kuKFgkRLDOTIj08e+mdppAcn5KHDTeZWW RxFtfa0AcgfIUfIGsFZlHcIDBMWQyaXWR9uP1che9hznt2K8lrHnZUDbiUSUZQaHBGhs nY6mesRiiHUjCUX00b5h5QNetzYlYN8ukW1QUFldoFQHZ3M5teq4bY3/E1BQVkg+LZni S5joIfBhvhOkHR3IhmkL/20O93ShwSexTO26OF8ESl/cUJHs1NgZ0nfZ2C3PMJd2/2g7 oF0eBdSWxRUd1lx4S+Vn983W+t51Kjurhbqd397nCCxKMHrSBwSUfmsTEUEHsTnnuWBo raGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ef7a7GlcrAF/qsTg0XJeuoemiDD2yEwgRhw42Tqci14=; b=G8Rxj57NqA8q4vq7PO7ifz/j0KtzJargO1b4Wc9QSM70ssKEzVFFtsaYTG6zw7XDL8 kE0ehlK2VEEhpI75gzpCHpP2P3BhinOmORM2s71u48hRpils+bbRCPNCyQsKVfyBENO5 yXn4LCwXsXnhgn76ffogQww1QkbiKjj0QvQZXGPq/3Gy3zYhZAwVOuWsT5U9BNp0WwYS 8Jm/VmJZ5gq6ZdYzChRIU55q9uUQmACexW/aVfrhi+0IjUre/yY+pF7SVTO1QaKbPxkI FAXs3jwnEcVgzi+0+viKTvozVcS7P3LJIPxnWSguU3jwLg+QMEZcFnCHsu/q6vGIaVNg 7Okw== X-Gm-Message-State: APjAAAVYycCYiF0q2xFlI1X4PO9Cor+P7CNRnXhqztCixr5AcRJAcUGl D1AgLMh/GbrW6PP60xxBoa9hlJkCwmY= X-Google-Smtp-Source: APXvYqze/7d6ugevIus52W3E0AziKJGRFE0NEfO+I59l4z5KNq5bmMGjQnWpYTkQ+ODBsABdQvLZDA== X-Received: by 2002:a1c:bb82:: with SMTP id l124mr5552703wmf.176.1582814468716; Thu, 27 Feb 2020 06:41:08 -0800 (PST) Return-Path: Received: from localhost.localdomain (aaubervilliers-682-1-29-142.w90-88.abo.wanadoo.fr. [90.88.192.142]) by smtp.gmail.com with ESMTPSA id k7sm8273575wrq.12.2020.02.27.06.41.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 06:41:07 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , lersek@redhat.com, eric.auger@redhat.com, philmd@redhat.com, marcandre.lureau@redhat.com, stefanb@linux.ibm.com, leif@nuviainc.com Subject: [PATCH v4 07/11] ArmVirtPkg; avoid DxeTpmMeasurementLib in shared .DSC Date: Thu, 27 Feb 2020 15:40:52 +0100 Message-Id: <20200227144056.56988-8-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200227144056.56988-1-ard.biesheuvel@linaro.org> References: <20200227144056.56988-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DxeTpmMeasurementLib should only be used on platforms that implement measured boot, which we will do in a future patch, but only for ArmVirtQemu, as the remaining ones are fundamentally incompatible, given that they do not implement a PEI phase. So use TpmMeasurementLibNull as the default resolution for all ArmVirtPkg platforms, regardless of how they are built. This mirrors commit 1ec05b81e59f ("OvmfPkg: use DxeTpmMeasurementLib if and only if TPM2_ENABLE", 2019-07-04). Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirt.dsc.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 10037c938eb8..8f9617359607 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -165,15 +165,14 @@ [LibraryClasses.common] # Secure Boot dependencies # !if $(SECURE_BOOT_ENABLE) == TRUE - TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf !else - TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf !endif + TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf -- 2.20.1