Author: jhb Date: Mon May 11 20:54:59 2020 New Revision: 360924 URL: https://svnweb.freebsd.org/changeset/base/360924
Log: Remove support for the skipjack encryption algorithm. This was removed from IPsec in r286100 and no longer has any in-tree consumers. Reviewed by: cem Relnotes: yes Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D24769 Deleted: head/sys/opencrypto/skipjack.c head/sys/opencrypto/skipjack.h head/sys/opencrypto/xform_skipjack.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:52:18 2020 (r360923) +++ head/share/man/man9/crypto.9 Mon May 11 20:54:59 2020 (r360924) @@ -138,7 +138,6 @@ The following encryption algorithms are supported: .It Dv CRYPTO_DES_CBC .It Dv CRYPTO_3DES_CBC .It Dv CRYPTO_NULL_CBC -.It Dv CRYPTO_SKIPJACK_CBC .El .Pp The following authenticated encryption with additional data (AEAD) Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Mon May 11 20:52:18 2020 (r360923) +++ head/sys/conf/files Mon May 11 20:54:59 2020 (r360924) @@ -4806,7 +4806,6 @@ opencrypto/cryptodeflate.c optional crypto | ipsec | i opencrypto/gmac.c optional crypto | ipsec | ipsec_support opencrypto/gfmult.c optional crypto | ipsec | ipsec_support opencrypto/rmd160.c optional crypto | ipsec | ipsec_support -opencrypto/skipjack.c optional crypto | ipsec | ipsec_support opencrypto/xform.c optional crypto | ipsec | ipsec_support opencrypto/xform_poly1305.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" Modified: head/sys/modules/crypto/Makefile ============================================================================== --- head/sys/modules/crypto/Makefile Mon May 11 20:52:18 2020 (r360923) +++ head/sys/modules/crypto/Makefile Mon May 11 20:54:59 2020 (r360924) @@ -23,7 +23,7 @@ KMOD = crypto SRCS = crypto.c cryptodev_if.c SRCS += criov.c cryptosoft.c xform.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 += 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 SRCS += sha1.c sha256c.c sha512c.c Modified: head/sys/opencrypto/crypto.c ============================================================================== --- head/sys/opencrypto/crypto.c Mon May 11 20:52:18 2020 (r360923) +++ head/sys/opencrypto/crypto.c Mon May 11 20:54:59 2020 (r360924) @@ -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_SKIPJACK_CBC: - return (&enc_xform_skipjack); case CRYPTO_RIJNDAEL128_CBC: return (&enc_xform_rijndael128); case CRYPTO_AES_XTS: @@ -689,7 +687,6 @@ static enum alg_type { [CRYPTO_DES_CBC] = ALG_CIPHER, [CRYPTO_3DES_CBC] = ALG_CIPHER, [CRYPTO_BLF_CBC] = ALG_CIPHER, - [CRYPTO_SKIPJACK_CBC] = ALG_CIPHER, [CRYPTO_MD5_HMAC] = ALG_KEYED_DIGEST, [CRYPTO_SHA1_HMAC] = ALG_KEYED_DIGEST, [CRYPTO_RIPEMD160_HMAC] = ALG_KEYED_DIGEST, Modified: head/sys/opencrypto/cryptodev.h ============================================================================== --- head/sys/opencrypto/cryptodev.h Mon May 11 20:52:18 2020 (r360923) +++ head/sys/opencrypto/cryptodev.h Mon May 11 20:54:59 2020 (r360924) @@ -118,7 +118,6 @@ #define DES_BLOCK_LEN 8 #define DES3_BLOCK_LEN 8 #define BLOWFISH_BLOCK_LEN 8 -#define SKIPJACK_BLOCK_LEN 8 #define RIJNDAEL128_BLOCK_LEN 16 #define AES_BLOCK_LEN 16 #define AES_ICM_BLOCK_LEN 1 @@ -144,8 +143,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 SKIPJACK_MIN_KEY 10 -#define SKIPJACK_MAX_KEY SKIPJACK_MIN_KEY #define RIJNDAEL_MIN_KEY 16 #define RIJNDAEL_MAX_KEY 32 #define AES_MIN_KEY RIJNDAEL_MIN_KEY Modified: head/sys/opencrypto/cryptosoft.c ============================================================================== --- head/sys/opencrypto/cryptosoft.c Mon May 11 20:52:18 2020 (r360923) +++ head/sys/opencrypto/cryptosoft.c Mon May 11 20:54:59 2020 (r360924) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include <crypto/blowfish/blowfish.h> #include <crypto/sha1.h> #include <opencrypto/rmd160.h> -#include <opencrypto/skipjack.h> #include <sys/md5.h> #include <opencrypto/cryptodev.h> Modified: head/sys/opencrypto/xform.c ============================================================================== --- head/sys/opencrypto/xform.c Mon May 11 20:52:18 2020 (r360923) +++ head/sys/opencrypto/xform.c Mon May 11 20:54:59 2020 (r360924) @@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$"); #include <opencrypto/deflate.h> #include <opencrypto/rmd160.h> -#include <opencrypto/skipjack.h> #include <sys/md5.h> @@ -93,7 +92,6 @@ struct enc_xform enc_xform_arc4 = { #include "xform_des1.c" #include "xform_des3.c" #include "xform_blf.c" -#include "xform_skipjack.c" #include "xform_rijndael.c" #include "xform_aes_icm.c" #include "xform_aes_xts.c" Modified: head/sys/opencrypto/xform_enc.h ============================================================================== --- head/sys/opencrypto/xform_enc.h Mon May 11 20:52:18 2020 (r360923) +++ head/sys/opencrypto/xform_enc.h Mon May 11 20:54:59 2020 (r360924) @@ -37,7 +37,6 @@ #include <crypto/des/des.h> #include <crypto/rijndael/rijndael.h> #include <crypto/camellia/camellia.h> -#include <opencrypto/skipjack.h> #include <opencrypto/cryptodev.h> #include <opencrypto/xform_userland.h> @@ -73,7 +72,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_skipjack; extern struct enc_xform enc_xform_rijndael128; extern struct enc_xform enc_xform_aes_icm; extern struct enc_xform enc_xform_aes_nist_gcm; _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
