From nobody Tue Dec 30 12:47: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 4dgXt44lh4z6Ls8Y for ; Tue, 30 Dec 2025 12:47: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgXt44Bx5z3Q6n for ; Tue, 30 Dec 2025 12:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767098844; 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=glP4Y0QJvof/BB371LR0BrB4O/J/jqZm6K29jb6s2DA=; b=PwWFqojtLnC5tpr+G/o42fwf7NB8nUCBmNpvK+dHb3cO3vTjWBnVdDI/7fZJYA5ckiI+Yx MkChS56i69fQ9phnlRbZRcnl797XB1fZgwtSs43nOfpQqJImjHJCR4gyNPm2vxMDxjXlqj Iw0cBl9DF4UcAAuzkZXoT7dMNkm6kslqzBWKqTd6tpTblM4cNm6hdqPEQUSl1d05teTkRr NiD+0SBwitdkylb8/HALuEwYYfVRVnYWJyFNHw1tkKTKH5F70QqqkrNOJgF4Kz3g6cPQ75 BaZ5//t1qDbJQp1q3b+Cyvkx+Epoci6IL3E811OBCJ+jI5qQEdlpVB1crvHXIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767098844; 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=glP4Y0QJvof/BB371LR0BrB4O/J/jqZm6K29jb6s2DA=; b=DnpDSUhjQrvlLJ4P5pZVrpyqXcnU9oVJgyP16klLBpL+rtJKtMiKlz9qSzvK47vh4UY7r3 g8/osgD9n8Vj2TgX2JrTSP86uRSiq+ZphAtfZxuyaPdIwY1IqjGNSu2tmDLSoZNFAntFfC 8uT62PycpdAAHvCqBZKymNRG1jUGBp4LNJSP4rq8SyR70U/EOwZqd02ue6g1xgZtInrRgW oPzV9nbUBhHij2Y00a4EChgYkxQbSBN2VJwi8IhhPWy6KUaC9qgWtl2tn+nC12VTLxZwyq xvj65zKn8sIAXNI9/BrXAhSxOeMu2I83F2qehpRyR8l1U7CZbektQyzWWn7NUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767098844; a=rsa-sha256; cv=none; b=BjvE3CaQBotjBObJdWXZmoDPAjwDNhmvJQLmI5j7VxyVF73RBro07ZFM1qLS4rXfUVBz0X OvuGTlRR3+iu/TmZd0roMPLvu1yZWjwS0yh1t4Dy9j/Xuh4Lo8mhJaf6wK0mqoppea7JGC pBr1oJdU/1HerkLwBIkB/Q09RTTnaelXQkpjlp8xxBKpYK3awpRIdfuT1a1XMrqBo8M9mV OHUKwGNGH5Epv+/8bHFcV5NSUyTBvRej0pySaNA8otAUMgfJ1Gyk312Nze1+zPqBX6JR3U WfZShUiLtko+Fjk6WIB7esejlTuoyxikmaWg8xrUAQk54kpmFSIqqgrJFLGVFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dgXt43QCnz11Nd for ; Tue, 30 Dec 2025 12:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 394b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Dec 2025 12:47:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 710ec409dffe - main - crypto: avoid warnings about too-long initializer strings 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 710ec409dffed3306ced253bba85dbdc7758510b Auto-Submitted: auto-generated Date: Tue, 30 Dec 2025 12:47:24 +0000 Message-Id: <6953c9dc.394b6.4b8b5085@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=710ec409dffed3306ced253bba85dbdc7758510b commit 710ec409dffed3306ced253bba85dbdc7758510b Author: Dimitry Andric AuthorDate: 2025-12-30 12:46:20 +0000 Commit: Dimitry Andric CommitDate: 2025-12-30 12:46:46 +0000 crypto: avoid warnings about too-long initializer strings Mark `sigma` and `tau` as `__non_string`, to avoid warnings from clang 21 similar to: sys/crypto/chacha20/chacha.c:53:31: error: initializer-string for character array is too long, array size is 16 but initializer has size 17 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 53 | static const char sigma[16] = "expand 32-byte k"; | ^~~~~~~~~~~~~~~~~~ sys/crypto/chacha20/chacha.c:54:29: error: initializer-string for character array is too long, array size is 16 but initializer has size 17 (including the null terminating character); did you mean to use the 'nonstring' attribute? [-Werror,-Wunterminated-string-initialization] 54 | static const char tau[16] = "expand 16-byte k"; | ^~~~~~~~~~~~~~~~~~ MFC after: 3 days Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54364 --- sys/crypto/chacha20/chacha.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/crypto/chacha20/chacha.c b/sys/crypto/chacha20/chacha.c index cb06003b0ecf..0509b05cab22 100644 --- a/sys/crypto/chacha20/chacha.c +++ b/sys/crypto/chacha20/chacha.c @@ -50,8 +50,8 @@ typedef struct chacha_ctx chacha_ctx; a = PLUS(a,b); d = ROTATE(XOR(d,a), 8); \ c = PLUS(c,d); b = ROTATE(XOR(b,c), 7); -static const char sigma[16] = "expand 32-byte k"; -static const char tau[16] = "expand 16-byte k"; +static const char sigma[16] __nonstring = "expand 32-byte k"; +static const char tau[16] __nonstring = "expand 16-byte k"; LOCAL void chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits)