From nobody Sun Jan 19 16:18:17 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 4Ybdtd3ySnz5lQtT; Sun, 19 Jan 2025 16:18:17 +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 4Ybdtd3NfDz3hjl; Sun, 19 Jan 2025 16:18:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737303497; 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=wH1J/laaCzZiHMRJOXLQuJ7dgUGQo7tqcNriSuTYadM=; b=R4cgBT2DAAdMqUj3uv/Q4SQJ7baaUbZSfuGcgVG5Ch6FNC40+WYzR5XyXLrKwDhxpWRYox pUI0P2t8GzdbKv/3i2wGnBnJQOg/MNwmOJBtbLcBiW5abQtrba6/B1p8qUjPliSOBm0qt7 24QDSGCxtJlH07tSvR5XpS9PO5cxpBK/3TbIWBXY2pln7MNb7djkkJ55o8TooIXm7JGVvy RdxwaoamgG947X9PTbW38ZZlcjyXSHEKlmLNm7UN+IT7O9f0a6rawCko87BEOYFvUbrUly r9Q97QgABd45zo8oLyo1aL/RL/ItHq2vKDQLj/F0cCrFNfRO9WPFlOqstIyg6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737303497; 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=wH1J/laaCzZiHMRJOXLQuJ7dgUGQo7tqcNriSuTYadM=; b=COAnRO+1jLkPPaR0hskzsWg4sQzMk29pkGOSKubQuXVSxXGXP7N0iXYuCjJcjMIo0GHBW7 inppZSDPVaHIEX/Xagu8ZwLwJAoWYCK1fHH7o6uQ5t4VtuWE3A0VUMwwHfTygVP9XPOAQs OJ+4EDWRnz0hWW1yXKid4WmB/jckxZNTC2pYNNHFp8s5CW/GQ+g+kWfsgwkGW23G19Lp9F oIuIVM9l53psT/RyKmiYenJWieMLrFCR2EDMtvzx7bZXocUNUaStm5rUqq1vyS00Onk0Ac ZPoz7h30RgMSUfjqLqVIW7ePljhyUK1f2YDgiJ1XdGuk9NM+NnoP7cn74GRuCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737303497; a=rsa-sha256; cv=none; b=IKcRP+DC9FOnRGtDAd0GGGAdbtkkjVjI49n8LPcKmc16oYyhcLc4Q+Tzy8x4N6bq0yuLBC UvKdRsEdpCn96hNdGdyWOqpeY8W0FDqI1bS3jMA8AbCqpG+VQlK6WfYNghOQmFGTTyF0F7 zxGQ+Im8u53/sI6LQKdoJbomRLY5hqh6fDL6VZk3r09DCWnDYGrV+ewY5kA8COJoG3IirX tuUzQmBAqFY2hPR+2Nskj8q7nzs7a3Q/vH8hmRf4rSotnQ0f03dfsPuKCmLCb4MXE4N3LG fUtDZK3VZwEQOemW5Gzg0MWMSe/EKT8stoV+G0bTeI8EJcOeXtojBYKOpFe7ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ybdtd2hVwzxS9; Sun, 19 Jan 2025 16:18:17 +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 50JGIHYW005683; Sun, 19 Jan 2025 16:18:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50JGIH1I005680; Sun, 19 Jan 2025 16:18:17 GMT (envelope-from git) Date: Sun, 19 Jan 2025 16:18:17 GMT Message-Id: <202501191618.50JGIH1I005680@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c5056a3931b4 - main - 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5056a3931b41a803a24b89400d38d5c5f843612 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c5056a3931b41a803a24b89400d38d5c5f843612 commit c5056a3931b41a803a24b89400d38d5c5f843612 Author: Mark Johnston AuthorDate: 2025-01-19 16:17:05 +0000 Commit: Mark Johnston CommitDate: 2025-01-19 16:17:05 +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") --- 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); }