From patchwork Tue Feb 14 21:00:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 13140793 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9712C05027 for ; Tue, 14 Feb 2023 21:00:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230282AbjBNVAn (ORCPT ); Tue, 14 Feb 2023 16:00:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231969AbjBNVAn (ORCPT ); Tue, 14 Feb 2023 16:00:43 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5D1928235 for ; Tue, 14 Feb 2023 13:00:41 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 81DEA21A00; Tue, 14 Feb 2023 21:00:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1676408440; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TYcJm+mUzwv//7qeypwELJys5BsZ8uqh8Zo88thCzq0=; b=Ow/MSTXm37PvJJ+A1Pxjr43VyPAxHuInXRNMCv0jtY3NBlLw3qU7TczB9nkO3SkuhmhgB+ tHsbXOz+dlnbVvtj1U9dSjkmcaPpaNlbKL+dNTDAcstkFV/4bar/pG/wOX0IFndUViLsz7 hwP4CsodA5fgOT28h5jbW3Is4+O9jUY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1676408440; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TYcJm+mUzwv//7qeypwELJys5BsZ8uqh8Zo88thCzq0=; b=7e2sO5R0SCHTZCbvW3AXXajetxkaOwIFxMQ1QwZuFe+kETEdz1y/B3KSDdHt4FzcdVOQNS 1yJyR0UMuwb8a/Ag== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 29FAA13A21; Tue, 14 Feb 2023 21:00:40 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id kKmVCHj262OqeAAAMHmgww (envelope-from ); Tue, 14 Feb 2023 21:00:40 +0000 From: Petr Vorel To: linux-integrity@vger.kernel.org Cc: dmitry.kasatkin@gmail.com, vt@altlinux.org, stefanb@linux.ibm.com, Roberto Sassu , Petr Vorel , Mimi Zohar , Petr Vorel Subject: [PATCH ima-evm-utils 1/3] tests/install-swtpm.sh: Update ibmswtpm2 to 1682 Date: Tue, 14 Feb 2023 22:00:33 +0100 Message-Id: <20230214210035.585395-2-pvorel@suse.cz> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230214210035.585395-1-pvorel@suse.cz> References: <20230214210035.585395-1-pvorel@suse.cz> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org From: Petr Vorel At least on Tumbleweed build fails due openSSL 3.0.7 being installed from package. Signed-off-by: Petr Vorel --- Tested: https://github.com/pevik/ima-evm-utils/actions/runs/4177940689 tests/install-swtpm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/install-swtpm.sh b/tests/install-swtpm.sh index 51aa377..de9b5c7 100755 --- a/tests/install-swtpm.sh +++ b/tests/install-swtpm.sh @@ -9,7 +9,7 @@ else SUDO=sudo fi -version=1637 +version=1682 wget --no-check-certificate https://sourceforge.net/projects/ibmswtpm2/files/ibmtpm${version}.tar.gz/download mkdir ibmtpm$version From patchwork Tue Feb 14 21:00:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 13140794 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56766C64EC7 for ; Tue, 14 Feb 2023 21:00:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231969AbjBNVAo (ORCPT ); Tue, 14 Feb 2023 16:00:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231966AbjBNVAn (ORCPT ); Tue, 14 Feb 2023 16:00:43 -0500 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 325AB28236 for ; Tue, 14 Feb 2023 13:00:42 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id E23ED1FD80; Tue, 14 Feb 2023 21:00:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1676408440; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Jx3aoQpPlURtdpS95YrEpzAI8yfcmFdVy5Mly4yzLUQ=; b=GqcOkSYWHBeKFkpCs5e9uJtZZ93aWBJVSAUAkKEtHDngky/LobxiZ9hKMyqFpwSe5S7G2C WjU8Jv4faKayN6lioDKIgDEBsHQCqN0dhL7pIwFzzSDqsGyxMtLMi0XN8od2nT+cHJPLk/ A0M0z2+j/L1RJMASpETR6xBcSYBIxRk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1676408440; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Jx3aoQpPlURtdpS95YrEpzAI8yfcmFdVy5Mly4yzLUQ=; b=8mWMVUFAssF1Ct+hOG4o8yZ+eTybZ3drUHh5gOkwNUYukOVn9utP2g7zsxC7/+bRleK5xE fRPgbw4D65fwcSDQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 90D3713A21; Tue, 14 Feb 2023 21:00:40 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 6CkEIXj262OqeAAAMHmgww (envelope-from ); Tue, 14 Feb 2023 21:00:40 +0000 From: Petr Vorel To: linux-integrity@vger.kernel.org Cc: dmitry.kasatkin@gmail.com, vt@altlinux.org, stefanb@linux.ibm.com, Roberto Sassu , Petr Vorel , Mimi Zohar , Petr Vorel Subject: [PATCH ima-evm-utils 2/3] github: travis: Remove COMPILE_SSL from tumbleweed Date: Tue, 14 Feb 2023 22:00:34 +0100 Message-Id: <20230214210035.585395-3-pvorel@suse.cz> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230214210035.585395-1-pvorel@suse.cz> References: <20230214210035.585395-1-pvorel@suse.cz> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org From: Petr Vorel Distro has openSSL 3.0.7, no need to compile own openSSL 3.x. Signed-off-by: Petr Vorel --- Tested: https://github.com/pevik/ima-evm-utils/actions/runs/4177949788 .github/workflows/ci.yml | 1 - .travis.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b1eda8..c76c70a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,7 +124,6 @@ jobs: env: CC: clang TSS: ibmtss - COMPILE_SSL: openssl-3.0.5 - container: "opensuse/leap" env: diff --git a/.travis.yml b/.travis.yml index faaa4b5..00e9285 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ matrix: # glibc (gcc/clang) - os: linux - env: DISTRO=opensuse/tumbleweed TSS=ibmtss CONTAINER=podman CONTAINER_ARGS="--runtime=/usr/bin/crun --network=host" COMPILE_SSL=openssl-3.0.5 + env: DISTRO=opensuse/tumbleweed TSS=ibmtss CONTAINER=podman CONTAINER_ARGS="--runtime=/usr/bin/crun --network=host" compiler: clang - os: linux From patchwork Tue Feb 14 21:00:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 13140795 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEF71C6379F for ; Tue, 14 Feb 2023 21:00:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231966AbjBNVAp (ORCPT ); Tue, 14 Feb 2023 16:00:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231982AbjBNVAo (ORCPT ); Tue, 14 Feb 2023 16:00:44 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A0CD2823B for ; Tue, 14 Feb 2023 13:00:42 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 3D33821A01; Tue, 14 Feb 2023 21:00:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1676408441; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3GLxVLXyYH4+Xd+oEAaJtUiHvKOA8sWLpZi86XveBWI=; b=fBXpB//qgKKdikmDsfqPBG3rkoaHS9R8To19pG78z06QFE8dZyKf4nwL2RVvfH03UHixyU GW2AEsyLV2KQ2cmXr24Ph4NHQ/q0A8RN8Y8bNRXb4AyQ4vbQXu5BJYkd4Kesc8GApZN9js ErhctTkU9aV3O092GVo2dxha8ONywkE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1676408441; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3GLxVLXyYH4+Xd+oEAaJtUiHvKOA8sWLpZi86XveBWI=; b=9vvHMfo+LSXDbCyUXBfZR8Sag3K1afsUOZ9A8EMLL8UQlkQVTXJfivwWhAPBBbFZ56hFFP unWLlWc/ks0U9JCQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id EC2AF13A21; Tue, 14 Feb 2023 21:00:40 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id YFTDN3j262OqeAAAMHmgww (envelope-from ); Tue, 14 Feb 2023 21:00:40 +0000 From: Petr Vorel To: linux-integrity@vger.kernel.org Cc: dmitry.kasatkin@gmail.com, vt@altlinux.org, stefanb@linux.ibm.com, Roberto Sassu , Petr Vorel , Mimi Zohar , Petr Vorel Subject: [PATCH ima-evm-utils 3/3] github: Put openSSL build into own section Date: Tue, 14 Feb 2023 22:00:35 +0100 Message-Id: <20230214210035.585395-4-pvorel@suse.cz> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230214210035.585395-1-pvorel@suse.cz> References: <20230214210035.585395-1-pvorel@suse.cz> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org From: Petr Vorel That helps readability when reviewing logs. Signed-off-by: Petr Vorel --- Tested: https://github.com/pevik/ima-evm-utils/actions/runs/4177976359/jobs/7236222413 .github/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c76c70a..e3dcf3d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -192,7 +192,12 @@ jobs: INSTALL="${INSTALL%%/*}" if [ "$VARIANT" ]; then ARCH="$ARCH" ./ci/$INSTALL.$VARIANT.sh; fi ARCH="$ARCH" CC="$CC" TSS="$TSS" ./ci/$INSTALL.sh - if [ "$COMPILE_SSL" ]; then COMPILE_SSL="$COMPILE_SSL" VARIANT="$VARIANT" ./tests/install-openssl3.sh; fi + + - name: Build openSSL + run: | + if [ "$COMPILE_SSL" ]; then + COMPILE_SSL="$COMPILE_SSL" VARIANT="$VARIANT" ./tests/install-openssl3.sh; \ + fi - name: Build swtpm run: |