From nobody Fri Jan 2 20:52:33 2026 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 4djbVT5rKsz6MFjd for ; Fri, 02 Jan 2026 20:52:33 +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 4djbVT2s9pz3rHg for ; Fri, 02 Jan 2026 20:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387153; 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=NvU6Zi5tAz5m/OUajehOuLMwYY+R1CGHgrAFbla2KFU=; b=F4aQJ+lyuXjiTSqCsTZcZwy/1mLVJUORK7HSl1b/F9iRmGYYaTB07NoeOqTgfsAB9W5gsh S1F+F6dNGqyjfZnA8/u6ZSWvtcZaClcaBpSDI39gnAlETCQ9WjJVzDO3rtSL3nSQ9wrwdR lS8Ixn8dXgHiZgwv/KCQZ4cmxDV2DzMbS1boXUqHtBQrcsQmqxPRrYUN8HVnEVzJ9xD6bc KTotLasEaXfxVWhqLIzEQx2M2u9op6suUrWl3bjbeJUEaPF4dlhqpdxc+Ou54WPAvz2YD4 4cLQM6uYEvX9L/FrMKrohnICC2/HTTRy5SPT4k/EIH7yiWcC6fWqBqYgb1Vixg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767387153; 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=NvU6Zi5tAz5m/OUajehOuLMwYY+R1CGHgrAFbla2KFU=; b=nhlNSr/ku9dXkP1OozYo0Gt8/TydjXtqvCahA55m+QhytoRwyk/bUfSL7eLhbIFMXDSAgL OmQx2ngXcEpdvHY8LyPNS80MJ3aK0BpWyTnaEGCA7FWAt24ETgnCCgQzte+ODEHPrjWpif GY01EWT4KUzPJVTIzD8Ul/QyL8KbzHcN5KK1Ptd347dGzQnN2nwPA0rgu05GdO6jPvtNYS QMm4pkxVf3NKv0y27nyA0kF3j5iMdJ9K8W14hQahtaQbAfL18lPK+keuUQBwgxr0gaLP0d 66tQCewMJELkQLR8Kn5+ytGgdk+fk6nv4EmwxTrNcwlqUlSw6l6o/ZejxTKvOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767387153; a=rsa-sha256; cv=none; b=LUzNKynbs0z9884Hoh72XdB04qgIX5hDBghF10S4Zv1CN/WMtTI2TAKInsKPbA82kv0usX AdjnsER7Pj79V6qu3o812VNaEYYaZ2zdl6cDFgAsieu+9xfo8Q9TfSkcACdxwU6thtccDv yLGsQ2isTqRYejFaNnVsOFqlFtdNKSmoEjki6SgIbc5WMJ38t9/zx2dyfw8B2q+SMI1cp3 zU/Z1YyHaDeNnOpQtgzXzEmCkCmAF/ZCkeRQq19UUIC1SOOejo96UHNy8S6Ys7W6l2nYDd wSEJg2n4EkGeYPIlXECJLcoOLdupwfz/jHX1fhaDw72Gf8iXvLzRUF6jLzjpFg== 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 4djbVT23bqzbHb for ; Fri, 02 Jan 2026 20:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b0f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 20:52:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: f5b76cb51e2c - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: f5b76cb51e2c5b5b939b4d759379907c69ea31db Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 20:52:33 +0000 Message-Id: <69583011.b0f0.29123ad0@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f5b76cb51e2c5b5b939b4d759379907c69ea31db commit f5b76cb51e2c5b5b939b4d759379907c69ea31db Author: Dimitry Andric AuthorDate: 2025-12-30 12:46:20 +0000 Commit: Dimitry Andric CommitDate: 2026-01-02 20:50:19 +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)