From nobody Fri Jan 2 20:51:53 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 4djbTk1CKLz6MFgb for ; Fri, 02 Jan 2026 20:51:54 +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 4djbTj430Mz3qCr for ; Fri, 02 Jan 2026 20:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387113; 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=HnlqAUjMEHUQR1fI4F6V+LWh1Lez3FT+9gTCGV23uUM=; b=QiLjMY7UBsBNmfUtuoUnQMboDPcXVqBu7nJil9wvtviF6IzI8UpaCXhxg7ttp7P9yiOv0E aJ5p7JY9dk9HeqFG02OciS55qIXzwogI9dvhLpnYJIS72AcOowJUTZrBk2T1hFvuTAtvWr 4ehFQ+HDJ2UY3IA+20IOHcwhg1wZL7t06SP8y7g/Yq/+iMX01aFhgFNs2O5MNfc60z+6UP HennELDLx6GhE1H2EDIud7tfB7M+UCpKTRSor8ZEZyM3PyxdRP9u9oYI9xpkG3N/ddVHmb RYcKt0BVLAJBqGcVyjmmXqNP0V4S98qL4PuQdONC6fxpxp31yQ03JRKWK+hs3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387113; 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=HnlqAUjMEHUQR1fI4F6V+LWh1Lez3FT+9gTCGV23uUM=; b=tFQnR8DVLhtK1WnpEelWkLgxLcGx9f7AJ1RjtfizueqfTty1Y6B2hJz05MK4CHHSI1qJzK QYsxweNUVQmRi5oJT1Xybc2egpv7gA0ELhKlf6vJy/w1oKAjl7IH3GfG2LCIeNPlMKHc9B F7gB60RYDkrp9hwt0t7r/KLNVqGXngkKGRmhxAVdOmbaE1qAuRFBijfd7HlSU2GVxGYmhl oPHnLSHY23LD4Baw+XbCwlx53NywA2qR3hTcD0gtLsDsHMcbs1ygwnwBagHmOFSbSaR0kb v+t7F8LydhlCqdBINI+9V8lbH3fQ4psCulbyYJ37i6g5vkQm5b2Pyi92+ah8gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387113; a=rsa-sha256; cv=none; b=VuGRqXX/knBvhdoJoV5nHNC1q/6uqOPmQslyeg8O2ckVGGuiMGob4Yt7RG3yTYj66TcOIk 7IOZzlCned7KbF+EPxgjpS+qQeCLLzVHOZ99wNQ5CtBjSOVMgbr3LoJKJG8QhELm0vz5Cl holXKq5fhiofm3DYJZqaAWGxtXP4J/gqY+wBjhjBUC7J5tQxndhciJI7DkrS4gzMnyplNd AM0jgvi4EE1nbX2NPCTwi1jJB4rzt2yo1WGuCxXJ+cug+bGY5lf4ZZgJAis4ZlkbYscr/k 3dVKup2tnloSH5p/lCr9MVPYYjEmAoARK1UZk//D9tYqC1yteNzBqPjnKNd4Ew== 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 4djbTj30btzZTf for ; Fri, 02 Jan 2026 20:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b627 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:51:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: c17271f92431 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: c17271f9243159079f6f54fbf13a025e979ee79c Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:51:53 +0000 Message-Id: <69582fe9.b627.6847bd90@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c17271f9243159079f6f54fbf13a025e979ee79c commit c17271f9243159079f6f54fbf13a025e979ee79c Author: Dimitry Andric AuthorDate: 2025-12-30 12:46:20 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:41:35 +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 52f7e18c651c..b5f51bd10cc9 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)