svn commit: r360923 - in head: share/man/man9 sys/conf sys/modules/crypto sys/opencrypto

John Baldwin jhb at FreeBSD.org
Mon May 11 20:52:20 UTC 2020 

Author: jhb
Date: Mon May 11 20:52:18 2020
New Revision: 360923
URL: https://svnweb.freebsd.org/changeset/base/360923

Log:
  Remove support for the cast128 encryption algorithm.
  
  It no longer has any in-tree consumers.
  
  Reviewed by:	cem
  Relnotes:	yes
  Sponsored by:	Chelsio Communications
  Differential Revision:	https://reviews.freebsd.org/D24768

Deleted:
  head/sys/opencrypto/cast.c
  head/sys/opencrypto/cast.h
  head/sys/opencrypto/castsb.h
  head/sys/opencrypto/xform_cast5.c
Modified:
  head/share/man/man9/crypto.9
  head/sys/conf/files
  head/sys/modules/crypto/Makefile
  head/sys/opencrypto/crypto.c
  head/sys/opencrypto/cryptodev.h
  head/sys/opencrypto/cryptosoft.c
  head/sys/opencrypto/xform.c
  head/sys/opencrypto/xform_enc.h

Modified: head/share/man/man9/crypto.9
==============================================================================
--- head/share/man/man9/crypto.9	Mon May 11 20:41:27 2020	(r360922)
+++ head/share/man/man9/crypto.9	Mon May 11 20:52:18 2020	(r360923)
@@ -134,7 +134,6 @@ The following encryption algorithms are supported:
 .It Dv CRYPTO_ARC4
 .It Dv CRYPTO_BLF_CBC
 .It Dv CRYPTO_CAMELLIA_CBC
-.It Dv CRYPTO_CAST_CBC
 .It Dv CRYPTO_CHACHA20
 .It Dv CRYPTO_DES_CBC
 .It Dv CRYPTO_3DES_CBC

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Mon May 11 20:41:27 2020	(r360922)
+++ head/sys/conf/files	Mon May 11 20:52:18 2020	(r360923)
@@ -4797,7 +4797,6 @@ dev/mlx5/mlx5_en/mlx5_en_port_buffer.c		optional mlx5e
 	compile-with "${OFED_C}"
 
 # crypto support
-opencrypto/cast.c		optional crypto | ipsec | ipsec_support
 opencrypto/criov.c		optional crypto | ipsec | ipsec_support
 opencrypto/crypto.c		optional crypto | ipsec | ipsec_support
 opencrypto/cryptodev.c		optional cryptodev

Modified: head/sys/modules/crypto/Makefile
==============================================================================
--- head/sys/modules/crypto/Makefile	Mon May 11 20:41:27 2020	(r360922)
+++ head/sys/modules/crypto/Makefile	Mon May 11 20:52:18 2020	(r360923)
@@ -22,7 +22,7 @@ LIBSODIUM=${SRCTOP}/sys/contrib/libsodium/src/libsodiu
 KMOD	= crypto
 SRCS	= crypto.c cryptodev_if.c
 SRCS	+= criov.c cryptosoft.c xform.c
-SRCS	+= cast.c cryptodeflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c rijndael-api-fst.c
+SRCS	+= cryptodeflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c rijndael-api-fst.c
 SRCS	+= skipjack.c bf_enc.c bf_ecb.c bf_skey.c
 SRCS	+= camellia.c camellia-api.c
 SRCS	+= des_ecb.c des_enc.c des_setkey.c

Modified: head/sys/opencrypto/crypto.c
==============================================================================
--- head/sys/opencrypto/crypto.c	Mon May 11 20:41:27 2020	(r360922)
+++ head/sys/opencrypto/crypto.c	Mon May 11 20:52:18 2020	(r360923)
@@ -604,8 +604,6 @@ crypto_cipher(const struct crypto_session_params *csp)
 		return (&enc_xform_3des);
 	case CRYPTO_BLF_CBC:
 		return (&enc_xform_blf);
-	case CRYPTO_CAST_CBC:
-		return (&enc_xform_cast5);
 	case CRYPTO_SKIPJACK_CBC:
 		return (&enc_xform_skipjack);
 	case CRYPTO_RIJNDAEL128_CBC:
