From: mikeb <mikeb@openbsd.org>
Date: Wed, 20 Aug 2014 11:23:40 +0000 (+0000)
Subject: Remove userland bits related to the crypto(4) interface;  ok deraadt
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f44ef4d738c82143ac71b8de0fe275167309b706;p=openbsd

Remove userland bits related to the crypto(4) interface;  ok deraadt
---

diff --git a/etc/MAKEDEV.common b/etc/MAKEDEV.common
index bfcd943a1c5..ddbcd82a636 100644
--- a/etc/MAKEDEV.common
+++ b/etc/MAKEDEV.common
@@ -1,4 +1,4 @@
-vers(a, {-$OpenBSD: MAKEDEV.common,v 1.75 2014/07/15 17:36:13 miod Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.common,v 1.76 2014/08/20 11:23:40 mikeb Exp $-})dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -133,7 +133,6 @@ target(all, systrace)dnl
 target(all, pctr)dnl
 target(all, pctr0)dnl
 target(all, pf)dnl
-twrget(all, cry, crypto)dnl
 target(all, apm)dnl
 target(all, acpi)dnl
 twrget(all, tth, ttyh, 0, 1)dnl
@@ -448,8 +447,6 @@ _mkdev(fdesc, fd, {-RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"-})dnl
 __devitem(oppr, openprom,PROM settings,openprom)dnl
 _cdev(oppr, openprom, 70, 0)dnl
-__devitem(cry, crypto, Hardware crypto access driver,crypto)dnl
-_mkdev(cry, crypto, {-M crypto c major_cry_c-} 0)dnl
 __devitem(pf, pf*, Packet Filter)dnl
 _mkdev(pf, {-pf*-}, {-M pf c major_pf_c 0 600-})dnl
 __devitem(bpf, bpf*, Berkeley Packet Filter)dnl
diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index 2dd98599460..050aa4e3e73 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -70,7 +70,6 @@
 #	bio	ioctl tunnel pseudo-device
 #	bktr*	Video frame grabbers
 #	bpf*	Berkeley Packet Filter
-#	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
@@ -326,10 +325,6 @@ diskmap)
 	M diskmap c 63 0 640 operator
 	;;
 
-crypto)
-	M crypto c 57 0
-	;;
-
 bpf*)
 	M bpf$U c 11 $U 600
 	;;
@@ -541,7 +536,7 @@ all)
 	R video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm
 	R tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09
 	R tty0a tty0b ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7
-	R ttyB0 ttyB1 ttyB2 ttyB3 ttyB4 ttyB5 crypto pf systrace wd0
+	R ttyB0 ttyB1 ttyB2 ttyB3 ttyB4 ttyB5 pf systrace wd0
 	R wd1 wd2 wd3 std st0 st1 fd
 	;;
 
diff --git a/etc/etc.amd64/MAKEDEV b/etc/etc.amd64/MAKEDEV
index 2971021e3f2..4a0d05ca1e4 100644
--- a/etc/etc.amd64/MAKEDEV
+++ b/etc/etc.amd64/MAKEDEV
@@ -70,7 +70,6 @@
 #	bio	ioctl tunnel pseudo-device
 #	bktr*	Video frame grabbers
 #	bpf*	Berkeley Packet Filter
-#	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	drm*	Direct Rendering Manager
 #	fd	fd/* nodes
@@ -346,10 +345,6 @@ diskmap)
 	M diskmap c 90 0 640 operator
 	;;
 
-crypto)
-	M crypto c 70 0
-	;;
-
 bpf*)
 	M bpf$U c 23 $U 600
 	;;
@@ -567,7 +562,7 @@ all)
 	R video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00
 	R tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a
 	R tty0b ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm
-	R crypto pf pctr systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R pf pctr systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.armish/MAKEDEV b/etc/etc.armish/MAKEDEV
index 7a3a21e847c..25fd4d4a31c 100644
--- a/etc/etc.armish/MAKEDEV
+++ b/etc/etc.armish/MAKEDEV
@@ -64,7 +64,6 @@
 #	bio	ioctl tunnel pseudo-device
 #	bktr*	Video frame grabbers
 #	bpf*	Berkeley Packet Filter
-#	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
@@ -304,10 +303,6 @@ diskmap)
 	M diskmap c 102 0 640 operator
 	;;
 
-crypto)
-	M crypto c 47 0
-	;;
-
 bpf*)
 	M bpf$U c 22 $U 600
 	;;
@@ -483,7 +478,7 @@ all)
 	R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
 	R rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0 random lkm
 	R tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09
-	R tty0a tty0b apm crypto pf systrace wd0 wd1 wd2 wd3 std st0
+	R tty0a tty0b apm pf systrace wd0 wd1 wd2 wd3 std st0
 	R st1 fd
 	;;
 
diff --git a/etc/etc.armv7/MAKEDEV b/etc/etc.armv7/MAKEDEV
index cf90e92958f..445b8153d7e 100644
--- a/etc/etc.armv7/MAKEDEV
+++ b/etc/etc.armv7/MAKEDEV
@@ -64,7 +64,6 @@
 #	bio	ioctl tunnel pseudo-device
 #	bktr*	Video frame grabbers
 #	bpf*	Berkeley Packet Filter
-#	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
@@ -309,10 +308,6 @@ diskmap)
 	M diskmap c 102 0 640 operator
 	;;
 
-crypto)
-	M crypto c 47 0
-	;;
-
 bpf*)
 	M bpf$U c 22 $U 600
 	;;
@@ -488,7 +483,7 @@ all)
 	R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0
 	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
 	R radio0 video0 video1 uk0 random lkm tty00 tty01 tty02 tty03
-	R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm crypto
+	R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm
 	R pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV
index 32bf1987811..bd35b3ef1d6 100644
--- a/etc/etc.hppa/MAKEDEV
+++ b/etc/etc.hppa/MAKEDEV
@@ -66,7 +66,6 @@
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
-#	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
@@ -292,10 +291,6 @@ diskmap)
 	M diskmap c 56 0 640 operator
 	;;
 
-crypto)
-	M crypto c 36 0
-	;;
-
 bpf*)
 	M bpf$U c 17 $U 600
 	;;
