From nobody Fri Jan 2 20:52:12 2026 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 4djbV537cHz6MFp0 for ; Fri, 02 Jan 2026 20:52:13 +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 4djbV46TQ7z3qfj for ; Fri, 02 Jan 2026 20:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387133; 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=Q0cGhYuc0bS9IJorScFaCJhCqaW9Pc0ckUnCkmW3O+s=; b=mMjXmDCOP3rdiWsI44s5GDjezsOs0a60dcXssGdYrLArqoQTWFz/7TPexNveUItudaTjrf Dpmjdg6gIwljivBwJh2RK4vp7kAdS5rCQc1abUcLBEKOFfbLQE0cx4GV1gVNTu8elZudqW qJe9kZCRqrP6LNTTHoJs22VcnQkbcXjtIr3Sq9q+DOLjRKCnwV7iya9IwMaIn9jg/k4oZF sZGHJec/krna3Eh3nBOVRYZHXeOiQ+9zegQSm5X/V0nlG/hAW/BySbbYwGND/v3K3UGYq/ 4nvwrIP3yAErcNDpKorIRWktGX32Ev/6YGqMrvSKLZBSkqYAYIl5BX7eWFKC5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387132; 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=Q0cGhYuc0bS9IJorScFaCJhCqaW9Pc0ckUnCkmW3O+s=; b=p3CBmudjoZf8UapRyuSisJyd96ZWURjlsReYH6Lhw5DNLcbW1GuV9+cqyPfu4pIxQay0Li vhJ3n4+5TBOII56TB/Jt2zQpivsd15OduQ3o+8v5cec+XdrFrJxXbhBkiZMC1ev8q/DKHm Ef/dsBFqXhp80C5A6QbxyfegAqn/xrQ6YJW6yPp1BgFiZcPpgHnLSbnvOCh5TxFmaXwadN Ii4LY3S8yfinm5qs0RRPNaJqcXOCFVwa7aB7aclbJIMRtPyMUXO3QEatJch54l2glh8nD+ L4U8N3S6+F7BI5/jRM07siL0xp7vRuTNwv5uhJHz7qAzMvDh4H+1egmMinNBaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387132; a=rsa-sha256; cv=none; b=lHg5E81NByBWtMnle3VfQJDGGWL6iz5uMb2pxhXN/Gd18r0EN92WK488Rvz8oREiAwAI4h BlPnEQHBSrr5YJOQRXkm6TKrtKye4lXP9nXZxwnUUfsNSWC3fAuFrScCLB4mmJByZnBW84 OaTendi1ZLB+V5vg9enA3yzB6JdTiGvgPO9b2KSsqwyH1Dbb0KmAd0n0AXDEKRlYQKdUb7 aH0s7iXgArkUclL8PRCdtTiudGW+Hsq3SLOMDP9qqf6HSuxepZbj/cwGruB/Vxo3930N7/ xQX2h5OAsU+L6gfto6AL1Q1KTBoC5pomqMLxwgx3me4A2ydrfMqQEzMqUAceiw== 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 4djbV45LZLzb38 for ; Fri, 02 Jan 2026 20:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id baf4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 752d056fce33 - stable/14 - crypto: avoid warnings about too-long initializer strings 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 752d056fce33052d482eeb24756497fc44dac579 Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:12 +0000 Message-Id: <69582ffc.baf4.4b7ec9ac@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=752d056fce33052d482eeb24756497fc44dac579 commit 752d056fce33052d482eeb24756497fc44dac579 Author: Dimitry Andric AuthorDate: 2025-12-30 12:46:20 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:44:59 +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 (cherry picked from commit 710ec409dffed3306ced253bba85dbdc7758510b) --- 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 e22c348d14bd..8ce69226635f 100644 --- a/sys/crypto/chacha20/chacha.c +++ b/sys/crypto/chacha20/chacha.c @@ -51,8 +51,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)