From patchwork Wed Sep 22 03:11:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Richter X-Patchwork-Id: 1531002 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=rj8FDMV3; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4HDjyT1r8fz9sRK for ; Wed, 22 Sep 2021 13:12:17 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4HDjyT0kDQz2ywX for ; Wed, 22 Sep 2021 13:12:17 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=rj8FDMV3; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=erichte@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=rj8FDMV3; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4HDjxq34Xbz2yL9 for ; Wed, 22 Sep 2021 13:11:43 +1000 (AEST) Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18M2TZnM025793 for ; Tue, 21 Sep 2021 23:11:41 -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 : mime-version : content-transfer-encoding; s=pp1; bh=5jU0v0c5nxyED7RRQ+iDTXMEUrf7SAKBaULDGnLXKM0=; b=rj8FDMV3M4mMfoSnvuXWjoHxSA2V7/8HSSa+qe3pidTcFxuN7/NcPXCchSzeHu3VxUsa 1lVpaN6iKsSpF2XcXyd7IZPxU0z2TBNL4avtZ1v/nBIRcztD0JOW7IXRDDxCHOnxqqff u42C598qL/maiU/vCoXrpO7JahYqQFjjPqMoV+k7yteTPQAAESO8lI5Jkbuy9B46v574 R0QYUzNIQCQ/04h70TPe5wSAP+pdoy1Jn8jCtaRu/ZZD+qctba3OAAAM9f/1xJymDbTx 1kTx1xnT49m4QVlLdlPlC3n5yoMOLsFy0m4H8i2PyzTwhtwo8SKqUk0/fDJdpTgNr+t8 Bg== Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0b-001b2d01.pphosted.com with ESMTP id 3b7urkgm92-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 21 Sep 2021 23:11:40 -0400 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 18M37wEX013832 for ; Wed, 22 Sep 2021 03:11:39 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 3b7q6phjgu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 22 Sep 2021 03:11:39 +0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 18M3BZew49283544 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 22 Sep 2021 03:11:35 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AA8FCA4059; Wed, 22 Sep 2021 03:11:35 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E3D73A4040; Wed, 22 Sep 2021 03:11:34 +0000 (GMT) Received: from ceres.ibmuc.com (unknown [9.65.202.213]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 22 Sep 2021 03:11:34 +0000 (GMT) From: Eric Richter To: skiboot@lists.ozlabs.org Date: Tue, 21 Sep 2021 22:11:25 -0500 Message-Id: <20210922031129.4188386-5-erichte@linux.ibm.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210922031129.4188386-1-erichte@linux.ibm.com> References: <20210922031129.4188386-1-erichte@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: PwR6eE-Q9Z2XOStTy8q6CmS_nk5NZ5So X-Proofpoint-GUID: PwR6eE-Q9Z2XOStTy8q6CmS_nk5NZ5So X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475 definitions=2021-09-21_07,2021-09-20_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 malwarescore=0 lowpriorityscore=0 phishscore=0 spamscore=0 suspectscore=0 bulkscore=0 clxscore=1015 mlxlogscore=676 adultscore=0 priorityscore=1501 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109200000 definitions=main-2109220015 Subject: [Skiboot] [RFC 4/8] secboot_tpm_switchable merge X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nayna@linux.ibm.com Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Signed-off-by: Eric Richter --- libstb/secvar/storage/secboot_tpm_switchable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstb/secvar/storage/secboot_tpm_switchable.c b/libstb/secvar/storage/secboot_tpm_switchable.c index 0790ed68..28b1f434 100644 --- a/libstb/secvar/storage/secboot_tpm_switchable.c +++ b/libstb/secvar/storage/secboot_tpm_switchable.c @@ -64,7 +64,7 @@ static int pre_switchable_init(void) } free(indices); - if (secvar_check_clear_keys() || secvar_check_set_default_keys()) { + if (secvar_check_clear_keys() || secvar_check_reset_default_keys()) { /* TODO: undefine *ALL THREE* indices */ mode_defined = control_defined = vars_defined = false; }