@@ -500,7 +495,7 @@ all)
 	R vscsi0 bio ch0 audio0 audio1 audio2 fuse pppx hotplug ptm
 	R local wscons pci0 pci1 pci2 pci3 uall video0 video1 uk0
 	R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02
-	R tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b crypto
+	R tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b
 	R pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
diff --git a/etc/etc.hppa64/MAKEDEV b/etc/etc.hppa64/MAKEDEV
index 0faa6b11950..8a515e7b5b9 100644
--- a/etc/etc.hppa64/MAKEDEV
+++ b/etc/etc.hppa64/MAKEDEV
@@ -66,7 +66,6 @@
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
-#	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
@@ -287,10 +286,6 @@ diskmap)
 	M diskmap c 56 0 640 operator
 	;;
 
-crypto)
-	M crypto c 36 0
-	;;
-
 bpf*)
 	M bpf$U c 17 $U 600
 	;;
@@ -495,7 +490,7 @@ all)
 	R vscsi0 ch0 audio0 audio1 audio2 fuse pppx ptm local wscons
 	R pci0 pci1 pci2 pci3 uall video0 video1 uk0 random lpa0 lpa1
 	R lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 tty04 tty05
-	R tty06 tty07 tty08 tty09 tty0a tty0b crypto pf systrace wd0
+	R tty06 tty07 tty08 tty09 tty0a tty0b pf systrace wd0
 	R wd1 wd2 wd3 std st0 st1 fd
 	;;
 
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 0b15760ee8c..124abf5ffbe 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -71,7 +71,6 @@
 #	bio	ioctl tunnel pseudo-device
 #	bktr*	Video frame grabbers
 #	bpf*	Berkeley Packet Filter
-#	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	drm*	Direct Rendering Manager
 #	fd	fd/* nodes
@@ -352,10 +351,6 @@ diskmap)
 	M diskmap c 91 0 640 operator
 	;;
 
-crypto)
-	M crypto c 70 0
-	;;
-
 bpf*)
 	M bpf$U c 23 $U 600
 	;;
@@ -577,7 +572,7 @@ all)
 	R video0 video1 uk0 random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1
 	R lpt2 lkm tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07
 	R tty08 tty09 tty0a tty0b ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5
-	R ttyc6 ttyc7 apm crypto pf pctr systrace wd0 wd1 wd2 wd3 std
+	R ttyc6 ttyc7 apm pf pctr systrace wd0 wd1 wd2 wd3 std
 	R st0 st1 fd
 	;;
 
diff --git a/etc/etc.landisk/MAKEDEV b/etc/etc.landisk/MAKEDEV
index 208506a9163..7371d239016 100644
--- a/etc/etc.landisk/MAKEDEV
+++ b/etc/etc.landisk/MAKEDEV
@@ -62,7 +62,6 @@
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
-#	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
@@ -297,10 +296,6 @@ diskmap)
 	M diskmap c 101 0 640 operator
 	;;
 
-crypto)
-	M crypto c 47 0
-	;;
-
 bpf*)
 	M bpf$U c 22 $U 600
 	;;
@@ -462,7 +457,7 @@ all)
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 ttya audio0
 	R audio1 audio2 fuse pppx hotplug ptm local wscons pci0 pci1
 	R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
-	R rmidi6 rmidi7 radio0 video0 video1 uk0 random lkm crypto pf
+	R rmidi6 rmidi7 radio0 video0 video1 uk0 random lkm pf
 	R systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
diff --git a/etc/etc.loongson/MAKEDEV b/etc/etc.loongson/MAKEDEV
index dbdb8ab36d8..1e72e4194e0 100644
--- a/etc/etc.loongson/MAKEDEV
+++ b/etc/etc.loongson/MAKEDEV
@@ -64,7 +64,6 @@
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
-#	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
@@ -278,10 +277,6 @@ diskmap)
 	M diskmap c 70 0 640 operator
 	;;
 
-crypto)
-	M crypto c 47 0
-	;;
-
 bpf*)
 	M bpf$U c 12 $U 600
 	;;
@@ -457,7 +452,7 @@ all)
 	R audio0 audio1 audio2 fuse pppx hotplug ptm local wscons pci0
 	R pci1 pci2 pci3 uall video0 video1 uk0 random tty00 tty01
 	R tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b
-	R apm crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R apm pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV
index f6a9da4df4f..4cc4c51ea07 100644
--- a/etc/etc.macppc/MAKEDEV
+++ b/etc/etc.macppc/MAKEDEV
@@ -67,7 +67,6 @@
 #	bio	ioctl tunnel pseudo-device
 #	bktr*	Video frame grabbers
 #	bpf*	Berkeley Packet Filter
-#	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	drm*	Direct Rendering Manager
 #	fd	fd/* nodes
@@ -315,10 +314,6 @@ diskmap)
 	M diskmap c 84 0 640 operator
 	;;
 
-crypto)
-	M crypto c 47 0
-	;;
-
 bpf*)
 	M bpf$U c 22 $U 600
 	;;
@@ -520,7 +515,7 @@ all)
 	R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
 	R rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0 random lkm
 	R tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09
-	R tty0a tty0b apm crypto pf systrace wd0 wd1 wd2 wd3 std st0
+	R tty0a tty0b apm pf systrace wd0 wd1 wd2 wd3 std st0
 	R st1 fd
 	;;
 
diff --git a/etc/etc.octeon/MAKEDEV b/etc/etc.octeon/MAKEDEV
index d5ad30f1df0..6d191850848 100644
--- a/etc/etc.octeon/MAKEDEV
+++ b/etc/etc.octeon/MAKEDEV
@@ -58,7 +58,6 @@
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
-#	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
@@ -272,10 +271,6 @@ diskmap)
 	M diskmap c 69 0 640 operator
 	;;
 
-crypto)
-	M crypto c 47 0
-	;;
-
 bpf*)
 	M bpf$U c 12 $U 600
 	;;
@@ -415,7 +410,7 @@ all)
 	R vscsi0 ch0 audio0 audio1 audio2 fuse pppx hotplug ptm local
 	R wscons pci0 pci1 pci2 pci3 video0 video1 uk0 random tty00
 	R tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a
