Module Name: src
Committed By: christos
Date: Sat Aug 21 08:47:23 UTC 2021
Modified Files:
src/sys/rump/kern/lib/libcrypto: Makefile
Log Message:
Add glue.c for libsodium (suggested by riastradh). Tidy up.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/rump/kern/lib/libcrypto/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/kern/lib/libcrypto/Makefile
diff -u src/sys/rump/kern/lib/libcrypto/Makefile:1.21 src/sys/rump/kern/lib/libcrypto/Makefile:1.22
--- src/sys/rump/kern/lib/libcrypto/Makefile:1.21 Thu Aug 27 10:01:36 2020
+++ src/sys/rump/kern/lib/libcrypto/Makefile Sat Aug 21 04:47:23 2021
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.21 2020/08/27 14:01:36 riastradh Exp $
+# $NetBSD: Makefile,v 1.22 2021/08/21 08:47:23 christos Exp $
#
-SODIUM_IMPORTDIR=${.CURDIR}/../../../../external/isc/libsodium
-SODIUM_DIR=${.CURDIR}/../../../../external/isc/libsodium/dist/src/libsodium
-
-.PATH: ${.CURDIR}/../../../../crypto/adiantum \
- ${.CURDIR}/../../../../crypto/aes \
- ${.CURDIR}/../../../../crypto/blowfish \
- ${.CURDIR}/../../../../crypto/camellia \
- ${.CURDIR}/../../../../crypto/cast128 \
- ${.CURDIR}/../../../../crypto/des \
- ${.CURDIR}/../../../../crypto/skipjack \
+S=${.CURDIR}/../../../..
+SODIUM_IMPORTDIR=${S}/external/isc/libsodium
+SODIUM_DIR=${SODIUM_IMPORTDIR}/dist/src/libsodium
+
+.PATH: ${S}/crypto/adiantum \
+ ${S}/crypto/aes \
+ ${S}/crypto/blowfish \
+ ${S}/crypto/camellia \
+ ${S}/crypto/cast128 \
+ ${S}/crypto/des \
+ ${S}/crypto/skipjack \
${SODIUM_DIR}/crypto_scalarmult/curve25519/ref10 \
${SODIUM_DIR}/crypto_scalarmult/curve25519 \
${SODIUM_DIR}/crypto_scalarmult \
@@ -22,7 +23,8 @@ SODIUM_DIR=${.CURDIR}/../../../../extern
${SODIUM_DIR}/crypto_aead/xchacha20poly1305/sodium \
${SODIUM_DIR}/crypto_aead/chacha20poly1305/sodium \
${SODIUM_DIR}/crypto_core/hchacha20 \
- ${SODIUM_DIR}/crypto_core/ed25519/ref10
+ ${SODIUM_DIR}/crypto_core/ed25519/ref10 \
+ ${SODIUM_IMPORTDIR}/src
LIB= rumpkern_crypto
COMMENT=Cryptographic routines
@@ -78,6 +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
SRCS+= ${SODIUM_SRCS}
