From nobody Sat Sep 07 05:13:40 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X11Td0MHmz5WnRS; Sat, 07 Sep 2024 05:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X11Tc6vw9z57p8; Sat, 7 Sep 2024 05:13:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725686021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nPd404c0x0/uq6THyguf76t3LPdLvEuujYVl+uVAK7k=; b=SB8ajcMzmtXEw8/vLeaqzPGBppoXVfN6LD5xvt2AE0DSxPiv6IgRwS7g3JuzdaLfV1M5nW l5GF/fnukBQ7BydH0zGTqc9YeCA2eO9abnDKz431EXu1CJgrmZ56hiRzvriem2rOhNcixu DfcqdmlJWcdtQRjAZQ3nEb3K2DSmoJm8XcRIfse1L6+/hp5QMcP+yBhS4KGHxc4r/WKW6O PH2mm+Qu8fdI0H7UNTgT4kMZI7oh00r+b6bJdpW1AH451vaPjezcLgTh1DIihASPkxypgn 7+dg/alOS4Ypjth6+egzBlJuNwut/yZqMElgS4cz3MgPdun3dwkISUAqFwfQNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725686021; a=rsa-sha256; cv=none; b=usbs6APo490+CoJWobzpSbIKPSgd/Jzcy0tCo0l38Erdc3UrqvnKq9mOE02BzsYF6D1z17 hA09BLHOuuhkvyxR28YrKiK+0laV+cDeZskrGeFHqlvhmMsqsKxCgl1X/FjQW5tOvmfzim /OhPBE9LY626w2Rb488XcJAAQjuZ/CxBrWRDRNmwYspEKBesiVgMEdPpAKnA7Tf0RlyEsB Cd5jRIw6DI/ajbFSIJnFuvUmnIOVQBkxJKD/1cW1gLFUHg8tbpRkeuxEhFLMTYGIXXlJq9 Uv+n3hekIVI3qqyjJgCGn5kes/5js/ZRbTBHcg0nwH7xyWg2cHtA21OGeK/Vgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725686021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nPd404c0x0/uq6THyguf76t3LPdLvEuujYVl+uVAK7k=; b=aBnWj1vH3ntdtKZtt3jM/oIFB5z4DmukW6RDGEjaUHiAdF3PU5RXkYpJYUvrbslWT8ow5E GE6VqP+wg55ijozz6jwrt378s+dnhe+cpQpZMyBcC9yb9VVRurK0xLK4lJ0kOF/bTf3LIC l8CRs0QCPUWabx7Alc511AIOOL5UGeQT4Rk3422gEbu53ZRau7VowGtHNBiWkN4c1pEYz6 bDLvsrbc+/BoUKxoCvV2EbvRz+rgfoYCK1s0U6j88SEAumTzEYhqK2SxAgQwDeZVFUQc7/ 1ZrXhziTARrC2gTh8fIAqNeM5ntMpRRbXSRw9oDDHQ1zXxXMPexWSQT+X+nHWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X11Tc6WC0zMr2; Sat, 7 Sep 2024 05:13:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4875DeAf099528; Sat, 7 Sep 2024 05:13:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4875Dekl099525; Sat, 7 Sep 2024 05:13:40 GMT (envelope-from git) Date: Sat, 7 Sep 2024 05:13:40 GMT Message-Id: <202409070513.4875Dekl099525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 0b683336b211 - stable/14 - tpm: Register TPM as entropy source List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0b683336b211e74b6d7f21ecf517c6591370b793 Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=0b683336b211e74b6d7f21ecf517c6591370b793 commit 0b683336b211e74b6d7f21ecf517c6591370b793 Author: Jean-François Hren AuthorDate: 2024-08-31 17:53:02 +0000 Commit: Kevin Bowling CommitDate: 2024-09-07 05:13:14 +0000 tpm: Register TPM as entropy source TPM is defined as an entropy and is called every 10 seconds. However it was not registered and calls were discarded. Signed-off-by: Jean-François Hren Pull Request: https://github.com/freebsd/freebsd-src/pull/1398 (cherry picked from commit d7c87526b1c3d32d3ac3fee8c59d92405b7621b9) --- sys/dev/tpm/tpm20.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/tpm/tpm20.c b/sys/dev/tpm/tpm20.c index da090bc068c9..393552172656 100644 --- a/sys/dev/tpm/tpm20.c +++ b/sys/dev/tpm/tpm20.c @@ -203,6 +203,7 @@ tpm20_init(struct tpm_sc *sc) tpm20_release(sc); #ifdef TPM_HARVEST + random_harvest_register_source(RANDOM_PURE_TPM); TIMEOUT_TASK_INIT(taskqueue_thread, &sc->harvest_task, 0, tpm20_harvest, sc); taskqueue_enqueue_timeout(taskqueue_thread, &sc->harvest_task, 0); @@ -219,6 +220,7 @@ tpm20_release(struct tpm_sc *sc) #ifdef TPM_HARVEST if (device_is_attached(sc->dev)) taskqueue_drain_timeout(taskqueue_thread, &sc->harvest_task); + random_harvest_deregister_source(RANDOM_PURE_TPM); #endif if (sc->buf != NULL)