-	R tty0b crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R tty0b pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 octcf*|wd*|sd*)
diff --git a/etc/etc.sgi/MAKEDEV b/etc/etc.sgi/MAKEDEV
index d1b7428e9a2..0fe640912f6 100644
--- a/etc/etc.sgi/MAKEDEV
+++ b/etc/etc.sgi/MAKEDEV
@@ -64,7 +64,6 @@
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
-#	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
@@ -278,10 +277,6 @@ diskmap)
 	M diskmap c 69 0 640 operator
 	;;
 
-crypto)
-	M crypto c 47 0
-	;;
-
 bpf*)
 	M bpf$U c 12 $U 600
 	;;
@@ -467,7 +462,7 @@ all)
 	R diskmap vscsi0 ch0 audio0 audio1 audio2 fuse pppx hotplug
 	R ptm local wscons pci0 pci1 pci2 pci3 uall video0 video1 uk0
 	R random tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08
-	R tty09 tty0a tty0b crypto pf systrace wd0 wd1 wd2 wd3 std st0
+	R tty09 tty0a tty0b pf systrace wd0 wd1 wd2 wd3 std st0
 	R st1 fd
 	;;
 
diff --git a/etc/etc.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV
index d997a350900..48d9b9411ca 100644
--- a/etc/etc.sparc64/MAKEDEV
+++ b/etc/etc.sparc64/MAKEDEV
@@ -77,7 +77,6 @@
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
-#	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	drm*	Direct Rendering Manager
 #	fd	fd/* nodes
@@ -343,10 +342,6 @@ diskmap)
 	M diskmap c 130 0 640 operator
 	;;
 
-crypto)
-	M crypto c 75 0
-	;;
-
 bpf*)
 	M bpf$U c 105 $U 600
 	;;
@@ -642,7 +637,7 @@ all)
 	R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
 	R rmidi6 rmidi7 video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0
 	R lpt1 lpt2 lkm tty00 tty01 tty02 tty03 tty04 tty05 tty06
-	R tty07 tty08 tty09 tty0a tty0b ttyh0 ttyh1 crypto pf systrace
+	R tty07 tty08 tty09 tty0a tty0b ttyh0 ttyh1 pf systrace
 	R wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
diff --git a/etc/etc.zaurus/MAKEDEV b/etc/etc.zaurus/MAKEDEV
index 3f14788f16c..fe6816f49e1 100644
--- a/etc/etc.zaurus/MAKEDEV
+++ b/etc/etc.zaurus/MAKEDEV
@@ -64,7 +64,6 @@
 #	bio	ioctl tunnel pseudo-device
 #	bktr*	Video frame grabbers
 #	bpf*	Berkeley Packet Filter
-#	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	fuse	Userland Filesystem
@@ -298,10 +297,6 @@ diskmap)
 	M diskmap c 102 0 640 operator
 	;;
 
-crypto)
-	M crypto c 47 0
-	;;
-
 bpf*)
 	M bpf$U c 22 $U 600
 	;;
@@ -476,7 +471,7 @@ all)
 	R audio1 audio2 fuse pppx hotplug ptm local wscons uall rmidi0
 	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
 	R radio0 video0 video1 uk0 random lkm tty00 tty01 tty02 tty03
-	R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm crypto
+	R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm
 	R pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
diff --git a/etc/examples/sysctl.conf b/etc/examples/sysctl.conf
index ae9c83519b4..b01a20ce96a 100644
--- a/etc/examples/sysctl.conf
+++ b/etc/examples/sysctl.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: sysctl.conf,v 1.1 2014/07/15 08:28:43 deraadt Exp $
+#	$OpenBSD: sysctl.conf,v 1.2 2014/08/20 11:23:41 mikeb Exp $
 #
 # This file contains a list of sysctl options the user wants set at
 # boot time.  See sysctl(3) and sysctl(8) for more information on
@@ -29,8 +29,6 @@
 #vm.swapencrypt.enable=0	# 0=Do not encrypt pages that go to swap
 #vfs.nfs.iothreads=4		# Number of nfsio kernel threads
 #net.inet.ip.mtudisc=0		# 0=Disable tcp mtu discovery
-#kern.usercrypto=1		# 1=Enable userland use of /dev/crypto
-#kern.userasymcrypto=1		# 1=Permit userland to do asymmetric crypto
 #kern.splassert=2		# 2=Enable with verbose error messages
 #kern.nosuidcoredump=3		# 3=Put suid coredumps in /var/crash/progname
 #kern.watchdog.period=32	# >0=Enable hardware watchdog(4) timer if available
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index d06fcf8fa56..eb226a7cbb3 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.3,v 1.240 2014/07/13 17:47:03 claudio Exp $
+.\"	$OpenBSD: sysctl.3,v 1.241 2014/08/20 11:23:41 mikeb Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 13 2014 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt SYSCTL 3
 .Os
 .Sh NAME
@@ -394,7 +394,7 @@ The types of data currently available are process information,
 system vnodes, the open file entries, routing table entries,
 virtual memory statistics, load average history, and clock rate
 information.
-.Bl -column "KERN_CRYPTODEVALLOWSOFT" "u_int64_t[CPUSTATES]" "no" -offset indent
+.Bl -column "KERN_PROC_NOBROADKILL" "u_int64_t[CPUSTATES]" "no" -offset indent
 .It Sy "Second level name" Ta Sy "Type" Ta Sy "Changeable"
 .It Dv KERN_ARGMAX Ta "integer" Ta "no"
 .It Dv KERN_ARND Ta "char[]" Ta "no"
@@ -405,7 +405,6 @@ information.
 .It Dv KERN_CONSDEV Ta "dev_t" Ta "no"
 .It Dv KERN_CPTIME Ta "long[CPUSTATES]" Ta "no"
 .It Dv KERN_CPTIME2 Ta "u_int64_t[CPUSTATES]" Ta "no"
-.It Dv KERN_CRYPTODEVALLOWSOFT Ta "integer" Ta "yes"
 .It Dv KERN_DOMAINNAME Ta "string" Ta "yes"
 .It Dv KERN_EMUL Ta "node" Ta "not applicable"
 .It Dv KERN_FILE Ta "struct kinfo_file" Ta "no"
@@ -462,8 +461,6 @@ information.
 .It Dv KERN_TIMECOUNTER Ta "node" Ta "not applicable"
 .It Dv KERN_TTY Ta "node" Ta "not applicable"
 .It Dv KERN_TTYCOUNT Ta "integer" Ta "no"