@@ -691,7 +689,6 @@ static enum alg_type {
 	[CRYPTO_DES_CBC] = ALG_CIPHER,
 	[CRYPTO_3DES_CBC] = ALG_CIPHER,
 	[CRYPTO_BLF_CBC] = ALG_CIPHER,
-	[CRYPTO_CAST_CBC] = ALG_CIPHER,
 	[CRYPTO_SKIPJACK_CBC] = ALG_CIPHER,
 	[CRYPTO_MD5_HMAC] = ALG_KEYED_DIGEST,
 	[CRYPTO_SHA1_HMAC] = ALG_KEYED_DIGEST,

Modified: head/sys/opencrypto/cryptodev.h
==============================================================================
--- head/sys/opencrypto/cryptodev.h	Mon May 11 20:41:27 2020	(r360922)
+++ head/sys/opencrypto/cryptodev.h	Mon May 11 20:52:18 2020	(r360923)
@@ -119,7 +119,6 @@
 #define	DES3_BLOCK_LEN		8
 #define	BLOWFISH_BLOCK_LEN	8
 #define	SKIPJACK_BLOCK_LEN	8
-#define	CAST128_BLOCK_LEN	8
 #define	RIJNDAEL128_BLOCK_LEN	16
 #define	AES_BLOCK_LEN		16
 #define	AES_ICM_BLOCK_LEN	1
@@ -145,8 +144,6 @@
 #define	TRIPLE_DES_MAX_KEY	TRIPLE_DES_MIN_KEY
 #define	BLOWFISH_MIN_KEY	5
 #define	BLOWFISH_MAX_KEY	56 /* 448 bits, max key */
-#define	CAST_MIN_KEY		5
-#define	CAST_MAX_KEY		16
 #define	SKIPJACK_MIN_KEY	10
 #define	SKIPJACK_MAX_KEY	SKIPJACK_MIN_KEY
 #define	RIJNDAEL_MIN_KEY	16

Modified: head/sys/opencrypto/cryptosoft.c
==============================================================================
--- head/sys/opencrypto/cryptosoft.c	Mon May 11 20:41:27 2020	(r360922)
+++ head/sys/opencrypto/cryptosoft.c	Mon May 11 20:52:18 2020	(r360923)
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <crypto/blowfish/blowfish.h>
 #include <crypto/sha1.h>
 #include <opencrypto/rmd160.h>
-#include <opencrypto/cast.h>
 #include <opencrypto/skipjack.h>
 #include <sys/md5.h>
 

Modified: head/sys/opencrypto/xform.c
==============================================================================
--- head/sys/opencrypto/xform.c	Mon May 11 20:41:27 2020	(r360922)
+++ head/sys/opencrypto/xform.c	Mon May 11 20:52:18 2020	(r360923)
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
 #include <crypto/camellia/camellia.h>
 #include <crypto/sha1.h>
 
-#include <opencrypto/cast.h>
 #include <opencrypto/deflate.h>
 #include <opencrypto/rmd160.h>
 #include <opencrypto/skipjack.h>
@@ -94,7 +93,6 @@ struct enc_xform enc_xform_arc4 = {
 #include "xform_des1.c"
 #include "xform_des3.c"
 #include "xform_blf.c"
-#include "xform_cast5.c"
 #include "xform_skipjack.c"
 #include "xform_rijndael.c"
 #include "xform_aes_icm.c"

Modified: head/sys/opencrypto/xform_enc.h
==============================================================================
--- head/sys/opencrypto/xform_enc.h	Mon May 11 20:41:27 2020	(r360922)
+++ head/sys/opencrypto/xform_enc.h	Mon May 11 20:52:18 2020	(r360923)
@@ -37,7 +37,6 @@
 #include <crypto/des/des.h>
 #include <crypto/rijndael/rijndael.h>
 #include <crypto/camellia/camellia.h>
-#include <opencrypto/cast.h>
 #include <opencrypto/skipjack.h>
 #include <opencrypto/cryptodev.h>
 #include <opencrypto/xform_userland.h>
@@ -74,7 +73,6 @@ extern struct enc_xform enc_xform_null;
 extern struct enc_xform enc_xform_des;
 extern struct enc_xform enc_xform_3des;
 extern struct enc_xform enc_xform_blf;
-extern struct enc_xform enc_xform_cast5;
 extern struct enc_xform enc_xform_skipjack;
 extern struct enc_xform enc_xform_rijndael128;
 extern struct enc_xform enc_xform_aes_icm;

More information about the svn-src-head mailing list