Wed Aug 26 15:49:56 2020 UTC ()
Tidy up libsodium makefile and config fragments.


(riastradh)
diff -r1.4 -r1.5 src/sys/external/isc/libsodium/conf/files.libsodium
diff -r1.19 -r1.20 src/sys/rump/kern/lib/libcrypto/Makefile
cvs diff -r1.4 -r1.5 src/sys/external/isc/libsodium/conf/files.libsodium (expand / switch to unified diff)

--- src/sys/external/isc/libsodium/conf/files.libsodium 2020/08/21 06:37:30 1.4
+++ src/sys/external/isc/libsodium/conf/files.libsodium 2020/08/26 15:49:56 1.5
@@ -1,38 +1,25 @@ @@ -1,38 +1,25 @@
1# $NetBSD: files.libsodium,v 1.4 2020/08/21 06:37:30 riastradh Exp $ 1# $NetBSD: files.libsodium,v 1.5 2020/08/26 15:49:56 riastradh Exp $
2 2
3define libsodium 3define libsodium
4 4
5makeoptions libsodium SODIUM_CPPFLAGS+="-I$S/external/isc/libsodium/include" 5makeoptions libsodium "CPPFLAGS.libsodium"+="-I$S/external/isc/libsodium/include"
6makeoptions libsodium SODIUM_CPPFLAGS+="-I$S/external/isc/libsodium/dist/src/libsodium/include/sodium" 6makeoptions libsodium "CPPFLAGS.libsodium"+="-I$S/external/isc/libsodium/dist/src/libsodium/include/sodium"
7 7
8#makeoptions libsodium SODIUM_CPPFLAGS+="-DHAVE_TI_MODE" 8#makeoptions libsodium "CPPFLAGS.libsodium"+="-DHAVE_TI_MODE"
9 9
10makeoptions libsodium SODIUM_CPPFLAGS+="-Wno-shadow" 10makeoptions libsodium "CWARNFLAGS.libsodium"+="-Wno-shadow"
11makeoptions libsodium SODIUM_CPPFLAGS+="-Wno-unused-function" 11makeoptions libsodium "CWARNFLAGS.libsodium"+="-Wno-unused-function"
12makeoptions libsodium SODIUM_CPPFLAGS+="-Wno-unused-variable" 12makeoptions libsodium "CWARNFLAGS.libsodium"+="-Wno-unused-variable"
13 
14makeoptions libsodium "CPPFLAGS.x25519_ref10.c"+="${SODIUM_CPPFLAGS}" 
15makeoptions libsodium "CPPFLAGS.scalarmult_curve25519.c"+="${SODIUM_CPPFLAGS}" 
16makeoptions libsodium "CPPFLAGS.crypto_scalarmult.c"+="${SODIUM_CPPFLAGS}" 
17makeoptions libsodium "CPPFLAGS.poly1305_donna.c"+="${SODIUM_CPPFLAGS}" 
18makeoptions libsodium "CPPFLAGS.onetimeauth_poly1305.c"+="${SODIUM_CPPFLAGS}" 
19makeoptions libsodium "CPPFLAGS.crypto_onetimeauth.c"+="${SODIUM_CPPFLAGS}" 
20makeoptions libsodium "CPPFLAGS.chacha20_ref.c"+="${SODIUM_CPPFLAGS}" 
21makeoptions libsodium "CPPFLAGS.stream_chacha20.c"+="${SODIUM_CPPFLAGS}" 
22makeoptions libsodium "CPPFLAGS.aead_xchacha20poly1305.c"+="${SODIUM_CPPFLAGS}" 
23makeoptions libsodium "CPPFLAGS.aead_chacha20poly1305.c"+="${SODIUM_CPPFLAGS}" 
24makeoptions libsodium "CPPFLAGS.core_hchacha20.c"+="${SODIUM_CPPFLAGS}" 
25makeoptions libsodium "CPPFLAGS.ed25519_ref10.c"+="${SODIUM_CPPFLAGS}" 
26 13
27file external/isc/libsodium/src/glue.c libsodium 14file external/isc/libsodium/src/glue.c libsodium
28 15
29file external/isc/libsodium/dist/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c libsodium 16file external/isc/libsodium/dist/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c libsodium
30file external/isc/libsodium/dist/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c libsodium 17file external/isc/libsodium/dist/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c libsodium
31file external/isc/libsodium/dist/src/libsodium/crypto_scalarmult/crypto_scalarmult.c libsodium 18file external/isc/libsodium/dist/src/libsodium/crypto_scalarmult/crypto_scalarmult.c libsodium
32file external/isc/libsodium/dist/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.c libsodium 19file external/isc/libsodium/dist/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.c libsodium
33file external/isc/libsodium/dist/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c libsodium 20file external/isc/libsodium/dist/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c libsodium
34file external/isc/libsodium/dist/src/libsodium/crypto_onetimeauth/crypto_onetimeauth.c libsodium 21file external/isc/libsodium/dist/src/libsodium/crypto_onetimeauth/crypto_onetimeauth.c libsodium
35file external/isc/libsodium/dist/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.c libsodium 22file external/isc/libsodium/dist/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.c libsodium
36file external/isc/libsodium/dist/src/libsodium/crypto_stream/chacha20/stream_chacha20.c libsodium 23file external/isc/libsodium/dist/src/libsodium/crypto_stream/chacha20/stream_chacha20.c libsodium
37file external/isc/libsodium/dist/src/libsodium/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c libsodium 24file external/isc/libsodium/dist/src/libsodium/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c libsodium
38file external/isc/libsodium/dist/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c libsodium 25file external/isc/libsodium/dist/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c libsodium
cvs diff -r1.19 -r1.20 src/sys/rump/kern/lib/libcrypto/Makefile (expand / switch to unified diff)