-.It Dv KERN_USERASYMCRYPTO Ta "integer" Ta "yes"
-.It Dv KERN_USERCRYPTO Ta "integer" Ta "yes"
 .It Dv KERN_USERMOUNT Ta "integer" Ta "yes"
 .It Dv KERN_VERSION Ta "string" Ta "no"
 .It Dv KERN_VNODE Ta "struct e_vnode" Ta "no"
@@ -514,10 +511,6 @@ Similar to
 .Dv KERN_CPTIME ,
 but obtains information from only the single CPU specified by the
 third level name given.
-.It Dv KERN_CRYPTODEVALLOWSOFT
-Permits userland to use
-.Pa /dev/crypto
-even if there is no hardware crypto accelerator in the system.
 .It Dv KERN_DOMAINNAME
 Get or set the YP domain name.
 .It Dv KERN_EMUL
@@ -1033,17 +1026,6 @@ Returns the number of input characters in raw mode.
 Number of available
 .Xr tty 4
 devices.
-.It Dv KERN_USERASYMCRYPTO
-Permits userland to use
-.Pa /dev/crypto
-for cryptographic support for asymmetric (public) key operations via hardware
-cryptographic devices.
-.Dv KERN_USERCRYPTO
-(see below) must also be set.
-.It Dv KERN_USERCRYPTO
-Permits userland to use
-.Pa /dev/crypto
-for cryptographic support via hardware cryptographic devices.
 .It Dv KERN_USERMOUNT
 Return non-zero if regular users can issue
 .Xr mount 2
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index a0214d0e7dc..20f59696bd3 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.8,v 1.182 2014/07/11 16:43:07 henning Exp $
+.\"	$OpenBSD: sysctl.8,v 1.183 2014/08/20 11:23:41 mikeb Exp $
 .\"	$NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $
 .\"
 .\" Copyright (c) 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)sysctl.8	8.2 (Berkeley) 5/9/95
 .\"
-.Dd $Mdocdate: July 11 2014 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt SYSCTL 8
 .Os
 .Sh NAME
@@ -167,13 +167,10 @@ and a few require a kernel compiled with non-standard
 .It kern.fscale Ta integer Ta no
 .It kern.nprocs Ta integer Ta no
 .It kern.stackgap_random Ta integer Ta yes
-.It kern.usercrypto Ta integer Ta yes
-.It kern.cryptodevallowsoft Ta integer Ta yes
 .It kern.splassert Ta integer Ta yes
 .It kern.nfiles Ta integer Ta no
 .It kern.ttycount Ta integer Ta no
 .It kern.numvnodes Ta integer Ta no
-.It kern.userasymcrypto Ta integer Ta yes
 .It kern.seminfo.semmni Ta integer Ta yes
 .It kern.seminfo.semmns Ta integer Ta yes
 .It kern.seminfo.semmnu Ta integer Ta yes
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 5aec7be282b..1be2d3f49f1 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.580 2014/08/15 14:16:01 mikeb Exp $
+#	$OpenBSD: Makefile,v 1.581 2014/08/20 11:23:41 mikeb Exp $
 
 MAN=	aac.4 ac97.4 acphy.4 \
 	acpi.4 acpiac.4 acpiasus.4 acpibat.4 acpibtn.4 acpicpu.4 acpidock.4 \
@@ -17,7 +17,7 @@ MAN=	aac.4 ac97.4 acphy.4 \
 	boca.4 bpf.4 brgphy.4 bridge.4 brswphy.4 bwi.4 \
 	cac.4 cas.4 cardbus.4 carp.4 cd.4 cdce.4 cdcef.4 che.4 cfxga.4 \
 	ch.4 ciphy.4 ciss.4 clcs.4 clct.4 cmpci.4 cnw.4 \
-	com.4 crypto.4 cue.4 cy.4 cz.4 dc.4 dcphy.4 ddb.4 de.4 \
+	com.4 cue.4 cy.4 cz.4 dc.4 dcphy.4 ddb.4 de.4 \
 	diskmap.4 divert.4 dpt.4 drm.4 \
 	eap.4 ec.4 eephy.4 ef.4 eg.4 ehci.4 eisa.4 el.4 em.4 emc.4 gcu.4 \
 	emu.4 enc.4 endrun.4 envy.4 ep.4 epic.4 esa.4 \
