From d9f886e2fb4f8b41b1bdf5e52e473a896d1f80a4 Mon Sep 17 00:00:00 2001 From: christos Date: Sat, 21 Aug 2021 09:08:55 +0000 Subject: [PATCH] rename glue.c to sodium_module.c --- sys/external/isc/libsodium/conf/files.libsodium | 4 ++-- sys/rump/kern/lib/libcrypto/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/external/isc/libsodium/conf/files.libsodium b/sys/external/isc/libsodium/conf/files.libsodium index 34610f3333f7..be6992831182 100644 --- a/sys/external/isc/libsodium/conf/files.libsodium +++ b/sys/external/isc/libsodium/conf/files.libsodium @@ -1,4 +1,4 @@ -# $NetBSD: files.libsodium,v 1.5 2020/08/26 15:49:56 riastradh Exp $ +# $NetBSD: files.libsodium,v 1.6 2021/08/21 09:09:39 christos Exp $ define libsodium @@ -11,7 +11,7 @@ makeoptions libsodium "CWARNFLAGS.libsodium"+="-Wno-shadow" makeoptions libsodium "CWARNFLAGS.libsodium"+="-Wno-unused-function" makeoptions libsodium "CWARNFLAGS.libsodium"+="-Wno-unused-variable" -file external/isc/libsodium/src/glue.c libsodium +file external/isc/libsodium/src/sodium_module.c libsodium file external/isc/libsodium/dist/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c libsodium file external/isc/libsodium/dist/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c libsodium diff --git a/sys/rump/kern/lib/libcrypto/Makefile b/sys/rump/kern/lib/libcrypto/Makefile index b7c3f024c6e4..b348b7474938 100644 --- a/sys/rump/kern/lib/libcrypto/Makefile +++ b/sys/rump/kern/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2021/08/21 08:47:23 christos Exp $ +# $NetBSD: Makefile,v 1.23 2021/08/21 09:08:55 christos Exp $ # S=${.CURDIR}/../../../.. @@ -80,7 +80,7 @@ SODIUM_SRCS+= aead_xchacha20poly1305.c SODIUM_SRCS+= aead_chacha20poly1305.c SODIUM_SRCS+= core_hchacha20.c SODIUM_SRCS+= ed25519_ref10.c -SODIUM_SRCS+= glue.c +SODIUM_SRCS+= sodium_module.c SRCS+= ${SODIUM_SRCS}