Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/rump/kern/lib/libcrypto Fix vestiges of libb2.



details:   https://anonhg.NetBSD.org/src/rev/7f07a13087c1
branches:  trunk
changeset: 937501:7f07a13087c1
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Aug 20 21:30:32 2020 +0000

description:
Fix vestiges of libb2.

diffstat:

 sys/rump/kern/lib/libcrypto/Makefile |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r 5975004395b3 -r 7f07a13087c1 sys/rump/kern/lib/libcrypto/Makefile
--- a/sys/rump/kern/lib/libcrypto/Makefile      Thu Aug 20 21:29:44 2020 +0000
+++ b/sys/rump/kern/lib/libcrypto/Makefile      Thu Aug 20 21:30:32 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2020/08/20 21:21:32 riastradh Exp $
+#      $NetBSD: Makefile,v 1.15 2020/08/20 21:30:32 riastradh Exp $
 #
 
 SODIUM_IMPORTDIR=${.CURDIR}/../../../../external/isc/libsodium
@@ -11,7 +11,6 @@
        ${.CURDIR}/../../../../crypto/cast128                           \
        ${.CURDIR}/../../../../crypto/des                               \
        ${.CURDIR}/../../../../crypto/skipjack                          \
-       ${.CURDIR}/../../../../external/cc0/libb2/dist/src              \
        ${SODIUM_DIR}/crypto_scalarmult/curve25519/ref10                \
        ${SODIUM_DIR}/crypto_scalarmult/curve25519                      \
        ${SODIUM_DIR}/crypto_scalarmult                                 \
@@ -58,9 +57,7 @@
 SRCS+= skipjack.c
 
 # BLAKE2
-SRCS+= blake2s-ref.c
-CPPFLAGS.blake2s-ref.c+= -I${.CURDIR}/../../../../external/cc0/libb2/include \
-    -Wno-cast-qual -DSUFFIX=
+SRCS+= blake2s.c
 
 # Various cryptography functions
 SODIUM_CPPFLAGS=



Home | Main Index | Thread Index | Old Index