diff --git a/share/man/man4/crypto.4 b/share/man/man4/crypto.4
deleted file mode 100644
index c9e1ac0c0e0..00000000000
--- a/share/man/man4/crypto.4
+++ /dev/null
@@ -1,107 +0,0 @@
-.\"	$OpenBSD: crypto.4,v 1.18 2014/08/15 14:16:01 mikeb Exp $
-.\"
-.\" Copyright (c) 2001 Theo de Raadt
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-.\" DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd $Mdocdate: August 15 2014 $
-.Dt CRYPTO 4
-.Os
-.Sh NAME
-.Nm crypto
-.Nd hardware crypto access driver
-.Sh SYNOPSIS
-.Cd "pseudo-device crypto" Op Ar count
-.Sh DESCRIPTION
-The
-.Nm
-driver provides userland applications access to hardware crypto support
-via the kernel.
-The
-.Pa /dev/crypto
-device node primarily operates in an
-.Xr ioctl 2
-based model, permitting a variety of applications to query device capabilities,
-submit transactions, and get results.
-.Pp
-If
-.Ar count
-is given in the specification, and is greater than 0, a maximum of one
-.Nm crypto
-device is created.
-.Pp
-The following
-.Xr ioctl 2
-calls apply only to the
-.Nm crypto
-devices:
-.Bl -tag -width CIOCGSESSION
-.It Dv CIOCGSESSION
-Set up a new crypto session for a new type of operation.
-.It Dv CIOCFSESSION
-Free a previously established session.
-.It Dv CIOCCRYPT
-Perform a crypto operation against a previously set up session.
-.El
-.Sh FEATURES
-Depending on hardware being present, the following symmetric and
-asymmetric cryptographic features are potentially available from
-.Pa /dev/crypto :
-.Pp
-.Bl -tag -compact -width CRYPTO_RIPEMD160_HMAC -offset indent
-.It CRYPTO_DES_CBC
-.It CRYPTO_3DES_CBC
-.It CRYPTO_BLF_CBC
-.It CRYPTO_CAST_CBC
-.It CRYPTO_MD5_HMAC
-.It CRYPTO_SHA1_HMAC
-.It CRYPTO_RIPEMD160_HMAC
-.It CRYPTO_MD5_KPDK
-.It CRYPTO_SHA1_KPDK
-.It CRYPTO_AES_CBC
-.It CRYPTO_AES_CTR
-.It CRYPTO_AES_XTS
-.It CRYPTO_ARC4
-.It CRYPTO_MD5
-.It CRYPTO_SHA1
-.It CRK_MOD_EXP
-.It CRK_MOD_EXP_CRT
-.It CRK_DSA_SIGN
-.It CRK_DSA_VERIFY
-.It CRK_DH_COMPUTE_KEY
-.El
-.Sh FILES
-.Bl -tag -width /dev/crypto -compact
-.It Pa /dev/crypto
-crypto access device
-.El
-.Sh SEE ALSO
-.Xr hifn 4 ,
-.Xr safe 4 ,
-.Xr ubsec 4 ,
-.Xr crypto 9
-.Sh HISTORY
-The
-.Nm
-driver appeared in
-.Ox 3.0 .
diff --git a/share/man/man4/hifn.4 b/share/man/man4/hifn.4
index a75c85b7d67..92e9d5bb621 100644
--- a/share/man/man4/hifn.4
+++ b/share/man/man4/hifn.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hifn.4,v 1.47 2009/03/24 15:47:36 sobrado Exp $
+.\"	$OpenBSD: hifn.4,v 1.48 2014/08/20 11:23:41 mikeb Exp $
 .\"
 .\" Copyright (c) 2000 Theo de Raadt
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 24 2009 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt HIFN 4
 .Os
 .Sh NAME
@@ -71,9 +71,7 @@ and
 .Tn Hifn 7956
 chips all support acceleration of DES, Triple-DES, ARC4, MD5,
 MD5-HMAC, SHA1, SHA1-HMAC, and LZS operations for
-.Xr ipsec 4
-and
-.Xr crypto 4 .
+.Xr ipsec 4 .
 The
 .Tn Hifn 7955
 and
@@ -94,7 +92,6 @@ will also supply data to the kernel
 subsystem.
 .Sh SEE ALSO
 .Xr crypt 3 ,
-.Xr crypto 4 ,
 .Xr intro 4 ,
 .Xr ipsec 4 ,
 .Xr pci 4 ,
diff --git a/share/man/man4/man4.i386/glxsb.4 b/share/man/man4/man4.i386/glxsb.4
index f3961b547f6..8c76274ad91 100644
--- a/share/man/man4/man4.i386/glxsb.4
+++ b/share/man/man4/man4.i386/glxsb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: glxsb.4,v 1.6 2007/08/09 11:30:16 markus Exp $
+.\"	$OpenBSD: glxsb.4,v 1.7 2014/08/20 11:23:41 mikeb Exp $
 .\"
 .\"Copyright (c) 2006 Tom Cosgrove <tom@openbsd.org>
 .\"
@@ -15,7 +15,7 @@
 .\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\"
-.Dd $Mdocdate: August 9 2007 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt GLXSB 4 i386
 .Os
 .Sh NAME
@@ -38,10 +38,10 @@ driver for common usage.
 .Pp
 .Nm
 also supports acceleration of AES-CBC operations for
-.Xr crypto 4 .
+.Xr ipsec 4 .
 .Sh SEE ALSO
-.Xr crypto 4 ,
 .Xr intro 4 ,
+.Xr ipsec 4 ,
 .Xr pci 4 ,
 .Xr random 4 ,
 .Xr crypto 9
diff --git a/share/man/man4/safe.4 b/share/man/man4/safe.4
index 127b1078832..38babc356d8 100644
--- a/share/man/man4/safe.4
+++ b/share/man/man4/safe.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: safe.4,v 1.9 2014/08/15 15:46:24 mikeb Exp $
+.\"	$OpenBSD: safe.4,v 1.10 2014/08/20 11:23:41 mikeb Exp $
 .\"
 .\" Copyright (c) 2003	Sam Leffler, Errno Consulting
 .\" All rights reserved.
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD: /repoman/r/ncvs/src/share/man/man4/safe.4,v 1.1 2003/07/21 21:52:14 sam Exp $
 .\"
-.Dd $Mdocdate: August 15 2014 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt SAFE 4
 .Os
 .Sh NAME
@@ -51,9 +51,7 @@ The
 .Nm
 driver registers itself to accelerate DES, Triple-DES, AES, MD5-HMAC,
 and SHA1-HMAC operations for
-.Xr ipsec 4
-and
-.Xr crypto 4 .
+.Xr ipsec 4 .
 .Pp
 Additionally, the driver provides input to the
 .Xr random 4
@@ -68,7 +66,6 @@ There is no easy workaround.
 .El
 .Sh SEE ALSO
 .Xr crypt 3 ,
-.Xr crypto 4 ,
 .Xr intro 4 ,
 .Xr ipsec 4 ,
 .Xr pci 4 ,
diff --git a/share/man/man4/ubsec.4 b/share/man/man4/ubsec.4
index 2662d24ab0b..62310b384a3 100644
--- a/share/man/man4/ubsec.4
+++ b/share/man/man4/ubsec.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ubsec.4,v 1.33 2014/08/15 15:46:24 mikeb Exp $
+.\"	$OpenBSD: ubsec.4,v 1.34 2014/08/20 11:23:41 mikeb Exp $
 .\"
 .\" Copyright (c) 2000 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 15 2014 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt UBSEC 4
 .Os
 .Sh NAME
@@ -73,9 +73,7 @@ The
 .Nm
 driver registers itself to accelerate DES, Triple-DES, MD5-HMAC,
 and SHA1-HMAC operations for
-.Xr ipsec 4
-and
-.Xr crypto 4 .
+.Xr ipsec 4 .
 The driver also supports acceleration of AES-CBC with the BCM5823 or newer.
 .Pp
 On all models except the Bluesteel 5501 and Broadcom 5801, the driver
