From patchwork Fri Oct 16 20:17:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mimi Zohar X-Patchwork-Id: 11842339 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5CB5114B4 for ; Fri, 16 Oct 2020 20:18:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 345C9212CC for ; Fri, 16 Oct 2020 20:18:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="M/YEApoO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393431AbgJPUSC (ORCPT ); Fri, 16 Oct 2020 16:18:02 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:13266 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393410AbgJPUSC (ORCPT ); Fri, 16 Oct 2020 16:18:02 -0400 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 09GK3XIx153897; Fri, 16 Oct 2020 16:18:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=pp1; bh=Fz8s+Y6NM8am8v2hGqcyvYJde8tmOV5gt2ucJKoEYQY=; b=M/YEApoOrN4LfjvF6usxroZqSp0+AfdoPQjMrF0Z19rm+VZp3nRkUHTfyBNaH7wTEnxc vc6rA3HTq7HJ9gqCKIPez7HKCJL8wNUGiORj9sIt/S8mE38No3T7RX3Qc3vQwRy+7RCt QidkxHaqapCjs5GXG9D4OVm6uoazchh+4cUmukLRUieq67VGpqfb/znqXqoRurKqdOHX VpgkU19F+iO8878AkwsaIrDWG+KbSyGCrHMyICKhu0t9fyFN+l7Gn5ZuQDdCKt55+syV 1tv4vnAJ/fgaHnTvnXC14JWRT70E9lo0dW62YjBu+uQnotshgAxXTSoNACsV7PkyVs0s pw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 347h5jt8gy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Oct 2020 16:18:00 -0400 Received: from m0098404.ppops.net (m0098404.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 09GK3g2C154597; Fri, 16 Oct 2020 16:17:59 -0400 Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 347h5jt8ga-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Oct 2020 16:17:59 -0400 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 09GKGXTM025964; Fri, 16 Oct 2020 20:17:57 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma03ams.nl.ibm.com with ESMTP id 3434k86p7c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Oct 2020 20:17:57 +0000 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 09GKHssc8061432 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 16 Oct 2020 20:17:54 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5FAB042045; Fri, 16 Oct 2020 20:17:54 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6621E42041; Fri, 16 Oct 2020 20:17:53 +0000 (GMT) Received: from li-f45666cc-3089-11b2-a85c-c57d1a57929f.ibm.com.com (unknown [9.160.113.249]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 16 Oct 2020 20:17:53 +0000 (GMT) From: Mimi Zohar To: linux-integrity@vger.kernel.org Cc: Ken Goldman , Mimi Zohar , Bruno Meneguele , Petr Vorel Subject: [ima-evm-utils][PATCH 1/3] travis: retry sending tssstartup Date: Fri, 16 Oct 2020 16:17:43 -0400 Message-Id: <20201016201745.124355-2-zohar@linux.ibm.com> X-Mailer: git-send-email 2.18.4 In-Reply-To: <20201016201745.124355-1-zohar@linux.ibm.com> References: <20201016201745.124355-1-zohar@linux.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687 definitions=2020-10-16_10:2020-10-16,2020-10-16 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 impostorscore=0 priorityscore=1501 mlxlogscore=999 lowpriorityscore=0 adultscore=0 mlxscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010160145 Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org The software TPM might not be listening for commands yet. Try re-sending the tssstartup. Reported-by: Ken Goldman Signed-off-by: Mimi Zohar --- tests/boot_aggregate.test | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/boot_aggregate.test b/tests/boot_aggregate.test index d58c54fa1110..edebf1d29f23 100755 --- a/tests/boot_aggregate.test +++ b/tests/boot_aggregate.test @@ -97,8 +97,20 @@ swtpm_init() { return "$SKIP" fi - echo "INFO: Walking ${BINARY_BIOS_MEASUREMENTS} initializing the software TPM" + echo "INFO: Sending software TPM startup" "${TSSDIR}/tssstartup" + if [ $? -ne 0 ]; then + echo "INFO: Retry sending software TPM startup" + sleep 1 + "${TSSDIR}/tssstartup" + fi + + if [ $? -ne 0 ]; then + echo "INFO: Software TPM startup failed" + return "$SKIP" + fi + + echo "INFO: Walking ${BINARY_BIOS_MEASUREMENTS} initializing the software TPM" # $(${TSSDIR}/tsseventextend -tpm -if "${BINARY_BIOS_MEASUREMENTS}" -v) 2>&1 > /dev/null "${TSSDIR}/tsseventextend" -tpm -if "${BINARY_BIOS_MEASUREMENTS}" -v > /dev/null 2>&1 } From patchwork Fri Oct 16 20:17:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mimi Zohar X-Patchwork-Id: 11842341 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1491D1744 for ; Fri, 16 Oct 2020 20:18:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D28EF2145D for ; Fri, 16 Oct 2020 20:18:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="KU8LXyk1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393436AbgJPUSG (ORCPT ); Fri, 16 Oct 2020 16:18:06 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:37226 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393410AbgJPUSF (ORCPT ); Fri, 16 Oct 2020 16:18:05 -0400 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 09GKDqQv189206; Fri, 16 Oct 2020 16:18:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=pp1; bh=fFA6PjwwFRZbGt4jZcu5WjSe6BfFIs4cS0eiLo8vMzI=; b=KU8LXyk1+CEgpQ8vUeHKiYnrHuB/yKhuq0wdJSVn6lQHmwaab4Yj+qpxhLb4JswsXuE2 bPYD1JcfNO4RY5V65wJJAMa/1bKIZCe2r/tBXCkKpCZGwrbUWQY6xgwMlqwRm9xKvoLi AIEoSVcgRileLBirZ4gjCHkytrWsVcqCBGAOy2iSBtnmxJ0XKne+hWK8kuBK5Xo9Ct5U AO80tJhHQvkIwDdHj9L51XtOUEnZH3WV5paY1ADuznL6mMwMxlIrYMnawSD+x4JCFCAG eQU/X4zNIiAqnRg7+vEpxqkL/E1HjeesE+i7sO/0SEV9E+Uwo86ihX0gRrGK6aDglWKv lw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 347jcar3c5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Oct 2020 16:18:03 -0400 Received: from m0098396.ppops.net (m0098396.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 09GKDvkT189373; Fri, 16 Oct 2020 16:18:03 -0400 Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0a-001b2d01.pphosted.com with ESMTP id 347jcar3bd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Oct 2020 16:18:02 -0400 Received: from pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 09GKI0Cc007389; Fri, 16 Oct 2020 20:18:00 GMT Received: from b06avi18626390.portsmouth.uk.ibm.com (b06avi18626390.portsmouth.uk.ibm.com [9.149.26.192]) by ppma03fra.de.ibm.com with ESMTP id 3434k7ufjp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Oct 2020 20:18:00 +0000 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 09GKHvQB30409020 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 16 Oct 2020 20:17:57 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A18844203F; Fri, 16 Oct 2020 20:17:57 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C9F6C42041; Fri, 16 Oct 2020 20:17:56 +0000 (GMT) Received: from li-f45666cc-3089-11b2-a85c-c57d1a57929f.ibm.com.com (unknown [9.160.113.249]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 16 Oct 2020 20:17:56 +0000 (GMT) From: Mimi Zohar To: linux-integrity@vger.kernel.org Cc: Ken Goldman , Mimi Zohar , Bruno Meneguele , Petr Vorel Subject: [ima-evm-utils][PATCH 2/3] travis: rename the software tpm variables Date: Fri, 16 Oct 2020 16:17:44 -0400 Message-Id: <20201016201745.124355-3-zohar@linux.ibm.com> X-Mailer: git-send-email 2.18.4 In-Reply-To: <20201016201745.124355-1-zohar@linux.ibm.com> References: <20201016201745.124355-1-zohar@linux.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687 definitions=2020-10-16_10:2020-10-16,2020-10-16 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 lowpriorityscore=0 priorityscore=1501 mlxscore=0 malwarescore=0 impostorscore=0 bulkscore=0 phishscore=0 adultscore=0 suspectscore=1 mlxlogscore=834 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010160145 Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org The existing variable names swtpm and swtpm1 is confusing. Rename "swtpm" to "tpm_server" and "swtpm1" as "swtpm". Reported-by: Ken Goldman Signed-off-by: Mimi Zohar --- tests/boot_aggregate.test | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/boot_aggregate.test b/tests/boot_aggregate.test index edebf1d29f23..ab061d5e5845 100755 --- a/tests/boot_aggregate.test +++ b/tests/boot_aggregate.test @@ -54,36 +54,36 @@ cleanup() { # Try to start a software TPM if needed. swtpm_start() { - local swtpm swtpm1 + local tpm_server swtpm - swtpm="$(which tpm_server)" - swtpm1="$(which swtpm)" - if [ -z "${swtpm}" ] && [ -z "${swtpm1}" ]; then + tpm_server="$(which tpm_server)" + swtpm="$(which swtpm)" + if [ -z "${tpm_server}" ] && [ -z "${swtpm}" ]; then echo "${CYAN}SKIP: Software TPM (tpm_server and swtpm) not found${NORM}" return "$SKIP" fi - if [ -n "${swtpm1}" ]; then - pgrep swtpm1 + if [ -n "${swtpm}" ]; then + pgrep swtpm if [ $? -eq 0 ]; then echo "INFO: Software TPM (swtpm) already running" return 114 else - echo "INFO: Starting software TPM: ${swtpm1}" - mkdir ./myvtpm - ${swtpm1} socket --tpmstate dir=./myvtpm --tpm2 --ctrl type=tcp,port=2322 --server type=tcp,port=2321 --flags not-need-init > /dev/null 2>&1 & + echo -n "INFO: Starting software TPM: ${swtpm}" + mkdir -p ./myvtpm + ${swtpm} socket --tpmstate dir=./myvtpm --tpm2 --ctrl type=tcp,port=2322 --server type=tcp,port=2321 --flags not-need-init > /dev/null 2>&1 & SWTPM_PPID=$! fi - elif [ -n "${swtpm}" ]; then + elif [ -n "${tpm_server}" ]; then # tpm_server uses the Microsoft simulator encapsulated packet format export TPM_SERVER_TYPE="mssim" - pgrep swtpm + pgrep tpm_server if [ $? -eq 0 ]; then echo "INFO: Software TPM (tpm_server) already running" return 114 else - echo "INFO: Starting software TPM: ${swtpm}" - ${swtpm} > /dev/null 2>&1 & + echo "INFO: Starting software TPM: ${tpm_server}" + ${tpm_server} > /dev/null 2>&1 & SWTPM_PPID=$! fi fi From patchwork Fri Oct 16 20:17:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mimi Zohar X-Patchwork-Id: 11842343 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 195D51744 for ; Fri, 16 Oct 2020 20:18:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E59D22145D for ; Fri, 16 Oct 2020 20:18:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="faCF4HxC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393410AbgJPUSJ (ORCPT ); Fri, 16 Oct 2020 16:18:09 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:64538 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393400AbgJPUSJ (ORCPT ); Fri, 16 Oct 2020 16:18:09 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 09GK3FvV177055; Fri, 16 Oct 2020 16:18:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=pp1; bh=bA/j4834Ycjb9zhyqjQKucoWLwNhGdKBoRRwJdiMg7k=; b=faCF4HxCa8o3e0MjQ+oxm01H150oNEmmTJChLyqvIL2yKOsYdtcFK9JQsfmm7nx3Ef0q XeD9JgRdBF+uAszPDrZNvlm0QliG0S0rzR3U5KtKcoDNoXBtx35Q+vaEUhqtO4zxGbXF VW9RfhXWNpymqPNMUL5kl/h1S3PeFwi+4qFRvtpOdAMG2JDCD/ZVFux9UqKQpDICkV7i tSg2+AnATOXUo5teQhnu+UgmhbDnR5ApgGRyosEin8EzBCYxsxFwB+RqPXZ0UqPPWr/1 qhOP2OfFCL0M/s0wbsRTVvH0FDH6GPBbK6FuZ4aWGY6tbrwMi+hMd6Jxxl15xGS5Hmcs vA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 347hpa9cyg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Oct 2020 16:18:06 -0400 Received: from m0098409.ppops.net (m0098409.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 09GK3HKj177245; Fri, 16 Oct 2020 16:18:06 -0400 Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0a-001b2d01.pphosted.com with ESMTP id 347hpa9cxn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Oct 2020 16:18:06 -0400 Received: from pps.filterd (ppma06fra.de.ibm.com [127.0.0.1]) by ppma06fra.de.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 09GKHnfU012533; Fri, 16 Oct 2020 20:18:04 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma06fra.de.ibm.com with ESMTP id 34347h3f2y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Oct 2020 20:18:04 +0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 09GKI1E823396648 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 16 Oct 2020 20:18:01 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0EEB942047; Fri, 16 Oct 2020 20:18:01 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E1CB94203F; Fri, 16 Oct 2020 20:17:59 +0000 (GMT) Received: from li-f45666cc-3089-11b2-a85c-c57d1a57929f.ibm.com.com (unknown [9.160.113.249]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 16 Oct 2020 20:17:59 +0000 (GMT) From: Mimi Zohar To: linux-integrity@vger.kernel.org Cc: Ken Goldman , Mimi Zohar , Bruno Meneguele , Petr Vorel Subject: [ima-evm-utils][PATCH 3/3] travis: properly kill the software TPM Date: Fri, 16 Oct 2020 16:17:45 -0400 Message-Id: <20201016201745.124355-4-zohar@linux.ibm.com> X-Mailer: git-send-email 2.18.4 In-Reply-To: <20201016201745.124355-1-zohar@linux.ibm.com> References: <20201016201745.124355-1-zohar@linux.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687 definitions=2020-10-16_10:2020-10-16,2020-10-16 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 mlxlogscore=816 bulkscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 adultscore=0 spamscore=0 impostorscore=0 phishscore=0 suspectscore=1 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010160145 Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org Send "tsstpmcmd -stop" to properly stop the tpm_server. Send SIGTERM to stop the swtpm process. Signed-off-by: Mimi Zohar --- tests/boot_aggregate.test | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/boot_aggregate.test b/tests/boot_aggregate.test index ab061d5e5845..42ed7b4cfb3a 100755 --- a/tests/boot_aggregate.test +++ b/tests/boot_aggregate.test @@ -41,14 +41,12 @@ else fi -# Only stop this test's software TPM. Preferred method: "tsstpmcmd -stop" +# Only stop this test's software TPM cleanup() { - if [ -n "${SWTPM_PPID}" ]; then - if [ -f "${TSSDIR}/tsstpmcmd" ]; then - "${TSSDIR}/tsstpmcmd" -stop - else - pkill -P "${SWTPM_PPID}" - fi + if [ -n "${SWTPM_PID}" ]; then + kill -SIGTERM "${SWTPM_PID}" + elif [ -n "${TPMSERVER_PID}" ]; then + "${TSSDIR}/tsstpmcmd" -stop fi } @@ -72,7 +70,7 @@ swtpm_start() { echo -n "INFO: Starting software TPM: ${swtpm}" mkdir -p ./myvtpm ${swtpm} socket --tpmstate dir=./myvtpm --tpm2 --ctrl type=tcp,port=2322 --server type=tcp,port=2321 --flags not-need-init > /dev/null 2>&1 & - SWTPM_PPID=$! + SWTPM_PID=$! fi elif [ -n "${tpm_server}" ]; then # tpm_server uses the Microsoft simulator encapsulated packet format @@ -84,7 +82,7 @@ swtpm_start() { else echo "INFO: Starting software TPM: ${tpm_server}" ${tpm_server} > /dev/null 2>&1 & - SWTPM_PPID=$! + TPMSERVER_PID=$! fi fi return 0