unlink crypto(4) pseudo device from the architecture dependant character

device tables and kernel config files.  ok deraadt

18 files changed, 31 insertions, 59 deletions

diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 83cea34498a..60ace4765f8 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.74 2013/11/04 17:14:26 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.75 2014/08/20 06:14:42 mikeb Exp $	*/
 /*	$NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $	*/
 
 /*-
@@ -40,8 +40,6 @@
 #include <sys/conf.h>
 #include <sys/vnode.h>
 
-#include "inet.h"
-
 #include "wd.h"
 bdev_decl(wd);
 #include "fd.h"
@@ -192,7 +190,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),
 	cdev_ptm_init(NPTY,ptm),	/* 55: pseudo-tty ptm device */
 	cdev_hotplug_init(NHOTPLUG,hotplug), /* 56: devices hot plugging */
-	cdev_crypto_init(NCRYPTO,crypto), /* 57: /dev/crypto */
+	cdev_notdef(),			/* 57: was: /dev/crypto */
 	cdev_bktr_init(NBKTR,bktr),	/* 58: Bt848 video capture device */
 	cdev_radio_init(NRADIO,radio), /* 59: generic radio I/O */
 	cdev_mouse_init(NWSMUX, wsmux),	/* 60: ws multiplexor */
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 7b0c7900d61..da2ab11da65 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.246 2014/08/15 14:06:47 mikeb Exp $
+#	$OpenBSD: GENERIC,v 1.247 2014/08/20 06:14:42 mikeb Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -424,6 +424,5 @@ owsbm*	at onewire?			# Smart Battery Monitor
 owtemp* at onewire?			# Temperature
 owctr*	at onewire?			# Counter device
 
-pseudo-device	crypto		1
 pseudo-device	hotplug		1	# devices hot plugging
 pseudo-device	wsmux		2	# mouse & keyboard multiplexor
diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c
index 59d4c9b0bdc..29e1834bf67 100644
--- a/sys/arch/amd64/amd64/conf.c
+++ b/sys/arch/amd64/amd64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.45 2014/03/14 23:42:40 kettenis Exp $	*/
+/*	$OpenBSD: conf.c,v 1.46 2014/08/20 06:14:42 mikeb Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -40,8 +40,6 @@
 
 #include <machine/conf.h>
 
-#include "inet.h"
-
 #include "wd.h"
 bdev_decl(wd);
 #include "fdc.h"
@@ -256,7 +254,7 @@ struct cdevsw	cdevsw[] =
 	cdev_mouse_init(NWSMOUSE,	/* 68: mice */
 	    wsmouse),
 	cdev_mouse_init(NWSMUX, wsmux),	/* 69: ws multiplexor */
-	cdev_crypto_init(NCRYPTO,crypto), /* 70: /dev/crypto */
+	cdev_notdef(),			/* 70: was: /dev/crypto */
 	cdev_tty_init(NCZ,cztty),	/* 71: Cyclades-Z serial port */
 #ifdef USER_PCICONF
 	cdev_pci_init(NPCI,pci),        /* 72: PCI user */
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 8683a826a1e..af14ffd8ca0 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.374 2014/08/15 14:06:48 mikeb Exp $
+#	$OpenBSD: GENERIC,v 1.375 2014/08/20 06:14:42 mikeb Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -600,7 +600,6 @@ pseudo-device	hotplug		1	# devices hot plugging
 
 # mouse & keyboard multiplexor pseudo-devices
 pseudo-device	wsmux		2
-pseudo-device	crypto		1
 
 # Virtio devices
 virtio*		at pci?		# Virtio PCI device
diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index d38188559e5..2ead3b7001f 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.37 2013/11/04 14:11:29 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.38 2014/08/20 06:14:42 mikeb Exp $	*/
 /*	$NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $	*/
 
 /*
@@ -55,8 +55,6 @@
 
 #include <machine/conf.h>
 
-#include "inet.h"
-
 /*
  * From this point, these need to be MI foo.h files.
  */