@@ -84,7 +82,6 @@ registers itself to provide random data to the
 subsystem.
 .Sh SEE ALSO
 .Xr crypt 3 ,
-.Xr crypto 4 ,
 .Xr intro 4 ,
 .Xr ipsec 4 ,
 .Xr pci 4 ,
diff --git a/share/man/man8/man8.alpha/MAKEDEV.8 b/share/man/man8/man8.alpha/MAKEDEV.8
index 9f5862ca254..4d480938833 100644
--- a/share/man/man8/man8.alpha/MAKEDEV.8
+++ b/share/man/man8/man8.alpha/MAKEDEV.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.65 2014/07/11 22:10:51 tedu Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.66 2014/08/20 11:23:41 mikeb Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 11 2014 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt MAKEDEV 8 alpha
 .Os
 .Sh NAME
@@ -205,9 +205,6 @@ Video frame grabbers, see
 .It Ar bpf*
 Berkeley Packet Filter, see
 .Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
 .It Ar diskmap
 Disk mapper, see
 .Xr diskmap 4 .
diff --git a/share/man/man8/man8.amd64/MAKEDEV.8 b/share/man/man8/man8.amd64/MAKEDEV.8
index 6dbc6002cae..b5697c6f7b1 100644
--- a/share/man/man8/man8.amd64/MAKEDEV.8
+++ b/share/man/man8/man8.amd64/MAKEDEV.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.69 2014/07/11 22:10:51 tedu Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.70 2014/08/20 11:23:41 mikeb Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 11 2014 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt MAKEDEV 8 amd64
 .Os
 .Sh NAME
@@ -205,9 +205,6 @@ Video frame grabbers, see
 .It Ar bpf*
 Berkeley Packet Filter, see
 .Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
 .It Ar diskmap
 Disk mapper, see
 .Xr diskmap 4 .
diff --git a/share/man/man8/man8.armish/MAKEDEV.8 b/share/man/man8/man8.armish/MAKEDEV.8
index 8ceca76dc22..314f0396780 100644
--- a/share/man/man8/man8.armish/MAKEDEV.8
+++ b/share/man/man8/man8.armish/MAKEDEV.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.38 2014/07/11 22:10:51 tedu Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.39 2014/08/20 11:23:42 mikeb Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 11 2014 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt MAKEDEV 8 armish
 .Os
 .Sh NAME
@@ -185,9 +185,6 @@ Video frame grabbers, see
 .It Ar bpf*
 Berkeley Packet Filter, see
 .Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
 .It Ar diskmap
 Disk mapper, see
 .Xr diskmap 4 .
diff --git a/share/man/man8/man8.armv7/MAKEDEV.8 b/share/man/man8/man8.armv7/MAKEDEV.8
index 126d9eb9e9a..d8416de82db 100644
--- a/share/man/man8/man8.armv7/MAKEDEV.8
+++ b/share/man/man8/man8.armv7/MAKEDEV.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.5 2014/07/11 22:10:51 tedu Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.6 2014/08/20 11:23:42 mikeb Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 11 2014 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt MAKEDEV 8 armv7
 .Os
 .Sh NAME
@@ -185,9 +185,6 @@ Video frame grabbers, see
 .It Ar bpf*
 Berkeley Packet Filter, see
 .Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
 .It Ar diskmap
 Disk mapper, see
 .Xr diskmap 4 .
diff --git a/share/man/man8/man8.hppa/MAKEDEV.8 b/share/man/man8/man8.hppa/MAKEDEV.8
index d1dcf888586..459adc9bf62 100644
--- a/share/man/man8/man8.hppa/MAKEDEV.8
+++ b/share/man/man8/man8.hppa/MAKEDEV.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.60 2014/07/11 22:10:51 tedu Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.61 2014/08/20 11:23:42 mikeb Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 11 2014 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt MAKEDEV 8 hppa
 .Os
 .Sh NAME
@@ -193,9 +193,6 @@ ioctl tunnel pseudo-device, see
 .It Ar bpf*
 Berkeley Packet Filter, see
 .Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
 .It Ar diskmap
 Disk mapper, see
 .Xr diskmap 4 .
diff --git a/share/man/man8/man8.hppa64/MAKEDEV.8 b/share/man/man8/man8.hppa64/MAKEDEV.8
index ef98c4f1868..657e2524d90 100644
--- a/share/man/man8/man8.hppa64/MAKEDEV.8
+++ b/share/man/man8/man8.hppa64/MAKEDEV.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.40 2013/08/21 15:14:29 ajacoutot Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.41 2014/08/20 11:23:42 mikeb Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 21 2013 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt MAKEDEV 8 hppa64
 .Os
 .Sh NAME
@@ -193,9 +193,6 @@ ioctl tunnel pseudo-device, see
 .It Ar bpf*
 Berkeley Packet Filter, see
 .Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
 .It Ar diskmap
 Disk mapper, see
 .Xr diskmap 4 .
diff --git a/share/man/man8/man8.i386/MAKEDEV.8 b/share/man/man8/man8.i386/MAKEDEV.8
index 3a0c0797132..584f3b29461 100644
--- a/share/man/man8/man8.i386/MAKEDEV.8
+++ b/share/man/man8/man8.i386/MAKEDEV.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.95 2014/07/11 22:10:51 tedu Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.96 2014/08/20 11:23:42 mikeb Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 11 2014 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt MAKEDEV 8 i386
 .Os
 .Sh NAME
@@ -208,9 +208,6 @@ Video frame grabbers, see
 .It Ar bpf*
 Berkeley Packet Filter, see
 .Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
 .It Ar diskmap
 Disk mapper, see
 .Xr diskmap 4 .
diff --git a/share/man/man8/man8.landisk/MAKEDEV.8 b/share/man/man8/man8.landisk/MAKEDEV.8
index 62c1becce24..6b6816ecfe5 100644
--- a/share/man/man8/man8.landisk/MAKEDEV.8
+++ b/share/man/man8/man8.landisk/MAKEDEV.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.39 2014/07/11 22:10:51 tedu Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.40 2014/08/20 11:23:42 mikeb Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 11 2014 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt MAKEDEV 8 landisk
 .Os
 .Sh NAME
@@ -179,9 +179,6 @@ ioctl tunnel pseudo-device, see
 .It Ar bpf*
 Berkeley Packet Filter, see
 .Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
 .It Ar diskmap
 Disk mapper, see
 .Xr diskmap 4 .
