svn commit: r360918 - in head: . share/man/man4 sys/conf sys/dev/random sys/dev/ubsec sys/modules sys/modules/ubsec sys/sys

[John Baldwin]

Author: jhb
Date: Mon May 11 20:30:28 2020
New Revision: 360918
URL: https://svnweb.freebsd.org/changeset/base/360918

Log:
  Remove ubsec(4).
  
  This driver was previously marked for deprecation in r360710.
  
  Approved by:	csprng (cem, gordon, delphij)
  Relnotes:	yes
  Sponsored by:	Chelsio Communications
  Differential Revision:	https://reviews.freebsd.org/D24766

Deleted:
  head/share/man/man4/ubsec.4
  head/sys/dev/ubsec/ubsec.c
  head/sys/dev/ubsec/ubsecreg.h
  head/sys/dev/ubsec/ubsecvar.h
  head/sys/modules/ubsec/Makefile
Modified:
  head/ObsoleteFiles.inc
  head/share/man/man4/Makefile
  head/share/man/man4/crypto.4
  head/share/man/man4/rndtest.4
  head/sys/conf/NOTES
  head/sys/conf/files
  head/sys/conf/options
  head/sys/dev/random/random_harvestq.c
  head/sys/modules/Makefile
  head/sys/sys/random.h

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Mon May 11 20:10:01 2020	(r360917)
+++ head/ObsoleteFiles.inc	Mon May 11 20:30:28 2020	(r360918)
@@ -36,6 +36,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 2020xxxx: Remove ubsec(4)
+OLD_FILES+=usr/share/man/man4/ubsec.4.gz
+
 # 20200506: GNU objdump 2.17.50 retired
 OLD_FILES+=usr/bin/objdump
 OLD_FILES+=usr/share/man/man1/objdump.1.gz

Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile	Mon May 11 20:10:01 2020	(r360917)
+++ head/share/man/man4/Makefile	Mon May 11 20:30:28 2020	(r360918)
@@ -966,7 +966,6 @@ MAN+=	\
 	uart.4 \
 	uath.4 \
 	ubsa.4 \
-	ubsec.4 \
 	ubser.4 \
 	ubtbcmfw.4 \
 	uchcom.4 \

Modified: head/share/man/man4/crypto.4
==============================================================================
--- head/share/man/man4/crypto.4	Mon May 11 20:10:01 2020	(r360917)
+++ head/share/man/man4/crypto.4	Mon May 11 20:30:28 2020	(r360918)
@@ -60,7 +60,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 27, 2020
+.Dd May 11, 2020
 .Dt CRYPTO 4
 .Os
 .Sh NAME
@@ -424,7 +424,6 @@ The semantics of these arguments are currently undocum
 .Xr ipsec 4 ,
 .Xr padlock 4 ,
 .Xr safe 4 ,
-.Xr ubsec 4 ,
 .Xr crypto 7 ,
 .Xr geli 8 ,
 .Xr crypto 9

Modified: head/share/man/man4/rndtest.4
==============================================================================
--- head/share/man/man4/rndtest.4	Mon May 11 20:10:01 2020	(r360917)
+++ head/share/man/man4/rndtest.4	Mon May 11 20:30:28 2020	(r360918)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 11, 2003
+.Dd May 11, 2020
 .Dt RNDTEST 4
 .Os
 .Sh NAME
@@ -54,7 +54,6 @@ Failures are optionally reported on the console.
 .Xr hifn 4 ,
 .Xr random 4 ,
 .Xr safe 4 ,
-.Xr ubsec 4 ,
 .Xr crypto 9
 .Sh HISTORY
 The idea for this and the original code came from

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Mon May 11 20:10:01 2020	(r360917)
+++ head/sys/conf/NOTES	Mon May 11 20:30:28 2020	(r360918)
@@ -2630,10 +2630,6 @@ device		hifn		# Hifn 7951, 7781, etc.
 options 	HIFN_DEBUG	# enable debugging support: hw.hifn.debug
 options 	HIFN_RNDTEST	# enable rndtest support
 
-device		ubsec		# Broadcom 5501, 5601, 58xx
-options 	UBSEC_DEBUG	# enable debugging support: hw.ubsec.debug
-options 	UBSEC_RNDTEST	# enable rndtest support
-
 #####################################################################
 
 

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Mon May 11 20:10:01 2020	(r360917)
+++ head/sys/conf/files	Mon May 11 20:30:28 2020	(r360918)
@@ -3182,7 +3182,6 @@ dev/uart/uart_dev_z8530.c	optional uart uart_z8530 | u
 dev/uart/uart_if.m		optional uart
 dev/uart/uart_subr.c		optional uart
 dev/uart/uart_tty.c		optional uart
-dev/ubsec/ubsec.c		optional ubsec
 #
 # USB controller drivers
 #

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Mon May 11 20:10:01 2020	(r360917)
+++ head/sys/conf/options	Mon May 11 20:30:28 2020	(r360918)
@@ -734,11 +734,6 @@ BCE_NVRAM_WRITE_SUPPORT	opt_bce.h
 SOCKBUF_DEBUG		opt_global.h
 
 
-# options for ubsec driver
-UBSEC_DEBUG		opt_ubsec.h
-UBSEC_RNDTEST		opt_ubsec.h
-UBSEC_NO_RNG		opt_ubsec.h
-
 # options for hifn driver
 HIFN_DEBUG		opt_hifn.h
 HIFN_RNDTEST		opt_hifn.h

Modified: head/sys/dev/random/random_harvestq.c
==============================================================================
--- head/sys/dev/random/random_harvestq.c	Mon May 11 20:10:01 2020	(r360917)
+++ head/sys/dev/random/random_harvestq.c	Mon May 11 20:30:28 2020	(r360918)
@@ -347,7 +347,6 @@ static const char *random_source_descr[ENTROPYSOURCE] 
 	[RANDOM_PURE_OCTEON] = "PURE_OCTEON", /* PURE_START */
 	[RANDOM_PURE_SAFE] = "PURE_SAFE",
 	[RANDOM_PURE_GLXSB] = "PURE_GLXSB",
-	[RANDOM_PURE_UBSEC] = "PURE_UBSEC",
 	[RANDOM_PURE_HIFN] = "PURE_HIFN",
 	[RANDOM_PURE_RDRAND] = "PURE_RDRAND",
 	[RANDOM_PURE_NEHEMIAH] = "PURE_NEHEMIAH",

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Mon May 11 20:10:01 2020	(r360917)
+++ head/sys/modules/Makefile	Mon May 11 20:30:28 2020	(r360918)
@@ -354,7 +354,6 @@ SUBDIR=	\
 	twe \
 	tws \
 	uart \
-	ubsec \
 	udf \
 	udf_iconv \
 	ufs \

Modified: head/sys/sys/random.h
==============================================================================
--- head/sys/sys/random.h	Mon May 11 20:10:01 2020	(r360917)
+++ head/sys/sys/random.h	Mon May 11 20:30:28 2020	(r360918)
@@ -92,7 +92,6 @@ enum random_entropy_source {
 	RANDOM_PURE_OCTEON = RANDOM_PURE_START,
 	RANDOM_PURE_SAFE,
 	RANDOM_PURE_GLXSB,
-	RANDOM_PURE_UBSEC,
 	RANDOM_PURE_HIFN,
 	RANDOM_PURE_RDRAND,
 	RANDOM_PURE_NEHEMIAH,