From owner-svn-src-head@freebsd.org Mon May 11 20:55:01 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 451682EBFA5; Mon, 11 May 2020 20:55:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49LY9110v2z48Lk; Mon, 11 May 2020 20:55:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1D7EF247D0; Mon, 11 May 2020 20:55:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04BKt0aK022472; Mon, 11 May 2020 20:55:00 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04BKsxS3022425; Mon, 11 May 2020 20:54:59 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202005112054.04BKsxS3022425@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Mon, 11 May 2020 20:54:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r360924 - in head: share/man/man9 sys/conf sys/modules/crypto sys/opencrypto X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in head: share/man/man9 sys/conf sys/modules/crypto sys/opencrypto X-SVN-Commit-Revision: 360924 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2020 20:55:01 -0000 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 #include #include -#include #include #include 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 #include -#include #include @@ -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 #include #include -#include #include #include @@ -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;