diff --git a/share/man/man8/man8.loongson/MAKEDEV.8 b/share/man/man8/man8.loongson/MAKEDEV.8
index 4e4aaeec337..591cae24e9a 100644
--- a/share/man/man8/man8.loongson/MAKEDEV.8
+++ b/share/man/man8/man8.loongson/MAKEDEV.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.23 2014/07/11 22:10:51 tedu Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.24 2014/08/20 11:23:42 mikeb Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 11 2014 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt MAKEDEV 8 loongson
 .Os
 .Sh NAME
@@ -186,9 +186,6 @@ ioctl tunnel pseudo-device, see
 .It Ar bpf*
 Berkeley Packet Filter, see
 .Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
 .It Ar diskmap
 Disk mapper, see
 .Xr diskmap 4 .
diff --git a/share/man/man8/man8.macppc/MAKEDEV.8 b/share/man/man8/man8.macppc/MAKEDEV.8
index 46b5fb81cae..8e4e953f73c 100644
--- a/share/man/man8/man8.macppc/MAKEDEV.8
+++ b/share/man/man8/man8.macppc/MAKEDEV.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.68 2014/07/11 22:10:51 tedu Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.69 2014/08/20 11:23:42 mikeb Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 11 2014 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt MAKEDEV 8 macppc
 .Os
 .Sh NAME
@@ -195,9 +195,6 @@ Video frame grabbers, see
 .It Ar bpf*
 Berkeley Packet Filter, see
 .Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
 .It Ar diskmap
 Disk mapper, see
 .Xr diskmap 4 .
diff --git a/share/man/man8/man8.octeon/MAKEDEV.8 b/share/man/man8/man8.octeon/MAKEDEV.8
index f0d542801c9..8a459cc2abe 100644
--- a/share/man/man8/man8.octeon/MAKEDEV.8
+++ b/share/man/man8/man8.octeon/MAKEDEV.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.5 2013/06/21 21:35:45 syl Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.6 2014/08/20 11:23:42 mikeb Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: June 21 2013 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt MAKEDEV 8 octeon
 .Os
 .Sh NAME
@@ -168,9 +168,6 @@ ioctl tunnel pseudo-device, see
 .It Ar bpf*
 Berkeley Packet Filter, see
 .Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
 .It Ar diskmap
 Disk mapper, see
 .Xr diskmap 4 .
diff --git a/share/man/man8/man8.sgi/MAKEDEV.8 b/share/man/man8/man8.sgi/MAKEDEV.8
index b4020d16c6c..95b62d5448e 100644
--- a/share/man/man8/man8.sgi/MAKEDEV.8
+++ b/share/man/man8/man8.sgi/MAKEDEV.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.53 2013/08/21 15:14:31 ajacoutot Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.54 2014/08/20 11:23:42 mikeb Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 21 2013 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt MAKEDEV 8 sgi
 .Os
 .Sh NAME
@@ -186,9 +186,6 @@ ioctl tunnel pseudo-device, see
 .It Ar bpf*
 Berkeley Packet Filter, see
 .Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
 .It Ar diskmap
 Disk mapper, see
 .Xr diskmap 4 .
diff --git a/share/man/man8/man8.sparc64/MAKEDEV.8 b/share/man/man8/man8.sparc64/MAKEDEV.8
index ce4b47391e8..5c818945396 100644
--- a/share/man/man8/man8.sparc64/MAKEDEV.8
+++ b/share/man/man8/man8.sparc64/MAKEDEV.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.67 2014/07/11 22:10:51 tedu Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.68 2014/08/20 11:23:42 mikeb Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 11 2014 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt MAKEDEV 8 sparc64
 .Os
 .Sh NAME
@@ -228,9 +228,6 @@ ioctl tunnel pseudo-device, see
 .It Ar bpf*
 Berkeley Packet Filter, see
 .Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
 .It Ar diskmap
 Disk mapper, see
 .Xr diskmap 4 .
diff --git a/share/man/man8/man8.zaurus/MAKEDEV.8 b/share/man/man8/man8.zaurus/MAKEDEV.8
index 6a9e66c984f..bc7a59dae34 100644
--- a/share/man/man8/man8.zaurus/MAKEDEV.8
+++ b/share/man/man8/man8.zaurus/MAKEDEV.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.49 2014/07/11 22:10:51 tedu Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.50 2014/08/20 11:23:42 mikeb Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 11 2014 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt MAKEDEV 8 zaurus
 .Os
 .Sh NAME
@@ -185,9 +185,6 @@ Video frame grabbers, see
 .It Ar bpf*
 Berkeley Packet Filter, see
 .Xr bpf 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
 .It Ar diskmap
 Disk mapper, see
 .Xr diskmap 4 .
diff --git a/share/man/man9/crypto.9 b/share/man/man9/crypto.9
index 350746e48ac..a70995c6839 100644
--- a/share/man/man9/crypto.9
+++ b/share/man/man9/crypto.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: crypto.9,v 1.36 2013/07/17 20:21:52 schwarze Exp $
+.\"	$OpenBSD: crypto.9,v 1.37 2014/08/20 11:23:42 mikeb Exp $
 .\"
 .\" The author of this man page is Angelos D. Keromytis (angelos@cis.upenn.edu)
 .\"
@@ -15,7 +15,7 @@
 .\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
 .\" PURPOSE.
 .\"
-.Dd $Mdocdate: July 17 2013 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt CRYPTO 9
 .Os
 .Sh NAME
@@ -577,7 +577,3 @@ at some software
 .Xr spl 9
 level, to avoid overall system latency issues, and potential kernel
 stack exhaustion while processing a callback.
-.Pp
-When SMP time comes, we will support use of a second processor (or
-more) as a crypto device (this is actually AMP, but we need the same
-basic support).
diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9
index ca523108682..4c1dde505dd 100644
--- a/share/man/man9/malloc.9
+++ b/share/man/man9/malloc.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: malloc.9,v 1.58 2014/07/23 06:22:28 jmc Exp $
+.\"	$OpenBSD: malloc.9,v 1.59 2014/08/20 11:23:42 mikeb Exp $
 .\"	$NetBSD: malloc.9,v 1.2 1996/10/30 05:29:54 lukem Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 23 2014 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt MALLOC 9
 .Os
 .Sh NAME
