CVS commit: src/sys/rump/kern/lib/libcrypto
Module Name:src
Committed By: riastradh
Date: Thu Aug 20 21:33:43 UTC 2020
Modified Files:
src/sys/rump/kern/lib/libcrypto: Makefile
Log Message:
Missed a spot -- add sys/crypto/blake2 to .PATH here.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 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.15 src/sys/rump/kern/lib/libcrypto/Makefile:1.16
--- src/sys/rump/kern/lib/libcrypto/Makefile:1.15 Thu Aug 20 21:30:32 2020
+++ src/sys/rump/kern/lib/libcrypto/Makefile Thu Aug 20 21:33:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2020/08/20 21:30:32 riastradh Exp $
+# $NetBSD: Makefile,v 1.16 2020/08/20 21:33:43 riastradh Exp $
#
SODIUM_IMPORTDIR=${.CURDIR}/../../../../external/isc/libsodium
@@ -6,6 +6,7 @@ SODIUM_DIR=${.CURDIR}/../../../../extern
.PATH: ${.CURDIR}/../../../../crypto/adiantum\
${.CURDIR}/../../../../crypto/aes\
+ ${.CURDIR}/../../../../crypto/blake2\
${.CURDIR}/../../../../crypto/blowfish\
${.CURDIR}/../../../../crypto/camellia\
${.CURDIR}/../../../../crypto/cast128\
CVS commit: src/sys/rump/kern/lib/libcrypto
Module Name:src
Committed By: riastradh
Date: Thu Aug 20 21:30:32 UTC 2020
Modified Files:
src/sys/rump/kern/lib/libcrypto: Makefile
Log Message:
Fix vestiges of libb2.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 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.14 src/sys/rump/kern/lib/libcrypto/Makefile:1.15
--- src/sys/rump/kern/lib/libcrypto/Makefile:1.14 Thu Aug 20 21:21:32 2020
+++ src/sys/rump/kern/lib/libcrypto/Makefile Thu Aug 20 21:30:32 2020
@@ -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 @@ SODIUM_DIR=${.CURDIR}/../../../../extern
${.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+= des_ecb.c des_setkey.c des_enc.c
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=
CVS commit: src/sys/rump/kern/lib/libcrypto
Module Name:src
Committed By: riastradh
Date: Sun Jul 26 04:25:14 UTC 2020
Modified Files:
src/sys/rump/kern/lib/libcrypto: Makefile
Log Message:
Add missing aes_ccm.c, aes_ccm_mbuf.c. Fix sort order.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 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.10 src/sys/rump/kern/lib/libcrypto/Makefile:1.11
--- src/sys/rump/kern/lib/libcrypto/Makefile:1.10 Sun Jul 26 04:03:45 2020
+++ src/sys/rump/kern/lib/libcrypto/Makefile Sun Jul 26 04:25:14 2020
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2020/07/26 04:03:45 riastradh Exp $
+# $NetBSD: Makefile,v 1.11 2020/07/26 04:25:14 riastradh Exp $
#
.PATH: ${.CURDIR}/../../../../crypto/adiantum\
${.CURDIR}/../../../../crypto/aes\
- ${.CURDIR}/../../../../crypto/chacha\
${.CURDIR}/../../../../crypto/blowfish\
${.CURDIR}/../../../../crypto/camellia\
${.CURDIR}/../../../../crypto/cast128\
+ ${.CURDIR}/../../../../crypto/chacha\
${.CURDIR}/../../../../crypto/des\
${.CURDIR}/../../../../crypto/skipjack
@@ -36,6 +36,8 @@ SRCS+= des_ecb.c des_setkey.c des_enc.c
# AES
SRCS+= aes_bear.c
+SRCS+= aes_ccm.c
+SRCS+= aes_ccm_mbuf.c
SRCS+= aes_ct.c
SRCS+= aes_ct_dec.c
SRCS+= aes_ct_enc.c
CVS commit: src/sys/rump/kern/lib/libcrypto
Module Name:src
Committed By: riastradh
Date: Sun Jul 26 04:25:49 UTC 2020
Modified Files:
src/sys/rump/kern/lib/libcrypto: Makefile
Log Message:
Fix more sort order.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 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.11 src/sys/rump/kern/lib/libcrypto/Makefile:1.12
--- src/sys/rump/kern/lib/libcrypto/Makefile:1.11 Sun Jul 26 04:25:14 2020
+++ src/sys/rump/kern/lib/libcrypto/Makefile Sun Jul 26 04:25:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/07/26 04:25:14 riastradh Exp $
+# $NetBSD: Makefile,v 1.12 2020/07/26 04:25:49 riastradh Exp $
#
.PATH: ${.CURDIR}/../../../../crypto/adiantum\
@@ -17,33 +17,33 @@ COMMENT=Cryptographic routines
SRCS+= adiantum.c
SRCS+= adiantum_selftest.c
+# AES
+SRCS+= aes_bear.c
+SRCS+= aes_ccm.c
+SRCS+= aes_ccm_mbuf.c
+SRCS+= aes_ct.c
+SRCS+= aes_ct_dec.c
+SRCS+= aes_ct_enc.c
+SRCS+= aes_impl.c
+SRCS+= aes_selftest.c
+
# blowfish
SRCS+= bf_ecb.c bf_enc.c bf_cbc.c bf_skey.c bf_module.c
# camellia
SRCS+= camellia.c camellia-api.c
+# cast128
+SRCS+= cast128.c
+
# ChaCha
SRCS+= chacha_impl.c
SRCS+= chacha_ref.c
SRCS+= chacha_selftest.c
-# cast128
-SRCS+= cast128.c
-
# DES
SRCS+= des_ecb.c des_setkey.c des_enc.c des_cbc.c des_module.c
-# AES
-SRCS+= aes_bear.c
-SRCS+= aes_ccm.c
-SRCS+= aes_ccm_mbuf.c
-SRCS+= aes_ct.c
-SRCS+= aes_ct_dec.c
-SRCS+= aes_ct_enc.c
-SRCS+= aes_impl.c
-SRCS+= aes_selftest.c
-
# skipjack
SRCS+= skipjack.c
CVS commit: src/sys/rump/kern/lib/libcrypto
Module Name:src
Committed By: riastradh
Date: Sun Jul 26 04:03:45 UTC 2020
Modified Files:
src/sys/rump/kern/lib/libcrypto: Makefile
Log Message:
Add chacha to rump libcrypto.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 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.9 src/sys/rump/kern/lib/libcrypto/Makefile:1.10
--- src/sys/rump/kern/lib/libcrypto/Makefile:1.9 Sat Jul 25 22:40:08 2020
+++ src/sys/rump/kern/lib/libcrypto/Makefile Sun Jul 26 04:03:45 2020
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2020/07/25 22:40:08 riastradh Exp $
+# $NetBSD: Makefile,v 1.10 2020/07/26 04:03:45 riastradh Exp $
#
.PATH: ${.CURDIR}/../../../../crypto/adiantum\
${.CURDIR}/../../../../crypto/aes\
+ ${.CURDIR}/../../../../crypto/chacha\
${.CURDIR}/../../../../crypto/blowfish\
${.CURDIR}/../../../../crypto/camellia\
${.CURDIR}/../../../../crypto/cast128\
@@ -22,6 +23,11 @@ SRCS+= bf_ecb.c bf_enc.c bf_cbc.c bf_ske
# camellia
SRCS+= camellia.c camellia-api.c
+# ChaCha
+SRCS+= chacha_impl.c
+SRCS+= chacha_ref.c
+SRCS+= chacha_selftest.c
+
# cast128
SRCS+= cast128.c
CVS commit: src/sys/rump/kern/lib/libcrypto
Module Name:src
Committed By: riastradh
Date: Thu Dec 5 03:57:55 UTC 2019
Modified Files:
src/sys/rump/kern/lib/libcrypto: Makefile
Log Message:
Missed a spot in the crypto/arc4 deletion.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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.5 src/sys/rump/kern/lib/libcrypto/Makefile:1.6
--- src/sys/rump/kern/lib/libcrypto/Makefile:1.5 Mon Sep 2 20:09:30 2019
+++ src/sys/rump/kern/lib/libcrypto/Makefile Thu Dec 5 03:57:55 2019
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2019/09/02 20:09:30 riastradh Exp $
+# $NetBSD: Makefile,v 1.6 2019/12/05 03:57:55 riastradh Exp $
#
-.PATH: ${.CURDIR}/../../../../crypto/arc4\
- ${.CURDIR}/../../../../crypto/blowfish\
+.PATH: ${.CURDIR}/../../../../crypto/blowfish\
${.CURDIR}/../../../../crypto/camellia\
${.CURDIR}/../../../../crypto/cast128\
${.CURDIR}/../../../../crypto/des\
@@ -12,9 +11,6 @@
LIB= rumpkern_crypto
COMMENT=Cryptographic routines
-# arc4
-SRCS+= arc4.c
-
# blowfish
SRCS+= bf_ecb.c bf_enc.c bf_cbc.c bf_skey.c bf_module.c
CVS commit: src/sys/rump/kern/lib/libcrypto
Module Name:src
Committed By: pgoyette
Date: Tue Jan 14 17:05:50 UTC 2014
Modified Files:
src/sys/rump/kern/lib/libcrypto: Makefile
Log Message:
Add the MODULE parts for blowfish and des.
Add camellia algorithm. (pooka@ says no lib version change required)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 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.1 src/sys/rump/kern/lib/libcrypto/Makefile:1.2
--- src/sys/rump/kern/lib/libcrypto/Makefile:1.1 Sun Dec 5 20:11:22 2010
+++ src/sys/rump/kern/lib/libcrypto/Makefile Tue Jan 14 17:05:50 2014
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2010/12/05 20:11:22 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/01/14 17:05:50 pgoyette Exp $
#
.PATH: ${.CURDIR}/../../../../crypto/arc4\
${.CURDIR}/../../../../crypto/blowfish\
+ ${.CURDIR}/../../../../crypto/camellia\
${.CURDIR}/../../../../crypto/cast128\
${.CURDIR}/../../../../crypto/des\
${.CURDIR}/../../../../crypto/rijndael\
@@ -14,13 +15,16 @@ LIB= rumpkern_crypto
SRCS+= arc4.c
# blowfish
-SRCS+= bf_ecb.c bf_enc.c bf_cbc.c bf_skey.c
+SRCS+= bf_ecb.c bf_enc.c bf_cbc.c bf_skey.c bf_module.c
+
+# camellia
+SRCS+= camellia.c camellia-api.c
# cast128
SRCS+= cast128.c
# DES
-SRCS+= des_ecb.c des_setkey.c des_enc.c des_cbc.c
+SRCS+= des_ecb.c des_setkey.c des_enc.c des_cbc.c des_module.c
# rijndael
SRCS+= rijndael-alg-fst.c rijndael-api-fst.c rijndael.c
