Browse Source

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

OPENBSD_5_7
mikeb 10 years ago
parent
commit
3582d193e0
16 changed files with 16 additions and 91 deletions
  1. +1
    -4
      src/etc/MAKEDEV.common
  2. +1
    -6
      src/etc/etc.alpha/MAKEDEV
  3. +1
    -6
      src/etc/etc.amd64/MAKEDEV
  4. +1
    -6
      src/etc/etc.armish/MAKEDEV
  5. +1
    -6
      src/etc/etc.armv7/MAKEDEV
  6. +1
    -6
      src/etc/etc.hppa/MAKEDEV
  7. +1
    -6
      src/etc/etc.hppa64/MAKEDEV
  8. +1
    -6
      src/etc/etc.i386/MAKEDEV
  9. +1
    -6
      src/etc/etc.landisk/MAKEDEV
  10. +1
    -6
      src/etc/etc.loongson/MAKEDEV
  11. +1
    -6
      src/etc/etc.macppc/MAKEDEV
  12. +1
    -6
      src/etc/etc.octeon/MAKEDEV
  13. +1
    -6
      src/etc/etc.sgi/MAKEDEV
  14. +1
    -6
      src/etc/etc.sparc64/MAKEDEV
  15. +1
    -6
      src/etc/etc.zaurus/MAKEDEV
  16. +1
    -3
      src/etc/examples/sysctl.conf

+ 1
- 4
src/etc/MAKEDEV.common View File

@ -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


+ 1
- 6
src/etc/etc.alpha/MAKEDEV View File

@ -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
;;


+ 1
- 6
src/etc/etc.amd64/MAKEDEV View File

@ -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*)


+ 1
- 6
src/etc/etc.armish/MAKEDEV View File

@ -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
;;


+ 1
- 6
src/etc/etc.armv7/MAKEDEV View File

@ -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
;;


+ 1
- 6
src/etc/etc.hppa/MAKEDEV View File

@ -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
;;


+ 1
- 6
src/etc/etc.hppa64/MAKEDEV View File

@ -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
;;


+ 1
- 6
src/etc/etc.i386/MAKEDEV View File

@ -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
;;


+ 1
- 6
src/etc/etc.landisk/MAKEDEV View File

@ -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
;;


+ 1
- 6
src/etc/etc.loongson/MAKEDEV View File

@ -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*)


+ 1
- 6
src/etc/etc.macppc/MAKEDEV View File

@ -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
;;


+ 1
- 6
src/etc/etc.octeon/MAKEDEV View File

@ -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*)


+ 1
- 6
src/etc/etc.sgi/MAKEDEV View File

@ -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
;;


+ 1
- 6
src/etc/etc.sparc64/MAKEDEV View File

@ -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
;;


+ 1
- 6
src/etc/etc.zaurus/MAKEDEV View File

@ -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
;;


+ 1
- 3
src/etc/examples/sysctl.conf View File

@ -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


Loading…
Cancel
Save