From nobody Tue Apr 01 01:57:24 2025 X-Original-To: dev-commits-src-all@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 4ZRWN426FBz5rhZt; Tue, 01 Apr 2025 01:57:24 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZRWN41Q1tz3NMv; Tue, 01 Apr 2025 01:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743472644; 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=GQ9w8J5qLP2VlTyaiU3oC1ONwVg4Rp/Ck8F51Ij1US8=; b=F7S9DkY/5erCg/bLkdOHlCWxM3hqpcygh9BGRy5CaTzKn40kJh8Z/NeVdX9GftsB58c20G nYH4g8ySYZx2ZioHHxrDerLHiXQIZA/wbq8jXcU3J2zM476lyGqgIEJn656A/iu/j5/7I1 qYEkNR3uUdCYwpiFCaWqWWvsiNhoh/cLQVnqkbj4uvHDyr0+bXQZxBY4h92xAAwRwJXV7R JyCu4yJesUlKvisnM/zMJ/zcm6315RYhMuuhyuTpd+Pmjn3+fskUeVbnDf0jpXl0JJooHe 9P/gUjHftfwwn29Dwwg15GjZFz3QrPXMJDyJqbiqbE2TjLDb5Y+DvC64viyEYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743472644; a=rsa-sha256; cv=none; b=iL3cJkNf0gCusX9ZcL+sx49l0AlxZkspghTsRrs+gNHw32yiVpQZdEDHq9oV7+K3S5Dv3N yHlAkoql0KAKRAQ467SO7oPyXB2YMjkXfkzirZ3VT1vBKkW2a6wM8+xkB4PxHJZimv7nPp apXo6Tq+LuoRWUzAotvjHpYnjzsehLiSvlIa4NpSV/kHi9NSUvHacejOT4XzAVbWg7dqWu 1EwTSSIJMA3lkXX1amrZCpJxOS1LexY/SwyEV6tkfua/CMHB6+tNPpmp5H/nTNOroyYVQE /aXnrE+fBzxhE4MXLGjGj1wWrZ5Lpd+OqRJXbT4nONPJj4AhAZxc+r2Gcw00Bw== 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=1743472644; 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=GQ9w8J5qLP2VlTyaiU3oC1ONwVg4Rp/Ck8F51Ij1US8=; b=kJqnYOAi126Xpkcei4Af4bAKZxGzlxxFh23PIyxuWKa1kTC0vdh9tIo5/Da/XDuZdTNy0M GMfkysdbulzHEXoY5Uuu0zXFbRZvMO5hh+/q5cyMuWOZ/vvoVhnQ5ha5ryeGsDlXyOISji VRh+wOoAwcqUll1nUtl1HI8bUfnk5SzmOwtHqMtf4blJ/ZEFE/Aicvg+3ZHxBkSOdYP7aW nz+cWhPQtDBKt42SQZfKrvyczxtMjzPhlGyQGEgzQC8kodOThNUClBCKnXhIzzRx5xs8RA 6PC/IO4q6v6NcGDQ4ZMUMgF19jqRGTTfU9JqpquxhQeisp2Xmnsm0RszxnJxyQ== 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 4ZRWN40zFqz19N3; Tue, 01 Apr 2025 01:57:24 +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 5311vOVd076862; Tue, 1 Apr 2025 01:57:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5311vOwq076859; Tue, 1 Apr 2025 01:57:24 GMT (envelope-from git) Date: Tue, 1 Apr 2025 01:57:24 GMT Message-Id: <202504010157.5311vOwq076859@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: bcd9c0cfb622 - stable/14 - getentropy tests: Update after commit 473681a1a506da List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bcd9c0cfb62287b4df4bb030fb56e8a96d30e102 Auto-Submitted: auto-generated The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=bcd9c0cfb62287b4df4bb030fb56e8a96d30e102 commit bcd9c0cfb62287b4df4bb030fb56e8a96d30e102 Author: Mark Johnston AuthorDate: 2025-01-19 16:17:05 +0000 Commit: Enji Cooper CommitDate: 2025-04-01 01:52:46 +0000 getentropy tests: Update after commit 473681a1a506da - Use GETENTROPY_MAX instead of hard-coding the value. - Check for EINVAL instead of EIO Fixes: 473681a1a506 ("libc: Fix getentropy POSIX 2024 conformance issues") (cherry picked from commit c5056a3931b41a803a24b89400d38d5c5f843612) --- lib/libc/tests/gen/getentropy_test.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/libc/tests/gen/getentropy_test.c b/lib/libc/tests/gen/getentropy_test.c index 156d3a94a7de..6ac9d5678ea6 100644 --- a/lib/libc/tests/gen/getentropy_test.c +++ b/lib/libc/tests/gen/getentropy_test.c @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -62,13 +63,13 @@ ATF_TC_BODY(getentropy_sizes, tc) char buf[512]; ATF_REQUIRE_EQ(getentropy(buf, sizeof(buf)), -1); - ATF_REQUIRE_EQ(errno, EIO); - ATF_REQUIRE_EQ(getentropy(buf, 257), -1); - ATF_REQUIRE_EQ(errno, EIO); + ATF_REQUIRE_EQ(errno, EINVAL); + ATF_REQUIRE_EQ(getentropy(buf, GETENTROPY_MAX + 1), -1); + ATF_REQUIRE_EQ(errno, EINVAL); /* Smaller sizes always succeed: */ - ATF_REQUIRE_EQ(getentropy(buf, 256), 0); - ATF_REQUIRE_EQ(getentropy(buf, 128), 0); + ATF_REQUIRE_EQ(getentropy(buf, GETENTROPY_MAX), 0); + ATF_REQUIRE_EQ(getentropy(buf, GETENTROPY_MAX / 2), 0); ATF_REQUIRE_EQ(getentropy(buf, 0), 0); }