--- src/sys/rump/kern/lib/libcrypto/Makefile 2020/08/21 06:37:30 1.19
+++ src/sys/rump/kern/lib/libcrypto/Makefile 2020/08/26 15:49:56 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.19 2020/08/21 06:37:30 riastradh Exp $ 1# $NetBSD: Makefile,v 1.20 2020/08/26 15:49:56 riastradh Exp $
2# 2#
3 3
4SODIUM_IMPORTDIR=${.CURDIR}/../../../../external/isc/libsodium 4SODIUM_IMPORTDIR=${.CURDIR}/../../../../external/isc/libsodium
5SODIUM_DIR=${.CURDIR}/../../../../external/isc/libsodium/dist/src/libsodium 5SODIUM_DIR=${.CURDIR}/../../../../external/isc/libsodium/dist/src/libsodium
6 6
7.PATH: ${.CURDIR}/../../../../crypto/adiantum \ 7.PATH: ${.CURDIR}/../../../../crypto/adiantum \
8 ${.CURDIR}/../../../../crypto/aes \ 8 ${.CURDIR}/../../../../crypto/aes \
9 ${.CURDIR}/../../../../crypto/blake2 \ 9 ${.CURDIR}/../../../../crypto/blake2 \
10 ${.CURDIR}/../../../../crypto/blowfish \ 10 ${.CURDIR}/../../../../crypto/blowfish \
11 ${.CURDIR}/../../../../crypto/camellia \ 11 ${.CURDIR}/../../../../crypto/camellia \
12 ${.CURDIR}/../../../../crypto/cast128 \ 12 ${.CURDIR}/../../../../crypto/cast128 \
13 ${.CURDIR}/../../../../crypto/des \ 13 ${.CURDIR}/../../../../crypto/des \
14 ${.CURDIR}/../../../../crypto/skipjack \ 14 ${.CURDIR}/../../../../crypto/skipjack \
@@ -50,45 +50,45 @@ SRCS+= camellia.c camellia-api.c @@ -50,45 +50,45 @@ SRCS+= camellia.c camellia-api.c
50 50
51# cast128 51# cast128
52SRCS+= cast128.c 52SRCS+= cast128.c
53 53
54# DES 54# DES
55SRCS+= des_ecb.c des_setkey.c des_enc.c des_cbc.c des_module.c 55SRCS+= des_ecb.c des_setkey.c des_enc.c des_cbc.c des_module.c
56 56
57# skipjack 57# skipjack
58SRCS+= skipjack.c 58SRCS+= skipjack.c
59 59
60# BLAKE2 60# BLAKE2
61SRCS+= blake2s.c 61SRCS+= blake2s.c
62 62
63# Various cryptography functions 63# libsodium
64SODIUM_CPPFLAGS= 
65SODIUM_CPPFLAGS+= -I${SODIUM_IMPORTDIR}/include 64SODIUM_CPPFLAGS+= -I${SODIUM_IMPORTDIR}/include
66SODIUM_CPPFLAGS+= -I${SODIUM_IMPORTDIR}/dist/src/libsodium/include/sodium 65SODIUM_CPPFLAGS+= -I${SODIUM_IMPORTDIR}/dist/src/libsodium/include/sodium
67 66
68#SODIUM_CPPFLAGS+= -DHAVE_TI_MODE 67#SODIUM_CPPFLAGS+= -DHAVE_TI_MODE
69 68
70SODIUM_CPPFLAGS+= -Wno-shadow 69SODIUM_CWARNFLAGS+= -Wno-shadow
71SODIUM_CPPFLAGS+= -Wno-unused-function 70SODIUM_CWARNFLAGS+= -Wno-unused-function
72SODIUM_CPPFLAGS+= -Wno-unused-variable 71SODIUM_CWARNFLAGS+= -Wno-unused-variable
73 72
74CPPFLAGS.x25519_ref10.c+= ${SODIUM_CPPFLAGS} 73SODIUM_SRCS+= x25519_ref10.c
75CPPFLAGS.scalarmult_curve25519.c+= ${SODIUM_CPPFLAGS} 74SODIUM_SRCS+= scalarmult_curve25519.c
76CPPFLAGS.crypto_scalarmult.c+= ${SODIUM_CPPFLAGS} 75SODIUM_SRCS+= crypto_scalarmult.c
77CPPFLAGS.poly1305_donna.c+= ${SODIUM_CPPFLAGS} 76SODIUM_SRCS+= poly1305_donna.c
78CPPFLAGS.onetimeauth_poly1305.c+= ${SODIUM_CPPFLAGS} 77SODIUM_SRCS+= onetimeauth_poly1305.c
79CPPFLAGS.crypto_onetimeauth.c+= ${SODIUM_CPPFLAGS} 78SODIUM_SRCS+= crypto_onetimeauth.c
80CPPFLAGS.chacha20_ref.c+= ${SODIUM_CPPFLAGS} 79SODIUM_SRCS+= chacha20_ref.c
81CPPFLAGS.stream_chacha20.c+= ${SODIUM_CPPFLAGS} 80SODIUM_SRCS+= stream_chacha20.c
82CPPFLAGS.aead_xchacha20poly1305.c+= ${SODIUM_CPPFLAGS} 81SODIUM_SRCS+= aead_xchacha20poly1305.c
83CPPFLAGS.aead_chacha20poly1305.c+= ${SODIUM_CPPFLAGS} 82SODIUM_SRCS+= aead_chacha20poly1305.c
84CPPFLAGS.core_hchacha20.c+= ${SODIUM_CPPFLAGS} 83SODIUM_SRCS+= core_hchacha20.c
85CPPFLAGS.ed25519_ref10.c+= ${SODIUM_CPPFLAGS} 84SODIUM_SRCS+= ed25519_ref10.c
86 85
87SRCS+= x25519_ref10.c scalarmult_curve25519.c crypto_scalarmult.c 86SRCS+= ${SODIUM_SRCS}
88SRCS+= poly1305_donna.c onetimeauth_poly1305.c 87
89SRCS+= crypto_onetimeauth.c chacha20_ref.c stream_chacha20.c 88.for _s_ in ${SODIUM_SRCS}
90SRCS+= aead_xchacha20poly1305.c aead_chacha20poly1305.c 89CPPFLAGS.${_s_}+= ${SODIUM_CPPFLAGS}
91SRCS+= core_hchacha20.c ed25519_ref10.c 90COPTS.${_s_}+= ${SODIUM_CWARNFLAGS}
 91.endfor
92 92
93.include <bsd.lib.mk> 93.include <bsd.lib.mk>
94.include <bsd.klinks.mk> 94.include <bsd.klinks.mk>