Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1049619iob; Fri, 13 May 2022 21:05:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHhN5+RDTaSDOx75IEc6RVXkid48O1Yd4Dpbm2tv408uKXsvmrjjtL6gEBhDjYZPpRLY/c X-Received: by 2002:a5d:6806:0:b0:20a:db0b:ad9b with SMTP id w6-20020a5d6806000000b0020adb0bad9bmr6118213wru.294.1652501149063; Fri, 13 May 2022 21:05:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652501149; cv=none; d=google.com; s=arc-20160816; b=f8MjVETfOSBvtK+ZhGgBVO7siXifDaMDqrQaGWQ9IOLSLCm40aztvWYrj4uzHbM8C8 v1hCe3+MEMqc2JmKMNd06s0EfwXrz+mtBzaYr36UBnyum0m+GpcvmkKsWePXsSNoPhO5 y6tm/kuBTJ+3lFaRo/jGfLq4Gy9HaW7xscH1sbtXtf/UYjfnM78998mxzJm0YEXjF0N+ BH8nphgrgcD3Mt8iwa/g1vbPcYecFx3NEhIj++xtX1p2O60yKxQxBBauetJlZgkrUuIa T4EaBwgmVEJ9VARgch51gzAOPLHkx0Nu7u3GJztQ3C3RXu4nx0pYshzvu26ZNRxMXI96 61eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=A3XnZQ6YpqtO40TftLuafxyiFzB/TUNuZXRH/RS1lUA=; b=RkWcH8bKtELwV27Cvg0P3pbzJ2nAe5tc49q9Rs6liCguovF7HlvWtfoF/1MS/2F+Ut BooUqUdzmcXweckl7dBHn1FldEmlrOjV+HYlnHc5t5sIHycXWyRqUheMjAsga3XRlk0S 9LupyMpJAwYNpeJ8Zs1XanHY5AxOrnD+b70ZEBzAaLse7COatBgBMq2gKbcYaT4XiUjR PTUn8foRLLATQY1tTROUAN4ZkVbPBScwQpnqAASaIuoBPfVE550J+29CFxZQIB9JjRC9 fA4+JVza3agbRDmOX7dBvbuiooDGp43IJXyj3fKc5i6y+j2UjDJyoZJQVTaZ+uqYm5nn TaAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=aOOfdG8A; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id y10-20020a5d470a000000b0020cd4ead6a2si3382975wrq.619.2022.05.13.21.05.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 May 2022 21:05:49 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=aOOfdG8A; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6440D33F581; Fri, 13 May 2022 17:37:31 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1383145AbiEMRlZ (ORCPT + 99 others); Fri, 13 May 2022 13:41:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378054AbiEMRlX (ORCPT ); Fri, 13 May 2022 13:41:23 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E46CA37016; Fri, 13 May 2022 10:41:22 -0700 (PDT) Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24DFoNNJ029518; Fri, 13 May 2022 17:41:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=A3XnZQ6YpqtO40TftLuafxyiFzB/TUNuZXRH/RS1lUA=; b=aOOfdG8AoetdKnbZYcbjpcNC8Kn5L1qGs2fU2/qt06OfJwEoK3yhf7DIcfFYNvP8BJ9e Jwlr6DNc3WdLTa61chZsWcuj8OCbAy+cVdF+xoHtoRiTNSCTmJcjez0f2vFKb8yZjHQV O+ZDgluG19oCx4VpXEUCSjAMMqxw3+GwzlV143xtA8O8romhCFxC2h6CMmJFsSejm5KE iiujvw9ecT8L2itRcsQ1HOzGvidVVVwqDMzWUEnj87vSQ/eunJMQ8tWz6fk3T6dkmB4v WGgVGcgAEU+ZoD6Nqmla+dYOT9z4KZVWl7Chw1h6dxdy4lfAcNN420rCBKl9izvPcZpN 4A== Received: from ppma04dal.us.ibm.com (7a.29.35a9.ip4.static.sl-reverse.com [169.53.41.122]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3g1tay21a8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 May 2022 17:41:22 +0000 Received: from pps.filterd (ppma04dal.us.ibm.com [127.0.0.1]) by ppma04dal.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 24DHI1VG021464; Fri, 13 May 2022 17:41:21 GMT Received: from b01cxnp22034.gho.pok.ibm.com (b01cxnp22034.gho.pok.ibm.com [9.57.198.24]) by ppma04dal.us.ibm.com with ESMTP id 3fwgdaxrvh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 May 2022 17:41:21 +0000 Received: from b01ledav001.gho.pok.ibm.com (b01ledav001.gho.pok.ibm.com [9.57.199.106]) by b01cxnp22034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 24DHfKKM53674246 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 May 2022 17:41:20 GMT Received: from b01ledav001.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9867E28068; Fri, 13 May 2022 17:41:20 +0000 (GMT) Received: from b01ledav001.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 81C742805C; Fri, 13 May 2022 17:41:20 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by b01ledav001.gho.pok.ibm.com (Postfix) with ESMTP; Fri, 13 May 2022 17:41:20 +0000 (GMT) From: Stefan Berger To: zohar@linux.ibm.com, linux-integrity@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Stefan Berger Subject: [PATCH] evm: Clean up some variables Date: Fri, 13 May 2022 13:41:05 -0400 Message-Id: <20220513174105.3684229-1-stefanb@linux.ibm.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: L6-_QRwc0t-i2i1oIRntaZXFSyDdfc3Z X-Proofpoint-GUID: L6-_QRwc0t-i2i1oIRntaZXFSyDdfc3Z X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.858,Hydra:6.0.486,FMLib:17.11.64.514 definitions=2022-05-13_09,2022-05-13_01,2022-02-23_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 priorityscore=1501 mlxscore=0 mlxlogscore=999 lowpriorityscore=0 spamscore=0 malwarescore=0 phishscore=0 impostorscore=0 clxscore=1015 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2205130074 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make hmac_tfm static since it's not used anywhere else besides the file it is in. Remove declaration of hash_tfm since it doesn't exist. Signed-off-by: Stefan Berger --- security/integrity/evm/evm.h | 3 --- security/integrity/evm/evm_crypto.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/security/integrity/evm/evm.h b/security/integrity/evm/evm.h index 0d44f41d16f8..f8b8c5004fc7 100644 --- a/security/integrity/evm/evm.h +++ b/security/integrity/evm/evm.h @@ -38,9 +38,6 @@ extern int evm_initialized; extern int evm_hmac_attrs; -extern struct crypto_shash *hmac_tfm; -extern struct crypto_shash *hash_tfm; - /* List of EVM protected security xattrs */ extern struct list_head evm_config_xattrnames; diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c index 0450d79afdc8..a733aff02006 100644 --- a/security/integrity/evm/evm_crypto.c +++ b/security/integrity/evm/evm_crypto.c @@ -26,7 +26,7 @@ static unsigned char evmkey[MAX_KEY_SIZE]; static const int evmkey_len = MAX_KEY_SIZE; -struct crypto_shash *hmac_tfm; +static struct crypto_shash *hmac_tfm; static struct crypto_shash *evm_tfm[HASH_ALGO__LAST]; static DEFINE_MUTEX(mutex); -- 2.35.1