[src/trunk]: src/sys/rump/kern/lib/libcrypto Add glue.c for libsodium (sugges...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/33be49672e54
branches:  trunk
changeset: 1023044:33be49672e54
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Aug 21 08:47:23 2021 +0000

description:
Add glue.c for libsodium (suggested by riastradh). Tidy up.

diffstat:

 sys/rump/kern/lib/libcrypto/Makefile |  25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diffs (49 lines):

diff -r adabfb295318 -r 33be49672e54 sys/rump/kern/lib/libcrypto/Makefile
--- a/sys/rump/kern/lib/libcrypto/Makefile      Sat Aug 21 08:39:01 2021 +0000
+++ b/sys/rump/kern/lib/libcrypto/Makefile      Sat Aug 21 08:47:23 2021 +0000
@@ -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
+S=${.CURDIR}/../../../..
+SODIUM_IMPORTDIR=${S}/external/isc/libsodium
+SODIUM_DIR=${SODIUM_IMPORTDIR}/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                          \
+.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}/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_chacha20poly1305.c
 SODIUM_SRCS+=  core_hchacha20.c
 SODIUM_SRCS+=  ed25519_ref10.c
+SODIUM_SRCS+=  glue.c
 
 SRCS+= ${SODIUM_SRCS}