summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2005-11-25 16:41:31 +0000
committerthorpej <thorpej@NetBSD.org>2005-11-25 16:41:31 +0000
commitcfc81086d9b272bb42e2043edf16509079ae8d7b (patch)
tree7fd9948106bb56b9c43b7cc4c4c57c8e6618d97c /sys
parent7385cdd346dd448ff5ac94900118521a00138374 (diff)
swcr -> swcrypto
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/conf/GENERIC4
-rw-r--r--sys/arch/amd64/conf/GENERIC6
-rw-r--r--sys/arch/arc/conf/GENERIC6
-rw-r--r--sys/arch/bebox/conf/GENERIC6
-rw-r--r--sys/arch/cats/conf/GENERIC4
-rw-r--r--sys/arch/cobalt/conf/GENERIC6
-rw-r--r--sys/arch/cobalt/conf/INSTALL6
-rw-r--r--sys/arch/evbarm/conf/ARMADILLO94
-rw-r--r--sys/arch/hp700/conf/GENERIC6
-rw-r--r--sys/arch/i386/conf/GENERIC6
-rw-r--r--sys/arch/i386/conf/GENERIC.MPACPI6
-rw-r--r--sys/arch/i386/conf/VIRTUALPC6
-rw-r--r--sys/arch/i386/conf/XEN04
-rw-r--r--sys/arch/i386/conf/XENU4
-rw-r--r--sys/arch/macppc/conf/GENERIC6
-rw-r--r--sys/arch/netwinder/conf/GENERIC4
-rw-r--r--sys/arch/prep/conf/GENERIC6
-rw-r--r--sys/arch/sgimips/conf/GENERIC32_IP3x6
-rw-r--r--sys/arch/sparc64/conf/GENERIC326
-rw-r--r--sys/opencrypto/cryptosoft.c8
-rw-r--r--sys/opencrypto/files.opencrypto8
21 files changed, 59 insertions, 59 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index cd42f82d40f..c25ccdf46cc 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -22,7 +22,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.279 $"
+#ident "GENERIC-$Revision: 1.280 $"
maxusers 32
@@ -612,7 +612,7 @@ wskbd* at pckbd?
wsmouse* at pms?
pseudo-device crypto # /dev/crypto device
-pseudo-device swcr # software crypto implementation
+pseudo-device swcrypto # software crypto implementation
pseudo-device bpfilter 16
pseudo-device ccd 4
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 872fbe7a665..0933e8cb04d 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.74 2005/11/25 16:35:11 thorpej Exp $
+# $NetBSD: GENERIC,v 1.75 2005/11/25 16:41:31 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.74 $"
+#ident "GENERIC-$Revision: 1.75 $"
maxusers 32 # estimated number of users
@@ -806,7 +806,7 @@ include "arch/amd64/conf/GENERIC.local"
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
-pseudo-device swcr # software crypto implementation
+pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
pseudo-device ccd 4 # concatenated/striped disk devices
diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC
index 1cf96946e68..e2dbfff8570 100644
--- a/sys/arch/arc/conf/GENERIC
+++ b/sys/arch/arc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.127 2005/11/25 16:35:11 thorpej Exp $
+# $NetBSD: GENERIC,v 1.128 2005/11/25 16:41:31 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/arc/conf/std.arc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.127 $"
+#ident "GENERIC-$Revision: 1.128 $"
maxusers 32 # estimated number of users
@@ -400,7 +400,7 @@ wsmouse* at pms?
#### Pseudo devices
pseudo-device crypto # /dev/crypto device
-pseudo-device swcr # software crypto implementation
+pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
pseudo-device ccd 4 # concatenated/striped disk devices
diff --git a/sys/arch/bebox/conf/GENERIC b/sys/arch/bebox/conf/GENERIC
index a2df4ebd58b..f1764a99958 100644
--- a/sys/arch/bebox/conf/GENERIC
+++ b/sys/arch/bebox/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.91 2005/11/25 16:35:11 thorpej Exp $
+# $NetBSD: GENERIC,v 1.92 2005/11/25 16:41:31 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/bebox/conf/std.bebox"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.91 $"
+#ident "GENERIC-$Revision: 1.92 $"
maxusers 32
@@ -112,7 +112,7 @@ options NFS_BOOT_BOOTPARAM,NFS_BOOT_BOOTP
config netbsd root on ? type ?
#pseudo-device crypto # /dev/crypto device
-#pseudo-device swcr # software crypto implementation
+#pseudo-device swcrypto # software crypto implementation
#pseudo-device cgd 4 # cryptographic disk devices
pseudo-device vnd 4
#options VND_COMPRESSION # compressed vnd(4)
diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC
index c821db5400d..f517a148f5d 100644
--- a/sys/arch/cats/conf/GENERIC
+++ b/sys/arch/cats/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.94 2005/11/25 16:35:11 thorpej Exp $
+# $NetBSD: GENERIC,v 1.95 2005/11/25 16:41:31 thorpej Exp $
#
# GENERIC machine description file
#
@@ -557,7 +557,7 @@ joy* at isapnp? # Game ports (usually on audio cards)
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
-pseudo-device swcr # software crypto implementation
+pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
pseudo-device ccd 2 # concatenated/striped disk devices
diff --git a/sys/arch/cobalt/conf/GENERIC b/sys/arch/cobalt/conf/GENERIC
index 93ff43a506d..97c69465809 100644
--- a/sys/arch/cobalt/conf/GENERIC
+++ b/sys/arch/cobalt/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.85 2005/11/25 16:35:11 thorpej Exp $
+# $NetBSD: GENERIC,v 1.86 2005/11/25 16:41:31 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/cobalt/conf/std.cobalt"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.85 $"
+#ident "GENERIC-$Revision: 1.86 $"
maxusers 32
@@ -301,7 +301,7 @@ lxtphy* at mii? phy ? # Level One LXT-970 PHYs
# Pseudo-devices
pseudo-device crypto # /dev/crypto device
-pseudo-device swcr # software crypto implementation
+pseudo-device swcrypto # software crypto implementation
# Disk/mass storage pseudo-devices
#pseudo-device ccd 4 # concatenated disk devices
diff --git a/sys/arch/cobalt/conf/INSTALL b/sys/arch/cobalt/conf/INSTALL
index c9a1f6de522..276a55669a7 100644
--- a/sys/arch/cobalt/conf/INSTALL
+++ b/sys/arch/cobalt/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.13 2005/11/25 16:35:11 thorpej Exp $
+# $NetBSD: INSTALL,v 1.14 2005/11/25 16:41:31 thorpej Exp $
#
# INSTALL -- installation and rescue kernel.
#
@@ -10,7 +10,7 @@ include "arch/cobalt/conf/std.cobalt"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.13 $"
+#ident "INSTALL-$Revision: 1.14 $"
makeoptions COPTS="-Os -mmemcpy"
@@ -281,7 +281,7 @@ lxtphy* at mii? phy ? # Level One LXT-970 PHYs
# Pseudo-devices
#pseudo-device crypto # /dev/crypto device
-#pseudo-device swcr # software crypto implementation
+#pseudo-device swcrypto # software crypto implementation
# Disk/mass storage pseudo-devices
#pseudo-device ccd 4 # concatenated disk devices
diff --git a/sys/arch/evbarm/conf/ARMADILLO9 b/sys/arch/evbarm/conf/ARMADILLO9
index 8569815e487..fdd891e8593 100644
--- a/sys/arch/evbarm/conf/ARMADILLO9
+++ b/sys/arch/evbarm/conf/ARMADILLO9
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO9,v 1.4 2005/11/25 16:35:11 thorpej Exp $
+# $NetBSD: ARMADILLO9,v 1.5 2005/11/25 16:41:31 thorpej Exp $
#
# ARMADILLO9 -- Atmark Techno, Armadillo-9
#
@@ -303,7 +303,7 @@ pseudo-device rnd # /dev/random and in-kernel generator
pseudo-device clockctl # user control of clock subsystem
pseudo-device ksyms # /dev/ksyms
#pseudo-device crypto # /dev/crypto device
-#pseudo-device swcr # software crypto implementation
+#pseudo-device swcrypto # software crypto implementation
#pseudo-device sequencer 1 # MIDI sequencer
#
diff --git a/sys/arch/hp700/conf/GENERIC b/sys/arch/hp700/conf/GENERIC
index 7478e6551b1..9a31231a95e 100644
--- a/sys/arch/hp700/conf/GENERIC
+++ b/sys/arch/hp700/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.56 2005/11/25 16:35:11 thorpej Exp $
+# $NetBSD: GENERIC,v 1.57 2005/11/25 16:41:31 thorpej Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@ include "arch/hp700/conf/std.hp700"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-#ident "GENERIC-$Revision: 1.56 $"
+#ident "GENERIC-$Revision: 1.57 $"
maxusers 32 # estimated number of users
@@ -522,7 +522,7 @@ audio* at audiobus?
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
-pseudo-device swcr # software crypto implementation
+pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
pseudo-device ccd 4 # concatenated/striped disk devices
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 30089dcbcca..54344e1e34c 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.708 2005/11/25 16:35:11 thorpej Exp $
+# $NetBSD: GENERIC,v 1.709 2005/11/25 16:41:31 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.708 $"
+#ident "GENERIC-$Revision: 1.709 $"
maxusers 32 # estimated number of users
@@ -1239,7 +1239,7 @@ include "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
-pseudo-device swcr # software crypto implementation
+pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
pseudo-device ccd 4 # concatenated/striped disk devices
diff --git a/sys/arch/i386/conf/GENERIC.MPACPI b/sys/arch/i386/conf/GENERIC.MPACPI
index 4e4fc01eba0..45a9433ccb2 100644
--- a/sys/arch/i386/conf/GENERIC.MPACPI
+++ b/sys/arch/i386/conf/GENERIC.MPACPI
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.MPACPI,v 1.50 2005/11/25 16:35:11 thorpej Exp $
+# $NetBSD: GENERIC.MPACPI,v 1.51 2005/11/25 16:41:31 thorpej Exp $
#
# GENERIC.MPACPI -- Generic, plus ACPI Multiprocessor support
#
@@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.50 $"
+#ident "GENERIC-$Revision: 1.51 $"
maxusers 32 # estimated number of users
@@ -1175,7 +1175,7 @@ include "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
-pseudo-device swcr # software crypto implementation
+pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
pseudo-device ccd 4 # concatenated/striped disk devices
diff --git a/sys/arch/i386/conf/VIRTUALPC b/sys/arch/i386/conf/VIRTUALPC
index 1f62fd053f6..c962a55ba88 100644
--- a/sys/arch/i386/conf/VIRTUALPC
+++ b/sys/arch/i386/conf/VIRTUALPC
@@ -1,4 +1,4 @@
-# $NetBSD: VIRTUALPC,v 1.31 2005/11/25 16:30:23 thorpej Exp $
+# $NetBSD: VIRTUALPC,v 1.32 2005/11/25 16:41:31 thorpej Exp $
#
# VIRTUALPC machine description file --
#
@@ -11,7 +11,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "VIRTUALPC-$Revision: 1.31 $"
+#ident "VIRTUALPC-$Revision: 1.32 $"
maxusers 32 # estimated number of users
@@ -581,7 +581,7 @@ include "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
-pseudo-device swcr # software crypto implementation
+pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
pseudo-device ccd 4 # concatenated/striped disk devices
diff --git a/sys/arch/i386/conf/XEN0 b/sys/arch/i386/conf/XEN0
index 5cb2f844aef..8419d6a39fa 100644
--- a/sys/arch/i386/conf/XEN0
+++ b/sys/arch/i386/conf/XEN0
@@ -1,4 +1,4 @@
-# $NetBSD: XEN0,v 1.21 2005/11/25 16:35:11 thorpej Exp $
+# $NetBSD: XEN0,v 1.22 2005/11/25 16:41:31 thorpej Exp $
include "arch/xen/conf/std.xen"
@@ -630,7 +630,7 @@ include "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
-pseudo-device swcr # software crypto implementation
+pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
pseudo-device ccd 4 # concatenated/striped disk devices
diff --git a/sys/arch/i386/conf/XENU b/sys/arch/i386/conf/XENU
index 8a59c1fa6dd..9a7d0e9b469 100644
--- a/sys/arch/i386/conf/XENU
+++ b/sys/arch/i386/conf/XENU
@@ -1,4 +1,4 @@
-# $NetBSD: XENU,v 1.12 2005/11/25 16:35:11 thorpej Exp $
+# $NetBSD: XENU,v 1.13 2005/11/25 16:41:31 thorpej Exp $
include "arch/xen/conf/std.xen"
@@ -193,7 +193,7 @@ include "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
-pseudo-device swcr # software crypto implementation
+pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
pseudo-device ccd 4 # concatenated/striped disk devices
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 96879d29116..d1e8f36502a 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.216 2005/11/25 16:35:12 thorpej Exp $
+# $NetBSD: GENERIC,v 1.217 2005/11/25 16:41:31 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.216 $"
+#ident "GENERIC-$Revision: 1.217 $"
maxusers 32
@@ -494,7 +494,7 @@ midi* at eap? # 137[01] MIDI port
#pseudo-device crypto # /dev/crypto device
# (disabled, requires generic softints)
-#pseudo-device swcr # software crypto implementation
+#pseudo-device swcrypto # software crypto implementation
pseudo-device vnd 4 # disk-like interface to files
#options VND_COMPRESSION # compressed vnd(4)
pseudo-device ccd 4 # concatenated/striped disk devices
diff --git a/sys/arch/netwinder/conf/GENERIC b/sys/arch/netwinder/conf/GENERIC
index 688ec2d4b7a..218e21b3cff 100644
--- a/sys/arch/netwinder/conf/GENERIC
+++ b/sys/arch/netwinder/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.72 2005/11/25 16:35:12 thorpej Exp $
+# $NetBSD: GENERIC,v 1.73 2005/11/25 16:41:31 thorpej Exp $
#
# GENERIC machine description file
#
@@ -287,7 +287,7 @@ audio* at sb?
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
-pseudo-device swcr # software crypto implementation
+pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
#pseudo-device md 1 # memory disk device (ramdisk)
diff --git a/sys/arch/prep/conf/GENERIC b/sys/arch/prep/conf/GENERIC
index 7a69853c3bf..08cf6655d2a 100644
--- a/sys/arch/prep/conf/GENERIC
+++ b/sys/arch/prep/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.104 2005/11/25 16:35:12 thorpej Exp $
+# $NetBSD: GENERIC,v 1.105 2005/11/25 16:41:31 thorpej Exp $
#
# GENERIC machine description file
#
@@ -24,7 +24,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary
makeoptions COPTS="-Os -mmultiple" # -Os -mmultiple to reduce size.
-#ident "GENERIC-$Revision: 1.104 $"
+#ident "GENERIC-$Revision: 1.105 $"
maxusers 32
@@ -510,7 +510,7 @@ ukphy* at mii? phy ? # generic unknown PHYs
# Not yet ready -- prep lacks generic soft interrupts
#pseudo-device crypto # /dev/crypto device
-#pseudo-device swcr # software crypto implementation
+#pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
pseudo-device ccd 4 # concatenated/striped disk devices
diff --git a/sys/arch/sgimips/conf/GENERIC32_IP3x b/sys/arch/sgimips/conf/GENERIC32_IP3x
index fc3dc76ff08..7ba0d3d0ca5 100644
--- a/sys/arch/sgimips/conf/GENERIC32_IP3x
+++ b/sys/arch/sgimips/conf/GENERIC32_IP3x
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP3x,v 1.40 2005/11/25 16:35:12 thorpej Exp $
+# $NetBSD: GENERIC32_IP3x,v 1.41 2005/11/25 16:41:31 thorpej Exp $
#
# GENERIC32_IP3x machine description file
#
@@ -28,7 +28,7 @@ makeoptions TEXTADDR="0x80069000" # entry point
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32_IP3x-$Revision: 1.40 $"
+#ident "GENERIC32_IP3x-$Revision: 1.41 $"
maxusers 32
@@ -404,7 +404,7 @@ midi* at midibus?
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
-pseudo-device swcr # software crypto implementation
+pseudo-device swcrypto # software crypto implementation
# disk/mass storage pseudo-devices
pseudo-device ccd 4 # concatenated/striped disk devices
diff --git a/sys/arch/sparc64/conf/GENERIC32 b/sys/arch/sparc64/conf/GENERIC32
index 2ad4a6be76e..c616c895d0f 100644
--- a/sys/arch/sparc64/conf/GENERIC32
+++ b/sys/arch/sparc64/conf/GENERIC32
@@ -1,10 +1,10 @@
-# $NetBSD: GENERIC32,v 1.120 2005/11/25 16:35:12 thorpej Exp $
+# $NetBSD: GENERIC32,v 1.121 2005/11/25 16:41:32 thorpej Exp $
include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.120 $"
+#ident "GENERIC-$Revision: 1.121 $"
maxusers 64
@@ -805,7 +805,7 @@ options FONT_GALLANT12x22 # PROM font look-alike
### Other pseudo-devices
pseudo-device crypto # /dev/crypto device
-pseudo-device swcr # software crypto implementation
+pseudo-device swcrypto # software crypto implementation
## Pseudo ttys, required for network logins and programs like screen.
diff --git a/sys/opencrypto/cryptosoft.c b/sys/opencrypto/cryptosoft.c
index 78992c0e5d6..212e700c160 100644
--- a/sys/opencrypto/cryptosoft.c
+++ b/sys/opencrypto/cryptosoft.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptosoft.c,v 1.10 2005/11/25 16:16:46 thorpej Exp $ */
+/* $NetBSD: cryptosoft.c,v 1.11 2005/11/25 16:41:31 thorpej Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptosoft.c,v 1.2.2.1 2002/11/21 23:34:23 sam Exp $ */
/* $OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $ */
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cryptosoft.c,v 1.10 2005/11/25 16:16:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptosoft.c,v 1.11 2005/11/25 16:41:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1154,10 +1154,10 @@ SYSINIT(cryptosoft_init, SI_SUB_PSEUDO, SI_ORDER_ANY, swcr_init, NULL)
/*
* Pseudo-device init routine for software crypto.
*/
-void swcrattach(int);
+void swcryptoattach(int);
void
-swcrattach(int num)
+swcryptoattach(int num)
{
swcr_init();
diff --git a/sys/opencrypto/files.opencrypto b/sys/opencrypto/files.opencrypto
index 16ed52e9b39..ecfb164face 100644
--- a/sys/opencrypto/files.opencrypto
+++ b/sys/opencrypto/files.opencrypto
@@ -1,4 +1,4 @@
-# $NetBSD: files.opencrypto,v 1.16 2005/11/25 16:16:46 thorpej Exp $
+# $NetBSD: files.opencrypto,v 1.17 2005/11/25 16:41:31 thorpej Exp $
#
#
@@ -14,10 +14,10 @@ file opencrypto/crypto.c opencrypto
# Pseudo-device that provides software implementations of various cryptographic
# algorithms.
-defpseudo swcr: opencrypto,
+defpseudo swcrypto: opencrypto,
blowfish, des, cast128, rijndael, ripemd160, sha2, skipjack
-file opencrypto/cryptosoft.c swcr
-file opencrypto/deflate.c swcr # wrapper around zlib
+file opencrypto/cryptosoft.c swcrypto
+file opencrypto/deflate.c swcrypto # wrapper around zlib
# Pseudo-device for userspace access to opencrypto
# (and thus crypto hardware accelerators).