From nobody Sun Oct 5 18:14:33 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7546266B67; Thu, 31 Jul 2025 21:24:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753997048; cv=none; b=Tqhcffmibg61P7MZwoCTGgrqc4Q14tb17+y7avAEsOFqtEF7KdIOqMCb5acF3iXc1YgJMe1eoFIcqjYtmfqkONx6TSzdP9fHOXJmL0OdPJE3CPEedePa8o65WsPjZIPoN49Uz+CA/Phtw28//4H1BFGPixOBuu5b1/Yt5UTFDnQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753997048; c=relaxed/simple; bh=MsSGdRGo/iJf68xBhMheMFUFtRT82Z9RmC6MiDVUNM0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PEFwIWfP0Hk0ZVaOOyr5ouh2WISsco/wDGIIAAt2qzTzWPSvnJYkMHIux/eDOoaLFEpJ/hoUWAP7jEQlNaPvXuBqA1I95MMJDGiNQy2WXs9ZArXPPhkisR3ov/kojdX348iPro/x71OUZM5wQHReRX9ghXfU+h5RAL4QStjNNX8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PM9td+b6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PM9td+b6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D956EC4CEF7; Thu, 31 Jul 2025 21:24:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753997048; bh=MsSGdRGo/iJf68xBhMheMFUFtRT82Z9RmC6MiDVUNM0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PM9td+b63QrL/T5i8+XRxsNymoDSjg4mboi69NQeJW4v8RlucowxUDe5MyCCXoIAJ IGe/0oBoWKxMBBKBC8uB6GIKaFTXhiz6xoq8l0+Vhntjs/VzL95HTH1Hdz/9fhu3CB peAsH7lyKx8Fsue1+GOo9Cms/81nU+L7cBJOIGKXRPoKBV0d+BB0GULhVpOtumFCsn Wytbi6g2YPP1h8qj4PAScXANAxhrFoxsMYFeoKdqGVvTCxJi1GrxgzM6pGoTXsgf4x /5MJXR/58NodtO2n80t6d5mBLh1uFin4O2TW0KqDV/rW5bBwv81p9hfF3Bu1/5aruL 06k8tMp6nYxDA== From: Eric Biggers To: James Bottomley , Jarkko Sakkinen , Mimi Zohar , keyrings@vger.kernel.org Cc: David Howells , linux-integrity@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Biggers Subject: [PATCH 2/3] KEYS: trusted_tpm1: Use SHA-1 library instead of crypto_shash Date: Thu, 31 Jul 2025 14:23:53 -0700 Message-ID: <20250731212354.105044-3-ebiggers@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250731212354.105044-1-ebiggers@kernel.org> References: <20250731212354.105044-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use the SHA-1 and HMAC-SHA1 library functions instead of crypto_shash. This is simpler and faster. Replace the selection of CRYPTO, CRYPTO_HMAC, and CRYPTO_SHA1 with CRYPTO_LIB_SHA1 and CRYPTO_LIB_UTILS. The latter is needed for crypto_memneq() which was previously being pulled in via CRYPTO. Signed-off-by: Eric Biggers Reviewed-by: Jarkko Sakkinen --- security/keys/trusted-keys/Kconfig | 5 +- security/keys/trusted-keys/trusted_tpm1.c | 221 ++++------------------ 2 files changed, 36 insertions(+), 190 deletions(-) diff --git a/security/keys/trusted-keys/Kconfig b/security/keys/trusted-key= s/Kconfig index 1fb8aa0019953..204a68c1429df 100644 --- a/security/keys/trusted-keys/Kconfig +++ b/security/keys/trusted-keys/Kconfig @@ -3,14 +3,13 @@ config HAVE_TRUSTED_KEYS =20 config TRUSTED_KEYS_TPM bool "TPM-based trusted keys" depends on TCG_TPM >=3D TRUSTED_KEYS default y - select CRYPTO - select CRYPTO_HMAC - select CRYPTO_SHA1 select CRYPTO_HASH_INFO + select CRYPTO_LIB_SHA1 + select CRYPTO_LIB_UTILS select ASN1_ENCODER select OID_REGISTRY select ASN1 select HAVE_TRUSTED_KEYS help diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trus= ted-keys/trusted_tpm1.c index e73f2c6c817a0..126437459a74d 100644 --- a/security/keys/trusted-keys/trusted_tpm1.c +++ b/security/keys/trusted-keys/trusted_tpm1.c @@ -5,90 +5,37 @@ * * See Documentation/security/keys/trusted-encrypted.rst */ =20 #include +#include #include #include #include #include #include #include #include #include -#include -#include -#include #include #include =20 #include =20 -static const char hmac_alg[] =3D "hmac(sha1)"; -static const char hash_alg[] =3D "sha1"; static struct tpm_chip *chip; static struct tpm_digest *digests; =20 -struct sdesc { - struct shash_desc shash; - char ctx[]; -}; - -static struct crypto_shash *hashalg; -static struct crypto_shash *hmacalg; - -static struct sdesc *init_sdesc(struct crypto_shash *alg) -{ - struct sdesc *sdesc; - int size; - - size =3D sizeof(struct shash_desc) + crypto_shash_descsize(alg); - sdesc =3D kmalloc(size, GFP_KERNEL); - if (!sdesc) - return ERR_PTR(-ENOMEM); - sdesc->shash.tfm =3D alg; - return sdesc; -} - -static int TSS_sha1(const unsigned char *data, unsigned int datalen, - unsigned char *digest) -{ - struct sdesc *sdesc; - int ret; - - sdesc =3D init_sdesc(hashalg); - if (IS_ERR(sdesc)) { - pr_info("can't alloc %s\n", hash_alg); - return PTR_ERR(sdesc); - } - - ret =3D crypto_shash_digest(&sdesc->shash, data, datalen, digest); - kfree_sensitive(sdesc); - return ret; -} - static int TSS_rawhmac(unsigned char *digest, const unsigned char *key, unsigned int keylen, ...) { - struct sdesc *sdesc; + struct hmac_sha1_ctx hmac_ctx; va_list argp; unsigned int dlen; unsigned char *data; - int ret; - - sdesc =3D init_sdesc(hmacalg); - if (IS_ERR(sdesc)) { - pr_info("can't alloc %s\n", hmac_alg); - return PTR_ERR(sdesc); - } + int ret =3D 0; =20 - ret =3D crypto_shash_setkey(hmacalg, key, keylen); - if (ret < 0) - goto out; - ret =3D crypto_shash_init(&sdesc->shash); - if (ret < 0) - goto out; + hmac_sha1_init_usingrawkey(&hmac_ctx, key, keylen); =20 va_start(argp, keylen); for (;;) { dlen =3D va_arg(argp, unsigned int); if (dlen =3D=3D 0) @@ -96,19 +43,15 @@ static int TSS_rawhmac(unsigned char *digest, const uns= igned char *key, data =3D va_arg(argp, unsigned char *); if (data =3D=3D NULL) { ret =3D -EINVAL; break; } - ret =3D crypto_shash_update(&sdesc->shash, data, dlen); - if (ret < 0) - break; + hmac_sha1_update(&hmac_ctx, data, dlen); } va_end(argp); if (!ret) - ret =3D crypto_shash_final(&sdesc->shash, digest); -out: - kfree_sensitive(sdesc); + hmac_sha1_final(&hmac_ctx, digest); return ret; } =20 /* * calculate authorization info fields to send to TPM @@ -116,53 +59,41 @@ static int TSS_rawhmac(unsigned char *digest, const un= signed char *key, int TSS_authhmac(unsigned char *digest, const unsigned char *key, unsigned int keylen, unsigned char *h1, unsigned char *h2, unsigned int h3, ...) { unsigned char paramdigest[SHA1_DIGEST_SIZE]; - struct sdesc *sdesc; + struct sha1_ctx sha_ctx; unsigned int dlen; unsigned char *data; unsigned char c; - int ret; + int ret =3D 0; va_list argp; =20 if (!chip) return -ENODEV; =20 - sdesc =3D init_sdesc(hashalg); - if (IS_ERR(sdesc)) { - pr_info("can't alloc %s\n", hash_alg); - return PTR_ERR(sdesc); - } - c =3D !!h3; - ret =3D crypto_shash_init(&sdesc->shash); - if (ret < 0) - goto out; + sha1_init(&sha_ctx); va_start(argp, h3); for (;;) { dlen =3D va_arg(argp, unsigned int); if (dlen =3D=3D 0) break; data =3D va_arg(argp, unsigned char *); if (!data) { ret =3D -EINVAL; break; } - ret =3D crypto_shash_update(&sdesc->shash, data, dlen); - if (ret < 0) - break; + sha1_update(&sha_ctx, data, dlen); } va_end(argp); if (!ret) - ret =3D crypto_shash_final(&sdesc->shash, paramdigest); + sha1_final(&sha_ctx, paramdigest); if (!ret) ret =3D TSS_rawhmac(digest, key, keylen, SHA1_DIGEST_SIZE, paramdigest, TPM_NONCE_SIZE, h1, TPM_NONCE_SIZE, h2, 1, &c, 0, 0); -out: - kfree_sensitive(sdesc); return ret; } EXPORT_SYMBOL_GPL(TSS_authhmac); =20 /* @@ -181,11 +112,11 @@ int TSS_checkhmac1(unsigned char *buffer, unsigned char *enonce; unsigned char *continueflag; unsigned char *authdata; unsigned char testhmac[SHA1_DIGEST_SIZE]; unsigned char paramdigest[SHA1_DIGEST_SIZE]; - struct sdesc *sdesc; + struct sha1_ctx sha_ctx; unsigned int dlen; unsigned int dpos; va_list argp; int ret; =20 @@ -202,53 +133,33 @@ int TSS_checkhmac1(unsigned char *buffer, return -EINVAL; authdata =3D buffer + bufsize - SHA1_DIGEST_SIZE; continueflag =3D authdata - 1; enonce =3D continueflag - TPM_NONCE_SIZE; =20 - sdesc =3D init_sdesc(hashalg); - if (IS_ERR(sdesc)) { - pr_info("can't alloc %s\n", hash_alg); - return PTR_ERR(sdesc); - } - ret =3D crypto_shash_init(&sdesc->shash); - if (ret < 0) - goto out; - ret =3D crypto_shash_update(&sdesc->shash, (const u8 *)&result, - sizeof result); - if (ret < 0) - goto out; - ret =3D crypto_shash_update(&sdesc->shash, (const u8 *)&ordinal, - sizeof ordinal); - if (ret < 0) - goto out; + sha1_init(&sha_ctx); + sha1_update(&sha_ctx, (const u8 *)&result, sizeof(result)); + sha1_update(&sha_ctx, (const u8 *)&ordinal, sizeof(ordinal)); va_start(argp, keylen); for (;;) { dlen =3D va_arg(argp, unsigned int); if (dlen =3D=3D 0) break; dpos =3D va_arg(argp, unsigned int); - ret =3D crypto_shash_update(&sdesc->shash, buffer + dpos, dlen); - if (ret < 0) - break; + sha1_update(&sha_ctx, buffer + dpos, dlen); } va_end(argp); - if (!ret) - ret =3D crypto_shash_final(&sdesc->shash, paramdigest); - if (ret < 0) - goto out; + sha1_final(&sha_ctx, paramdigest); =20 ret =3D TSS_rawhmac(testhmac, key, keylen, SHA1_DIGEST_SIZE, paramdigest, TPM_NONCE_SIZE, enonce, TPM_NONCE_SIZE, ononce, 1, continueflag, 0, 0); if (ret < 0) - goto out; + return ret; =20 if (crypto_memneq(testhmac, authdata, SHA1_DIGEST_SIZE)) - ret =3D -EINVAL; -out: - kfree_sensitive(sdesc); - return ret; + return -EINVAL; + return 0; } EXPORT_SYMBOL_GPL(TSS_checkhmac1); =20 /* * verify the AUTH2_COMMAND (unseal) result from TPM @@ -272,11 +183,11 @@ static int TSS_checkhmac2(unsigned char *buffer, unsigned char *continueflag2; unsigned char *authdata2; unsigned char testhmac1[SHA1_DIGEST_SIZE]; unsigned char testhmac2[SHA1_DIGEST_SIZE]; unsigned char paramdigest[SHA1_DIGEST_SIZE]; - struct sdesc *sdesc; + struct sha1_ctx sha_ctx; unsigned int dlen; unsigned int dpos; va_list argp; int ret; =20 @@ -295,62 +206,40 @@ static int TSS_checkhmac2(unsigned char *buffer, continueflag1 =3D authdata1 - 1; continueflag2 =3D authdata2 - 1; enonce1 =3D continueflag1 - TPM_NONCE_SIZE; enonce2 =3D continueflag2 - TPM_NONCE_SIZE; =20 - sdesc =3D init_sdesc(hashalg); - if (IS_ERR(sdesc)) { - pr_info("can't alloc %s\n", hash_alg); - return PTR_ERR(sdesc); - } - ret =3D crypto_shash_init(&sdesc->shash); - if (ret < 0) - goto out; - ret =3D crypto_shash_update(&sdesc->shash, (const u8 *)&result, - sizeof result); - if (ret < 0) - goto out; - ret =3D crypto_shash_update(&sdesc->shash, (const u8 *)&ordinal, - sizeof ordinal); - if (ret < 0) - goto out; + sha1_init(&sha_ctx); + sha1_update(&sha_ctx, (const u8 *)&result, sizeof(result)); + sha1_update(&sha_ctx, (const u8 *)&ordinal, sizeof(ordinal)); =20 va_start(argp, keylen2); for (;;) { dlen =3D va_arg(argp, unsigned int); if (dlen =3D=3D 0) break; dpos =3D va_arg(argp, unsigned int); - ret =3D crypto_shash_update(&sdesc->shash, buffer + dpos, dlen); - if (ret < 0) - break; + sha1_update(&sha_ctx, buffer + dpos, dlen); } va_end(argp); - if (!ret) - ret =3D crypto_shash_final(&sdesc->shash, paramdigest); - if (ret < 0) - goto out; + sha1_final(&sha_ctx, paramdigest); =20 ret =3D TSS_rawhmac(testhmac1, key1, keylen1, SHA1_DIGEST_SIZE, paramdigest, TPM_NONCE_SIZE, enonce1, TPM_NONCE_SIZE, ononce, 1, continueflag1, 0, 0); if (ret < 0) - goto out; - if (crypto_memneq(testhmac1, authdata1, SHA1_DIGEST_SIZE)) { - ret =3D -EINVAL; - goto out; - } + return ret; + if (crypto_memneq(testhmac1, authdata1, SHA1_DIGEST_SIZE)) + return -EINVAL; ret =3D TSS_rawhmac(testhmac2, key2, keylen2, SHA1_DIGEST_SIZE, paramdigest, TPM_NONCE_SIZE, enonce2, TPM_NONCE_SIZE, ononce, 1, continueflag2, 0, 0); if (ret < 0) - goto out; + return ret; if (crypto_memneq(testhmac2, authdata2, SHA1_DIGEST_SIZE)) - ret =3D -EINVAL; -out: - kfree_sensitive(sdesc); - return ret; + return -EINVAL; + return 0; } =20 /* * For key specific tpm requests, we will generate and send our * own TPM command packets using the drivers send function. @@ -497,13 +386,11 @@ static int tpm_seal(struct tpm_buf *tb, uint16_t keyt= ype, dump_sess(&sess); =20 /* calculate encrypted authorization value */ memcpy(td->xorwork, sess.secret, SHA1_DIGEST_SIZE); memcpy(td->xorwork + SHA1_DIGEST_SIZE, sess.enonce, SHA1_DIGEST_SIZE); - ret =3D TSS_sha1(td->xorwork, SHA1_DIGEST_SIZE * 2, td->xorhash); - if (ret < 0) - goto out; + sha1(td->xorwork, SHA1_DIGEST_SIZE * 2, td->xorhash); =20 ret =3D tpm_get_random(chip, td->nonceodd, TPM_NONCE_SIZE); if (ret < 0) goto out; =20 @@ -988,44 +875,10 @@ static int trusted_tpm_unseal(struct trusted_key_payl= oad *p, char *datablob) static int trusted_tpm_get_random(unsigned char *key, size_t key_len) { return tpm_get_random(chip, key, key_len); } =20 -static void trusted_shash_release(void) -{ - if (hashalg) - crypto_free_shash(hashalg); - if (hmacalg) - crypto_free_shash(hmacalg); -} - -static int __init trusted_shash_alloc(void) -{ - int ret; - - hmacalg =3D crypto_alloc_shash(hmac_alg, 0, 0); - if (IS_ERR(hmacalg)) { - pr_info("could not allocate crypto %s\n", - hmac_alg); - return PTR_ERR(hmacalg); - } - - hashalg =3D crypto_alloc_shash(hash_alg, 0, 0); - if (IS_ERR(hashalg)) { - pr_info("could not allocate crypto %s\n", - hash_alg); - ret =3D PTR_ERR(hashalg); - goto hashalg_fail; - } - - return 0; - -hashalg_fail: - crypto_free_shash(hmacalg); - return ret; -} - static int __init init_digests(void) { int i; =20 digests =3D kcalloc(chip->nr_allocated_banks, sizeof(*digests), @@ -1048,19 +901,14 @@ static int __init trusted_tpm_init(void) return -ENODEV; =20 ret =3D init_digests(); if (ret < 0) goto err_put; - ret =3D trusted_shash_alloc(); - if (ret < 0) - goto err_free; ret =3D register_key_type(&key_type_trusted); if (ret < 0) - goto err_release; + goto err_free; return 0; -err_release: - trusted_shash_release(); err_free: kfree(digests); err_put: put_device(&chip->dev); return ret; @@ -1069,11 +917,10 @@ static int __init trusted_tpm_init(void) static void trusted_tpm_exit(void) { if (chip) { put_device(&chip->dev); kfree(digests); - trusted_shash_release(); unregister_key_type(&key_type_trusted); } } =20 struct trusted_key_ops trusted_key_tpm_ops =3D { --=20 2.50.1