git: 63b7c2df8ec4 - main - Disable -Wunused-function for {ed,x}25519_ref10.c in libsodium.

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=63b7c2df8ec41bf9ac33ccaf9b9d16c7dc28ea0c

commit 63b7c2df8ec41bf9ac33ccaf9b9d16c7dc28ea0c
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-02-02 20:25:16 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-02-02 20:25:16 +0000

    Disable -Wunused-function for {ed,x}25519_ref10.c in libsodium.
---
 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 0278d5fa4083..78921d2c9fa0 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -4971,7 +4971,7 @@ opencrypto/xform_sha1.c		optional crypto
 opencrypto/xform_sha2.c		optional crypto
 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_core/hchacha20/core_hchacha20.c \
 	optional crypto \
 	compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
@@ -4986,7 +4986,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 63bc81fad99d..b93f8d55c41c 100644
--- a/sys/modules/crypto/Makefile
+++ b/sys/modules/crypto/Makefile
@@ -71,6 +71,7 @@ SRCS	+= xform_poly1305.c
 CFLAGS.xform_poly1305.c		+= -I${LIBSODIUM_INC} -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
@@ -85,6 +86,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