Module Name: src
Committed By: rin
Date: Wed Apr 22 09:15:40 UTC 2020
Modified Files:
src/sys/arch/i386/conf: files.i386
src/sys/arch/x86/conf: files.x86
src/sys/conf: files
src/sys/crypto/rijndael: files.rijndael
src/sys/dev/marvell: files.armada
src/sys/netipsec: files.netipsec
src/sys/opencrypto: files.opencrypto
Log Message:
Make crypto/rijindael optional again as cprng_strong does no longer
depend on it. Dependency is explicitly declared in files.foo if a
component requires it.
To generate a diff of this commit:
cvs rdiff -u -r1.401 -r1.402 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/x86/conf/files.x86
cvs rdiff -u -r1.1265 -r1.1266 src/sys/conf/files
cvs rdiff -u -r1.6 -r1.7 src/sys/crypto/rijndael/files.rijndael
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/marvell/files.armada
cvs rdiff -u -r1.13 -r1.14 src/sys/netipsec/files.netipsec
cvs rdiff -u -r1.28 -r1.29 src/sys/opencrypto/files.opencrypto
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/files.i386
diff -u src/sys/arch/i386/conf/files.i386:1.401 src/sys/arch/i386/conf/files.i386:1.402
--- src/sys/arch/i386/conf/files.i386:1.401 Fri Oct 18 01:38:28 2019
+++ src/sys/arch/i386/conf/files.i386 Wed Apr 22 09:15:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.i386,v 1.401 2019/10/18 01:38:28 manu Exp $
+# $NetBSD: files.i386,v 1.402 2020/04/22 09:15:39 rin Exp $
#
# new style config file for i386 architecture
#
@@ -418,7 +418,7 @@ obsolete defparam opt_vesafb.h VESAFB_WI
obsolete defflag opt_vesafb.h VESAFB_PM
# AMD Geode LX Security Block
-device glxsb: opencrypto
+device glxsb: opencrypto, rijndael
attach glxsb at pci
file arch/i386/pci/glxsb.c glxsb
Index: src/sys/arch/x86/conf/files.x86
diff -u src/sys/arch/x86/conf/files.x86:1.108 src/sys/arch/x86/conf/files.x86:1.109
--- src/sys/arch/x86/conf/files.x86:1.108 Tue Apr 21 02:56:36 2020
+++ src/sys/arch/x86/conf/files.x86 Wed Apr 22 09:15:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.x86,v 1.108 2020/04/21 02:56:36 msaitoh Exp $
+# $NetBSD: files.x86,v 1.109 2020/04/22 09:15:40 rin Exp $
# options for MP configuration through the MP spec
defflag opt_mpbios.h MPBIOS MPDEBUG MPBIOS_SCANPCI
@@ -59,7 +59,7 @@ device odcm
attach odcm at cpufeaturebus
file arch/x86/x86/odcm.c odcm
-device padlock: opencrypto
+device padlock: opencrypto, rijndael
attach padlock at cpufeaturebus
file arch/x86/x86/via_padlock.c padlock
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1265 src/sys/conf/files:1.1266
--- src/sys/conf/files:1.1265 Wed Apr 15 17:16:22 2020
+++ src/sys/conf/files Wed Apr 22 09:15:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1265 2020/04/15 17:16:22 maxv Exp $
+# $NetBSD: files,v 1.1266 2020/04/22 09:15:40 rin Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -452,7 +452,7 @@ define arcnet
define ether
define ieee1394
define sppp
-define wlan
+define wlan: rijndael
define crypto
# TPM
@@ -1394,7 +1394,7 @@ file dev/ic/amdccp.c amdccp
defpseudodev vnd: disk
defflag opt_vnd.h VND_COMPRESSION
defpseudo ccd: disk
-defpseudodev cgd: disk, des, blowfish, cast128
+defpseudodev cgd: disk, des, blowfish, cast128, rijndael
defpseudodev md: disk
defpseudodev fss: disk
Index: src/sys/crypto/rijndael/files.rijndael
diff -u src/sys/crypto/rijndael/files.rijndael:1.6 src/sys/crypto/rijndael/files.rijndael:1.7
--- src/sys/crypto/rijndael/files.rijndael:1.6 Sat Nov 19 22:51:22 2011
+++ src/sys/crypto/rijndael/files.rijndael Wed Apr 22 09:15:40 2020
@@ -1,5 +1,7 @@
-# $NetBSD: files.rijndael,v 1.6 2011/11/19 22:51:22 tls Exp $
+# $NetBSD: files.rijndael,v 1.7 2020/04/22 09:15:40 rin Exp $
-file crypto/rijndael/rijndael-alg-fst.c
-file crypto/rijndael/rijndael-api-fst.c
-file crypto/rijndael/rijndael.c
+define rijndael
+
+file crypto/rijndael/rijndael-alg-fst.c rijndael
+file crypto/rijndael/rijndael-api-fst.c rijndael
+file crypto/rijndael/rijndael.c rijndael
Index: src/sys/dev/marvell/files.armada
diff -u src/sys/dev/marvell/files.armada:1.4 src/sys/dev/marvell/files.armada:1.5
--- src/sys/dev/marvell/files.armada:1.4 Tue Oct 1 17:35:09 2019
+++ src/sys/dev/marvell/files.armada Wed Apr 22 09:15:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.armada,v 1.4 2019/10/01 17:35:09 chs Exp $
+# $NetBSD: files.armada,v 1.5 2020/04/22 09:15:40 rin Exp $
# Configuration info for Marvell ARMADA integrated peripherals
# ARMADA XP Buffer Manger
@@ -10,5 +10,5 @@ device mvxpe: mvxpbm, ether, ifnet, arp,
file dev/marvell/if_mvxpe.c mvxpe needs-flag
# ARMADA XP Cryptographic Engines and Security Accelerator
-device mvxpsec: opencrypto
+device mvxpsec: opencrypto, rijndael
file dev/marvell/mvxpsec.c mvxpsec needs-flag
Index: src/sys/netipsec/files.netipsec
diff -u src/sys/netipsec/files.netipsec:1.13 src/sys/netipsec/files.netipsec:1.14
--- src/sys/netipsec/files.netipsec:1.13 Wed Jan 10 10:56:30 2018
+++ src/sys/netipsec/files.netipsec Wed Apr 22 09:15:40 2020
@@ -1,7 +1,7 @@
-# $Id: files.netipsec,v 1.13 2018/01/10 10:56:30 knakahara Exp $
+# $Id: files.netipsec,v 1.14 2020/04/22 09:15:40 rin Exp $
#
#
-defflag opt_ipsec.h IPSEC: opencrypto
+defflag opt_ipsec.h IPSEC: opencrypto, rijndael
defflag opt_ipsec.h IPSEC_DEBUG
defflag opt_ipsec.h IPSEC_TX_TOS_CLEAR
Index: src/sys/opencrypto/files.opencrypto
diff -u src/sys/opencrypto/files.opencrypto:1.28 src/sys/opencrypto/files.opencrypto:1.29
--- src/sys/opencrypto/files.opencrypto:1.28 Mon Jan 27 17:09:17 2020
+++ src/sys/opencrypto/files.opencrypto Wed Apr 22 09:15:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.opencrypto,v 1.28 2020/01/27 17:09:17 pgoyette Exp $
+# $NetBSD: files.opencrypto,v 1.29 2020/04/22 09:15:40 rin Exp $
#
#
@@ -7,7 +7,7 @@
# that use the opencrypto framework, should list opencrypto as a dependency
# to pull in the framework.
-define opencrypto
+define opencrypto: rijndael
file opencrypto/criov.c opencrypto
file opencrypto/xform.c opencrypto
file opencrypto/crypto.c opencrypto