@@ -323,7 +321,7 @@ struct cdevsw cdevsw[] = {
 	cdev_lkm_dummy(),			/* 44: reserved */
 	cdev_lkm_dummy(),			/* 45: reserved */
 	cdev_pf_init(NPF,pf),           	/* 46: packet filter */
-	cdev_crypto_init(NCRYPTO,crypto), 	/* 47: /dev/crypto */
+	cdev_notdef(),				/* 47: was: /dev/crypto */
 	cdev_lkm_dummy(),			/* 48: reserved */
 	cdev_lkm_dummy(),			/* 49: reserved */
 	cdev_systrace_init(NSYSTRACE,systrace),	/* 50: system call tracing */
diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC
index e72ff41127c..ca64d18b794 100644
--- a/sys/arch/armish/conf/GENERIC
+++ b/sys/arch/armish/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.54 2014/07/12 21:56:56 tedu Exp $ 
+# $OpenBSD: GENERIC,v 1.55 2014/08/20 06:14:42 mikeb Exp $ 
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -197,5 +197,4 @@ owctr*	at onewire?		# Counter device
 
 # mouse & keyboard multiplexor pseudo-devices
 pseudo-device	wsmux		2
-pseudo-device	crypto		1
 pseudo-device	hotplug		1	# devices hot plugging
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index 81da77ab72a..18f2ab8357a 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.58 2013/11/04 14:11:29 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.59 2014/08/20 06:14:42 mikeb Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -87,7 +87,6 @@ int	nblkdev = nitems(bdevsw);
 #include "wsmouse.h"
 #include "wsmux.h"
 
-#include "inet.h"
 #include "bpfilter.h"
 #include "tun.h"
 
@@ -163,7 +162,7 @@ struct cdevsw   cdevsw[] =
 	cdev_video_init(NVIDEO,video),	/* 33: generic video I/O */
 	cdev_systrace_init(NSYSTRACE,systrace),	/* 34: system call tracing */
 	cdev_audio_init(NAUDIO,audio),	/* 35: /dev/audio */
-	cdev_crypto_init(NCRYPTO,crypto), /* 36: /dev/crypto */
+	cdev_notdef(),			/* 36: was: /dev/crypto */
 	cdev_bio_init(NBIO,bio),	/* 37: ioctl tunnel */
 	cdev_ptm_init(NPTY,ptm),	/* 38: pseudo-tty ptm device */
 	cdev_disk_init(NWD,wd),		/* 39: ST506 disk */
diff --git a/sys/arch/hppa64/hppa64/conf.c b/sys/arch/hppa64/hppa64/conf.c
index 17034f8fb23..06109608154 100644
--- a/sys/arch/hppa64/hppa64/conf.c
+++ b/sys/arch/hppa64/hppa64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.25 2013/11/04 14:11:29 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.26 2014/08/20 06:14:42 mikeb Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -87,7 +87,6 @@ int	nblkdev = nitems(bdevsw);
 #include "wsmouse.h"
 #include "wsmux.h"
 
-#include "inet.h"
 #include "bpfilter.h"
 #include "tun.h"
 
@@ -163,7 +162,7 @@ struct cdevsw   cdevsw[] =
 	cdev_video_init(NVIDEO,video),	/* 33: generic video I/O */
 	cdev_systrace_init(NSYSTRACE,systrace),	/* 34: system call tracing */
 	cdev_audio_init(NAUDIO,audio),	/* 35: /dev/audio */
-	cdev_crypto_init(NCRYPTO,crypto), /* 36: /dev/crypto */
+	cdev_notdef(),			/* 36: was: /dev/crypto */
 	cdev_bio_init(NBIO,bio),	/* 37: ioctl tunnel */
 	cdev_ptm_init(NPTY,ptm),	/* 38: pseudo-tty ptm device */
 	cdev_disk_init(NWD,wd),		/* 39: ST506 disk */
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 802adfd1a81..bf1b228af03 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.783 2014/08/15 14:06:48 mikeb Exp $
+#	$OpenBSD: GENERIC,v 1.784 2014/08/20 06:14:42 mikeb Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -784,7 +784,6 @@ pseudo-device	hotplug		1	# devices hot plugging
 
 # mouse & keyboard multiplexor pseudo-devices
 pseudo-device	wsmux		2
-pseudo-device	crypto		1
 
 # Virtio devices
 virtio*		at pci? 	# Virtio PCI device
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index a0e406e2637..6ea85163cb3 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.146 2014/03/14 23:42:40 kettenis Exp $	*/
+/*	$OpenBSD: conf.c,v 1.147 2014/08/20 06:14:42 mikeb Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -41,8 +41,6 @@
 
 #include <machine/conf.h>
 
-#include "inet.h"
-
 #include "wd.h"
 bdev_decl(wd);
 #include "fdc.h"
@@ -260,7 +258,7 @@ struct cdevsw	cdevsw[] =
 	cdev_mouse_init(NWSMOUSE,	/* 68: mice */
 	    wsmouse),
 	cdev_mouse_init(NWSMUX, wsmux),	/* 69: ws multiplexor */
-	cdev_crypto_init(NCRYPTO,crypto), /* 70: /dev/crypto */
+	cdev_notdef(),			/* 70: was: /dev/crypto */
 	cdev_tty_init(NCZ,cztty),	/* 71: Cyclades-Z serial port */
 #ifdef USER_PCICONF
 	cdev_pci_init(NPCI,pci),        /* 72: PCI user */
diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c
index fbc3336acf9..0c90e900b24 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.27 2013/11/04 14:11:29 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.28 2014/08/20 06:14:42 mikeb Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -54,8 +54,6 @@
 
 #include <machine/conf.h>
 
-#include "inet.h"
-
 /*
  * From this point, these need to be MI foo.h files.
  */
@@ -299,7 +297,7 @@ struct cdevsw cdevsw[] = {
 	cdev_lkm_dummy(),			/* 44: reserved */
 	cdev_lkm_dummy(),			/* 45: reserved */
 	cdev_pf_init(NPF,pf),           	/* 46: packet filter */
-	cdev_crypto_init(NCRYPTO,crypto), 	/* 47: /dev/crypto */
+	cdev_notdef(),				/* 47: was /dev/crypto */
 	cdev_lkm_dummy(),			/* 48: reserved */
 	cdev_lkm_dummy(),			/* 49: reserved */
 	cdev_systrace_init(NSYSTRACE,systrace),	/* 50: system call tracing */
diff --git a/sys/arch/loongson/loongson/conf.c b/sys/arch/loongson/loongson/conf.c
index 2873d877ebd..0316535c9a5 100644
--- a/sys/arch/loongson/loongson/conf.c
+++ b/sys/arch/loongson/loongson/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.17 2013/11/04 14:11:29 deraadt Exp $ */
+/*	$OpenBSD: conf.c,v 1.18 2014/08/20 06:14:42 mikeb Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -114,8 +114,6 @@ cdev_decl(wd);
 #include "pci.h"
 cdev_decl(pci);
 
-#include "inet.h"
-
 #include "pf.h"
 #include "systrace.h"
 
@@ -183,7 +181,7 @@ struct cdevsw	cdevsw[] =
 	cdev_audio_init(NAUDIO,audio),	/* 44: /dev/audio */
 	cdev_video_init(NVIDEO,video),	/* 45: generic video I/O */
 	cdev_notdef(),			/* 46: */
-	cdev_crypto_init(NCRYPTO,crypto),	/* 47: /dev/crypto */
+	cdev_notdef(),			/* 47: was: /dev/crypto */
 	cdev_notdef(),			/* 48: */
 	cdev_bio_init(NBIO,bio),	/* 49: ioctl tunnel */
 	cdev_systrace_init(NSYSTRACE,systrace),	/* 50: system call tracing */
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index e59201bb2b7..56e5ae137a0 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.58 2014/03/16 17:46:22 kettenis Exp $ */
+/*	$OpenBSD: conf.c,v 1.59 2014/08/20 06:14:42 mikeb Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -107,8 +107,6 @@ cdev_decl(com);
 #include "urio.h"
 #include "ucom.h"
 
-#include "inet.h"
-
 #include "apm.h"
 #include "drm.h"
 cdev_decl(drm);
@@ -185,7 +183,7 @@ struct cdevsw cdevsw[] = {
 	cdev_audio_init(NAUDIO,audio),	/* 44: generic audio I/O */
 	cdev_video_init(NVIDEO,video),	/* 45: generic video I/O */
 	cdev_notdef(),			/* 46 */
-	cdev_crypto_init(NCRYPTO,crypto), /* 47: /dev/crypto */
+	cdev_notdef(),			/* 47: was: /dev/crypto */
 	cdev_notdef(),			/* 48 */
 	cdev_notdef(),			/* 49 */
 	cdev_systrace_init(NSYSTRACE,systrace),	/* 50 system call tracing */
diff --git a/sys/arch/octeon/octeon/conf.c b/sys/arch/octeon/octeon/conf.c
index bde1c74b80e..d7adbdca215 100644
--- a/sys/arch/octeon/octeon/conf.c
+++ b/sys/arch/octeon/octeon/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.11 2013/11/04 14:11:29 deraadt Exp $ */
+/*	$OpenBSD: conf.c,v 1.12 2014/08/20 06:14:42 mikeb Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -121,8 +121,6 @@ cdev_decl(octcf);
 #include "pci.h"
 cdev_decl(pci);
 
-#include "inet.h"
-
 #include "pf.h"
 #include "systrace.h"
 
@@ -194,7 +192,7 @@ struct cdevsw	cdevsw[] =
 	cdev_audio_init(NAUDIO,audio),	/* 44: /dev/audio */
 	cdev_video_init(NVIDEO,video),	/* 45: generic video I/O */
 	cdev_notdef(),			/* 46: */
-	cdev_crypto_init(NCRYPTO,crypto),	/* 47: /dev/crypto */
+	cdev_notdef(),			/* 47: was: /dev/crypto */
 	cdev_notdef(),			/* 48: */
 	cdev_bio_init(NBIO,bio),	/* 49: ioctl tunnel */
 	cdev_systrace_init(NSYSTRACE,systrace),	/* 50: system call tracing */
diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c
index 43fd25c24c6..007c067e322 100644
--- a/sys/arch/sgi/sgi/conf.c
+++ b/sys/arch/sgi/sgi/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.33 2013/08/20 14:27:30 ajacoutot Exp $ */
+/*	$OpenBSD: conf.c,v 1.34 2014/08/20 06:14:42 mikeb Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -115,8 +115,6 @@ cdev_decl(wd);
 #include "pci.h"
 cdev_decl(pci);
 
-#include "inet.h"
-
 #include "pf.h"
 #include "systrace.h"
 
@@ -184,7 +182,7 @@ struct cdevsw	cdevsw[] =
 	cdev_audio_init(NAUDIO,audio),	/* 44: /dev/audio */
 	cdev_video_init(NVIDEO,video),	/* 45: generic video I/O */
 	cdev_notdef(),			/* 46: */
-	cdev_crypto_init(NCRYPTO,crypto),	/* 47: /dev/crypto */
+	cdev_notdef(),			/* 47: was: /dev/crypto */
 	cdev_notdef(),			/* 48: */
 	cdev_bio_init(NBIO,bio),	/* 49: ioctl tunnel */
 	cdev_systrace_init(NSYSTRACE,systrace),	/* 50: system call tracing */
diff --git a/sys/arch/socppc/conf/GENERIC b/sys/arch/socppc/conf/GENERIC
index 7f727ca1238..9baf0320270 100644
--- a/sys/arch/socppc/conf/GENERIC
+++ b/sys/arch/socppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.27 2014/04/07 22:20:43 andre Exp $
+#	$OpenBSD: GENERIC,v 1.28 2014/08/20 06:14:42 mikeb Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -109,6 +109,5 @@ ukphy*		at mii?		# Generic unknown PHY
 athn*		at pci?		# Atheros AR9k (802.11a/g/n)
 hifn*		at pci?		# Hi/fn 7751 crypto card
 
-pseudo-device	crypto		1	# hardware crypto access
 pseudo-device	hotplug		1	# devices hot plugging
 pseudo-device	wsmux		2	# mouse & keyboard multiplexor
diff --git a/sys/arch/socppc/socppc/conf.c b/sys/arch/socppc/socppc/conf.c
index 5a45ee47f69..046c48a4997 100644
--- a/sys/arch/socppc/socppc/conf.c
+++ b/sys/arch/socppc/socppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.19 2013/11/04 14:11:29 deraadt Exp $ */
+/*	$OpenBSD: conf.c,v 1.20 2014/08/20 06:14:43 mikeb Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -87,8 +87,6 @@ cdev_decl(com);
 
 #include "tun.h"
 
-#include "inet.h"
-
 #include "wsmux.h"
 
 #ifdef USER_PCICONF
@@ -167,7 +165,7 @@ struct cdevsw cdevsw[] = {
 	cdev_video_init(NVIDEO,video),	/* 44: generic video I/O */
 	cdev_notdef(),			/* 45 */
 	cdev_notdef(),			/* 46 */
-	cdev_crypto_init(NCRYPTO,crypto), /* 47: /dev/crypto */
+	cdev_notdef(),			/* 47: was: /dev/crypto */
 	cdev_notdef(),			/* 48 */
 	cdev_notdef(),			/* 49 */
 	cdev_systrace_init(NSYSTRACE,systrace),	/* 50 system call tracing */
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index f30a98bb5a5..8ec96d450b3 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.70 2013/11/04 14:11:29 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.71 2014/08/20 06:14:43 mikeb Exp $	*/
 /*	$NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
 
 /*
@@ -111,7 +111,6 @@ cdev_decl(pci);
 #include "pf.h"
 
 #include "ksyms.h"
-#include "inet.h"
 
 #include "systrace.h"
 #include "hotplug.h"
@@ -231,7 +230,7 @@ struct cdevsw	cdevsw[] =
 	cdev_gen_init(NMBPP,mbpp),	/* 72: magma parallel ports */
 	cdev_pf_init(NPF,pf),		/* 73: packet filter */
 	cdev_notdef(),			/* 74: ALTQ (deprecated) */
-	cdev_crypto_init(NCRYPTO,crypto), /* 75: /dev/crypto */
+	cdev_notdef(),			/* 75: was: /dev/crypto */
 	cdev_ksyms_init(NKSYMS,ksyms),	/* 76 *: Kernel symbols device */
 	cdev_tty_init(NSABTTY,sabtty),	/* 77: sab82532 serial ports */
 	cdev_wsdisplay_init(NWSDISPLAY,	/* 78: frame buffers, etc. */