@@ -262,7 +262,7 @@ USB host controller.
 .It Dv M_MEMDESC
 Memory range.
 .It Dv M_CRYPTO_DATA
-.Xr crypto 4
+.Xr crypto 9
 data buffers.
 .It Dv M_CREDENTIALS
 .Xr ipsec 4
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index d53587a66ef..9575377655a 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fstat.1,v 1.49 2012/01/07 08:30:37 jmc Exp $
+.\"	$OpenBSD: fstat.1,v 1.50 2014/08/20 11:23:42 mikeb Exp $
 .\"
 .\" Copyright (c) 1987, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     from: @(#)fstat.1	8.3 (Berkeley) 2/25/94
 .\"
-.Dd $Mdocdate: January 7 2012 $
+.Dd $Mdocdate: August 20 2014 $
 .Dt FSTAT 1
 .Os
 .Sh NAME
@@ -267,10 +267,6 @@ the pipe and a state that is built of the letters
 W \- The pipe blocks waiting for the reader to read data.
 R \- The pipe blocks waiting for the writer to write data.
 E \- The pipe is in EOF state.
-.Sh CRYPTO
-Each
-.Xr crypto 4
-device is printed with only the kernel address of the device private data.
 .Sh KQUEUE
 Each
 .Xr kqueue 2
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index de4e0b9edbf..ac2c501a658 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fstat.c,v 1.78 2014/08/10 07:29:45 guenther Exp $	*/
+/*	$OpenBSD: fstat.c,v 1.79 2014/08/20 11:23:42 mikeb Exp $	*/
 
 /*
  * Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -107,7 +107,6 @@ void fstat_header(void);
 void getinetproto(int);
 void usage(void);
 int getfname(char *);
-void cryptotrans(struct kinfo_file *);
 void kqueuetrans(struct kinfo_file *);
 void pipetrans(struct kinfo_file *);
 struct kinfo_file *splice_find(char, u_int64_t);
@@ -360,10 +359,6 @@ fstat_dofile(struct kinfo_file *kf)
 		if (checkfile == 0)
 			kqueuetrans(kf);
 		break;
-	case DTYPE_CRYPTO:
-		if (checkfile == 0)
-			cryptotrans(kf);
-		break;
 	case DTYPE_SYSTRACE:
 		if (checkfile == 0)
 			systracetrans(kf);
@@ -517,18 +512,6 @@ kqueuetrans(struct kinfo_file *kf)
 	return;
 }
 
-void
-cryptotrans(struct kinfo_file *kf)
-{
-	PREFIX(kf->fd_fd);
-
-	printf(" ");
-
-	printf("crypto ");
-	hide((void *)(uintptr_t)kf->f_data);
-	printf("\n");
-}
-
 void
 systracetrans(struct kinfo_file *kf)
 {
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
index b5704e26408..53d41ad6f72 100644
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.28 2014/07/11 13:08:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.29 2014/08/20 11:23:42 mikeb Exp $
 
 LDSTATIC=${STATIC}
 PROG=	kdump
@@ -12,7 +12,6 @@ ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/mkioctls
 	CC="${CC}" \
 	/bin/sh ${.CURDIR}/mkioctls ${SYS_DIR}/sys/ioctl.h \
 	    ${SYS_DIR}/sys/ioctl_compat.h \
-	    ${SYS_DIR}/crypto/cryptodev.h \
 	    ${SYS_DIR}/dev/biovar.h \
 	    ${SYS_DIR}/dev/systrace.h \
 	    ${SYS_DIR}/dev/wscons/wsconsio.h \
diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls
index 648e8fb798e..94535cbc969 100644
--- a/usr.bin/kdump/mkioctls
+++ b/usr.bin/kdump/mkioctls
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: mkioctls,v 1.33 2014/07/11 13:08:03 deraadt Exp $
+#	$OpenBSD: mkioctls,v 1.34 2014/08/20 11:23:42 mikeb Exp $
 
 #
 # Copyright (c) 1994
@@ -74,7 +74,6 @@ BEGIN {
 	print "#include <sys/tty.h>"
 	print "#include <sys/syslog.h>"
 	print "#include <sys/videoio.h>"
-	print "#include <crypto/cryptodev.h>"
 	print "#include <dev/biovar.h>"
 	print "#include <dev/systrace.h>"
 	print "#include <dev/wscons/wsconsio.h>"
@@ -91,7 +90,7 @@ BEGIN {
 	print ""
 }
 
-/^[ 	]*#[ 	]*define[ 	]+(ATAIO|AUDIO_|BIOC|CDIO|CIOC|CHIO|DIOC|DRM|GPIO|TIO|FIO|MTIOC|LIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PPPIOC|PPPOE|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|USB|VIDIOC|VNDIOC|WSKBD|WSMOUSE|WSDISPLAY|WSMUX|PTM)[A-Z_0-9]*[ 	]+(DRM)?_IO/ {
+/^[ 	]*#[ 	]*define[ 	]+(ATAIO|AUDIO_|BIOC|CDIO|CHIO|DIOC|DRM|GPIO|TIO|FIO|MTIOC|LIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PPPIOC|PPPOE|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|USB|VIDIOC|VNDIOC|WSKBD|WSMOUSE|WSDISPLAY|WSMUX|PTM)[A-Z_0-9]*[ 	]+(DRM)?_IO/ {
 
 	# find where the name starts
 	for (i = 1; i <= NF; i++)
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index d903d796657..da0f23315de 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pstat.c,v 1.90 2014/03/19 04:17:33 guenther Exp $	*/
+/*	$OpenBSD: pstat.c,v 1.91 2014/08/20 11:23:42 mikeb Exp $	*/
 /*	$NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $	*/
 
 /*-
@@ -991,7 +991,7 @@ filemode(void)
 {
 	struct kinfo_file *kf;
 	char flagbuf[16], *fbp;
-	static char *dtypes[] = { "???", "inode", "socket", "pipe", "kqueue", "crypto", "systrace" };
+	static char *dtypes[] = { "???", "inode", "socket", "pipe", "kqueue", "???", "systrace" };
 	int mib[2], maxfile, nfile;
 	size_t len;