From patchwork Tue Oct 31 08:37:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gylstorff Quirin X-Patchwork-Id: 13441264 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E798C00144 for ; Tue, 31 Oct 2023 08:49:49 +0000 (UTC) Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net [185.136.65.225]) by mx.groups.io with SMTP id smtpd.web10.181752.1698742187874120935 for ; Tue, 31 Oct 2023 01:49:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=Quirin.Gylstorff@siemens.com header.s=fm1 header.b=joPV2g9q; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.225, mailfrom: fm-51332-20231031084945508ccc02151a4b986d-jgakxs@rts-flowmailer.siemens.com) Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20231031084945508ccc02151a4b986d for ; Tue, 31 Oct 2023 09:49:46 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=Nt4ntYuEiRNzFR4nPCmUdhjkXsvSVVP9iudmSUyKetc=; b=joPV2g9q/cAVEWRcd61ld/iK/HVQyo9sFrFnXVJrmCacnTcGgeOa+BKG3wt+52ifsdaxrw Wy9d1iqoW+5zbtk4WubUcwGNjfXW4gyRMbTPo2g+rc4etZnBEa700maTvXNiFnjhUDXGaT2o l6jOfAPNc+3TLnw9dw2g7CHVKs9gM=; From: Quirin Gylstorff To: jan.kiszka@siemens.com, cip-dev@lists.cip-project.org, venkata.pyla@toshiba-tsip.com, dinesh.kumar@toshiba-tsip.com, kazuhiro3.hayashi@toshiba.co.jp Subject: [cip-dev][isar-cip-core][RFC v2 7/9] cip-core-image-security: Move packages to security-customization Date: Tue, 31 Oct 2023 09:37:41 +0100 Message-ID: <20231031084943.3105056-8-Quirin.Gylstorff@siemens.com> In-Reply-To: <20231031084943.3105056-1-Quirin.Gylstorff@siemens.com> References: <20231031084943.3105056-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 31 Oct 2023 08:49:49 -0000 X-Groupsio-URL: https://lists.cip-project.org/g/cip-dev/message/13505 From: Quirin Gylstorff To ensure that the package security-customizations is installable move packages from cip-core-image-security as dependencies to security-packges. Remove libtss2-esys* as it is already installed together with tpm2-tools. Signed-off-by: Quirin Gylstorff --- recipes-core/images/cip-core-image-security.bb | 12 +----------- .../security-customizations.bb | 11 ++++++++--- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/recipes-core/images/cip-core-image-security.bb b/recipes-core/images/cip-core-image-security.bb index 3421ce5..525a346 100644 --- a/recipes-core/images/cip-core-image-security.bb +++ b/recipes-core/images/cip-core-image-security.bb @@ -28,24 +28,14 @@ IMAGE_PREINSTALL += " \ tpm2-tools \ tpm2-abrmd \ acl \ - audispd-plugins auditd \ + audispd-plugins \ uuid-runtime \ sudo \ aide-common \ - libpam-google-authenticator \ passwd \ login \ - libpam-runtime \ util-linux \ " -# Package names based on the distro version -IMAGE_PREINSTALL:append:buster = " libtss2-esys0 \ - libpam-cracklib" -IMAGE_PREINSTALL:append:bullseye = " libtss2-esys-3.0.2-0 \ - libpam-cracklib" -IMAGE_PREINSTALL:append:bookworm = " libtss2-esys-3.0.2-0 \ - libpam-passwdqc" - CIP_IMAGE_OPTIONS ?= "" require ${CIP_IMAGE_OPTIONS} diff --git a/recipes-core/security-customizations/security-customizations.bb b/recipes-core/security-customizations/security-customizations.bb index d3cede8..75a6a99 100644 --- a/recipes-core/security-customizations/security-customizations.bb +++ b/recipes-core/security-customizations/security-customizations.bb @@ -11,14 +11,19 @@ inherit dpkg-raw -DESCRIPTION = "CIP Security image for IEC62443-4-2 evaluation" +DESCRIPTION = "CIP Security configuration for IEC62443-4-2 evaluation" SRC_URI = "file://postinst \ file://ssh-remote-session-term.conf \ file://ssh-pam-remote.conf" -DEPENDS = "customizations, sshd-regen-keys" -DEBIAN_DEPENDS = "customizations , sshd-regen-keys, libpam-google-authenticator" +DEPENDS = "customizations sshd-regen-keys" +DEBIAN_DEPENDS = "customizations, sshd-regen-keys, libpam-google-authenticator, libpam-modules, libpam-runtime, auditd" + +# Package names based on the distro version +DEBIAN_DEPENDS:append:buster = ", libpam-cracklib" +DEBIAN_DEPENDS:append:bullseye = ", libpam-cracklib" +DEBIAN_DEPENDS:append:bookworm = ", libpam-passwdqc" do_install[cleandirs] += "${D}/etc/ssh/sshd_config.d/" do_install () {