From nobody Wed Mar 22 16:32:59 2023 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 4PhYtM3nffz412hl; Wed, 22 Mar 2023 16:32:59 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhYtM2lShz3QjN; Wed, 22 Mar 2023 16:32:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502779; 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=xoooRTxUwxOwFdEnk+BUMt+RRXB9kT3x0KWYjvpT8u0=; b=Lvet8QUP6xaaApHjjopXTa4xEqLxelk32TINYIPfJaHN8pi7fDYRzd015rHLbHCH2KxiXu OjQLLSFYqPlgu9wtIngJQobf06UMduxaC8F64LjGxZTHFD41sMZuxbhsGPvc+qfL5JbUHF IMVKKkzSCH2nZU+JQe5oHIyh3kYhYldlsIJudFZCkC+zQTQMiirWMLPO1ghxH3i9/1P5r7 Dk5r14kuswgD8lCXxGKMPu7CagwNdkT0h54W5x18vbrOZGMLYgbNp/buFgkz8ouYk0hjrV zxVaohv/5il+yfrUPftK2MF/eSlnYElRPAzUMhLN6iLYC1miJq1pmD1ApYibPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502779; 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=xoooRTxUwxOwFdEnk+BUMt+RRXB9kT3x0KWYjvpT8u0=; b=pUiOaAM30CF/tsXeMGijdhNv7RGb0W/8u8D+Tkr9DzTNDdxJirc4c/1giUgCSLov8RxEnv VQ3C63tj+CW4wWhzEBQK4x9oXTlVPj77wurtzuwAHTMH1r4KlAM82JmWHQ5qrEfGTewqhZ 3bAsWhRTKaWLsLxzuwcHLN0c1oR+y8oD1eJD/M6puGUXsP2DJPArFVDNiGSN6pjfNXsR4S aTgcU/xVF+ZZ+n3oUgswW7WIpw3MRQ4A6OyyY7+jCkqQmI6gSVJf5Nne1NEbKKO6HnvM7q 1pCLFIvVgCdb5oAu4YetcUv4yX2r/y4SXRVazIZd6RnmrvpTlg5zr9KZELU7zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679502779; a=rsa-sha256; cv=none; b=rTc/T173s4rhcQWCPiECrh0c4aFX9DgwpyB25iGCGLHjRY+TedqAnqCqULgRI//T07nt8w WQyAJMecZuq/6EZMC4HYhKKJPUbVi+osbRgZsSHGHLzNfkjSEDfdlMiT1sDeaV1kiEVJCM d2mV+fT2WKgjkmx+3qG+YhNFH7fcRFj1fyPWRuz6D//zHVSZyQYb8QY2jZG+sFH3anln+r 0/Hj1gBAU8CmAnYEOG1829waVkitw3oe6ovd/30Me+cbxmdxi+Us8Xz+o0y/o74yPd00qS W9T2MR/oTDGXuayQFlZEBHfoqAQnzHVt1AoGNm62xclH+aHB6LpRKOyMkMYnqQ== 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 4PhYtM1qrkz11N0; Wed, 22 Mar 2023 16:32:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MGWxX3024152; Wed, 22 Mar 2023 16:32:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MGWxNR024151; Wed, 22 Mar 2023 16:32:59 GMT (envelope-from git) Date: Wed, 22 Mar 2023 16:32:59 GMT Message-Id: <202303221632.32MGWxNR024151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e889fcdf8e8d - stable/13 - Disable -Wunused-function for {ed,x}25519_ref10.c in libsodium. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e889fcdf8e8ddc184c97e79b82bcf251126e1fa5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e889fcdf8e8ddc184c97e79b82bcf251126e1fa5 commit e889fcdf8e8ddc184c97e79b82bcf251126e1fa5 Author: John Baldwin AuthorDate: 2022-02-02 20:25:16 +0000 Commit: John Baldwin CommitDate: 2023-03-22 16:19:58 +0000 Disable -Wunused-function for {ed,x}25519_ref10.c in libsodium. (cherry picked from commit 63b7c2df8ec41bf9ac33ccaf9b9d16c7dc28ea0c) --- sys/conf/files | 4 ++-- sys/modules/crypto/Makefile | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 19b0445f2e0c..17dcd22facc7 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -5045,7 +5045,7 @@ opencrypto/xform_poly1305.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" contrib/libsodium/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c \ optional crypto \ - compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" + compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium -Wno-unused-function" contrib/libsodium/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c \ optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" @@ -5066,7 +5066,7 @@ contrib/libsodium/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve255 compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" contrib/libsodium/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c \ optional crypto \ - compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" + compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium -Wno-unused-function" contrib/libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20.c \ optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile index 877bae8d930e..471d04be1525 100644 --- a/sys/modules/crypto/Makefile +++ b/sys/modules/crypto/Makefile @@ -75,6 +75,7 @@ SRCS += aead_xchacha20poly1305.c CFLAGS.aead_xchacha20poly1305.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} SRCS += ed25519_ref10.c CFLAGS.ed25519_ref10.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} +CWARNFLAGS.ed25519_ref10.c += -Wno-unused-function SRCS += core_hchacha20.c CFLAGS.core_hchacha20.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} SRCS += onetimeauth_poly1305.c @@ -89,6 +90,7 @@ SRCS += scalarmult_curve25519.c CFLAGS.scalarmult_curve25519.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} SRCS += x25519_ref10.c CFLAGS.x25519_ref10.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} +CWARNFLAGS.x25519_ref10.c += -Wno-unused-function SRCS += verify.c CFLAGS.verify.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} SRCS += randombytes.c