Remove plain DES from the kernel crypto framework, including the crypto

accelerator drivers.  No longer used by anything.  ok sthen@ mikeb@

4 files changed, 12 insertions, 16 deletions

diff --git a/share/man/man4/hifn.4 b/share/man/man4/hifn.4
index cde4f0a79d5..32b5dfb1bad 100644
--- a/share/man/man4/hifn.4
+++ b/share/man/man4/hifn.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hifn.4,v 1.49 2015/11/13 15:33:41 naddy Exp $
+.\"	$OpenBSD: hifn.4,v 1.50 2015/12/10 21:00:51 naddy 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: November 13 2015 $
+.Dd $Mdocdate: December 10 2015 $
 .Dt HIFN 4
 .Os
 .Sh NAME
@@ -69,7 +69,7 @@ The
 .Tn Hifn 7955 ,
 and
 .Tn Hifn 7956
-chips all support acceleration of DES, Triple-DES,
+chips all support acceleration of Triple-DES,
 MD5-HMAC, SHA1-HMAC, and LZS operations for
 .Xr ipsec 4 .
 The
diff --git a/share/man/man4/safe.4 b/share/man/man4/safe.4
index 38babc356d8..88902bc455d 100644
--- a/share/man/man4/safe.4
+++ b/share/man/man4/safe.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: safe.4,v 1.10 2014/08/20 11:23:41 mikeb Exp $
+.\"	$OpenBSD: safe.4,v 1.11 2015/12/10 21:00:51 naddy 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 20 2014 $
+.Dd $Mdocdate: December 10 2015 $
 .Dt SAFE 4
 .Os
 .Sh NAME
@@ -49,7 +49,7 @@ A faster version of the 1141.
 .Pp
 The
 .Nm
-driver registers itself to accelerate DES, Triple-DES, AES, MD5-HMAC,
+driver registers itself to accelerate Triple-DES, AES, MD5-HMAC,
 and SHA1-HMAC operations for
 .Xr ipsec 4 .
 .Pp
diff --git a/share/man/man4/ubsec.4 b/share/man/man4/ubsec.4
index 1ca7e3b6755..4b8fbe618cb 100644
--- a/share/man/man4/ubsec.4
+++ b/share/man/man4/ubsec.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ubsec.4,v 1.35 2014/08/20 18:59:56 jmc Exp $
+.\"	$OpenBSD: ubsec.4,v 1.36 2015/12/10 21:00:51 naddy 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 20 2014 $
+.Dd $Mdocdate: December 10 2015 $
 .Dt UBSEC 4
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@ The
 driver supports cards containing any of the following chips:
 .Bl -tag -width "Broadcom BCM5821" -offset indent
 .It Bluesteel 5501
-The original chipset, no longer made.
+The original chipset.
 This extremely rare unit
 was not very fast, lacked an RNG, and had a number of other bugs.
 .It Bluesteel 5601
@@ -71,7 +71,7 @@ Faster version of the BCM5861.
 .Pp
 The
 .Nm
-driver registers itself to accelerate DES, Triple-DES, MD5-HMAC,
+driver registers itself to accelerate Triple-DES, MD5-HMAC,
 and SHA1-HMAC operations for
 .Xr ipsec 4 .
 The driver also supports acceleration of AES-CBC with the BCM5823 or newer.
diff --git a/share/man/man9/crypto.9 b/share/man/man9/crypto.9
index 395984b1b30..34bead05463 100644
--- a/share/man/man9/crypto.9
+++ b/share/man/man9/crypto.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: crypto.9,v 1.41 2015/11/23 17:53:57 jmc Exp $
+.\"	$OpenBSD: crypto.9,v 1.42 2015/12/10 21:00:51 naddy 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: November 23 2015 $
+.Dd $Mdocdate: December 10 2015 $
 .Dt CRYPTO_GET_DRIVERID 9
 .Os
 .Sh NAME
@@ -140,7 +140,6 @@ structure are:
 Contains an algorithm identifier.
 Currently supported encryption algorithms are:
 .Bd -literal
-CRYPTO_DES_CBC
 CRYPTO_3DES_CBC
 CRYPTO_BLF_CBC
 CRYPTO_CAST_CBC
@@ -511,9 +510,6 @@ Some type of benchmarking is in order here.
 .Pp
 Multiple instances of the same algorithm in the same session are not
 supported.
-Note that 3DES is considered one algorithm (and not three
-instances of DES).
-Thus, 3DES and DES could be mixed in the same request.
 .Pp
 A queue for completed operations should be implemented and processed
 at some software