[src/trunk]: src/sys/opencrypto Make crypto/rijindael optional again as cprng...

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e6062b1b3ddc
branches:  trunk
changeset: 971344:e6062b1b3ddc
user:      rin <rin%NetBSD.org@localhost>
date:      Wed Apr 22 09:15:39 2020 +0000

description:
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.

diffstat:

 sys/arch/i386/conf/files.i386      |   4 ++--
 sys/arch/x86/conf/files.x86        |   4 ++--
 sys/conf/files                     |   6 +++---
 sys/crypto/rijndael/files.rijndael |  10 ++++++----
 sys/dev/marvell/files.armada       |   4 ++--
 sys/netipsec/files.netipsec        |   4 ++--
 sys/opencrypto/files.opencrypto    |   4 ++--
 7 files changed, 19 insertions(+), 17 deletions(-)

diffs (125 lines):

diff -r 6a119b31e4ef -r e6062b1b3ddc sys/arch/i386/conf/files.i386
--- a/sys/arch/i386/conf/files.i386     Wed Apr 22 08:48:12 2020 +0000
+++ b/sys/arch/i386/conf/files.i386     Wed Apr 22 09:15:39 2020 +0000
@@ -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       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 -r 6a119b31e4ef -r e6062b1b3ddc sys/arch/x86/conf/files.x86
--- a/sys/arch/x86/conf/files.x86       Wed Apr 22 08:48:12 2020 +0000
+++ b/sys/arch/x86/conf/files.x86       Wed Apr 22 09:15:39 2020 +0000
@@ -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 @@
 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 -r 6a119b31e4ef -r e6062b1b3ddc sys/conf/files
--- a/sys/conf/files    Wed Apr 22 08:48:12 2020 +0000
+++ b/sys/conf/files    Wed Apr 22 09:15:39 2020 +0000
@@ -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 ether
 define ieee1394
 define sppp
-define wlan
+define wlan: rijndael
 define crypto
 
 # TPM
@@ -1394,7 +1394,7 @@
 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 -r 6a119b31e4ef -r e6062b1b3ddc sys/crypto/rijndael/files.rijndael
--- a/sys/crypto/rijndael/files.rijndael        Wed Apr 22 08:48:12 2020 +0000
+++ b/sys/crypto/rijndael/files.rijndael        Wed Apr 22 09:15:39 2020 +0000
@@ -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 $
+
+define rijndael
 
-file   crypto/rijndael/rijndael-alg-fst.c
-file   crypto/rijndael/rijndael-api-fst.c
-file   crypto/rijndael/rijndael.c      
+file   crypto/rijndael/rijndael-alg-fst.c      rijndael
+file   crypto/rijndael/rijndael-api-fst.c      rijndael
+file   crypto/rijndael/rijndael.c              rijndael
diff -r 6a119b31e4ef -r e6062b1b3ddc sys/dev/marvell/files.armada
--- a/sys/dev/marvell/files.armada      Wed Apr 22 08:48:12 2020 +0000
+++ b/sys/dev/marvell/files.armada      Wed Apr 22 09:15:39 2020 +0000
@@ -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 @@
 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 -r 6a119b31e4ef -r e6062b1b3ddc sys/netipsec/files.netipsec
--- a/sys/netipsec/files.netipsec       Wed Apr 22 08:48:12 2020 +0000
+++ b/sys/netipsec/files.netipsec       Wed Apr 22 09:15:39 2020 +0000
@@ -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 -r 6a119b31e4ef -r e6062b1b3ddc sys/opencrypto/files.opencrypto
--- a/sys/opencrypto/files.opencrypto   Wed Apr 22 08:48:12 2020 +0000
+++ b/sys/opencrypto/files.opencrypto   Wed Apr 22 09:15:39 2020 +0000
@@ -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