summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrin <rin@NetBSD.org>2020-04-22 09:15:39 +0000
committerrin <rin@NetBSD.org>2020-04-22 09:15:39 +0000
commit4622ebbff687040f697bd306e5855b809f527a87 (patch)
tree3e58b85a6fe94f0e2af4c43b0f1a5c2514e2310a
parent266f0d75f91c6b0222057e7285fd73606b0b80a7 (diff)
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.
-rw-r--r--sys/arch/i386/conf/files.i3864
-rw-r--r--sys/arch/x86/conf/files.x864
-rw-r--r--sys/conf/files6
-rw-r--r--sys/crypto/rijndael/files.rijndael10
-rw-r--r--sys/dev/marvell/files.armada4
-rw-r--r--sys/netipsec/files.netipsec4
-rw-r--r--sys/opencrypto/files.opencrypto4
7 files changed, 19 insertions, 17 deletions
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 22eb6de348b..4f15eaba712 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -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_WIDTH VESAFB_HEIGHT VESAFB_DEPTH
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
diff --git a/sys/arch/x86/conf/files.x86 b/sys/arch/x86/conf/files.x86
index 947e47c5ff1..6bfd39fde8b 100644
--- a/sys/arch/x86/conf/files.x86
+++ b/sys/arch/x86/conf/files.x86
@@ -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
diff --git a/sys/conf/files b/sys/conf/files
index 719053435da..73042600e5d 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -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
diff --git a/sys/crypto/rijndael/files.rijndael b/sys/crypto/rijndael/files.rijndael
index 8ffbae8e2f3..6f232d14d3d 100644
--- a/sys/crypto/rijndael/files.rijndael
+++ b/sys/crypto/rijndael/files.rijndael
@@ -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
diff --git a/sys/dev/marvell/files.armada b/sys/dev/marvell/files.armada
index b8fca57a57e..35526d629ee 100644
--- a/sys/dev/marvell/files.armada
+++ b/sys/dev/marvell/files.armada
@@ -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, mii
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
diff --git a/sys/netipsec/files.netipsec b/sys/netipsec/files.netipsec
index c49a3750973..58b361ed5bf 100644
--- a/sys/netipsec/files.netipsec
+++ b/sys/netipsec/files.netipsec
@@ -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
diff --git a/sys/opencrypto/files.opencrypto b/sys/opencrypto/files.opencrypto
index 280e2cb9720..03f27a50710 100644
--- a/sys/opencrypto/files.opencrypto
+++ b/sys/opencrypto/files.opencrypto
@@ -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