From owner-svn-src-head@freebsd.org Fri Mar 16 07:11:54 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9D48F560A2; Fri, 16 Mar 2018 07:11:54 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6E3556FBD1; Fri, 16 Mar 2018 07:11:54 +0000 (UTC) (envelope-from cem@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 6916020F64; Fri, 16 Mar 2018 07:11:54 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2G7BsYt021502; Fri, 16 Mar 2018 07:11:54 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2G7Bs4Z021500; Fri, 16 Mar 2018 07:11:54 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201803160711.w2G7Bs4Z021500@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Fri, 16 Mar 2018 07:11:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331049 - in head/sys: conf crypto/chacha20 modules modules/chacha20 X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: in head/sys: conf crypto/chacha20 modules modules/chacha20 X-SVN-Commit-Revision: 331049 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.25 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: Fri, 16 Mar 2018 07:11:54 -0000 Author: cem Date: Fri Mar 16 07:11:53 2018 New Revision: 331049 URL: https://svnweb.freebsd.org/changeset/base/331049 Log: Garbage collect unused chacha20 code Two copies of chacha20 were imported into the tree on Apr 15 2017 (r316982) and Apr 16 2017 (r317015). Only the latter is actually used by anything, so just go ahead and garbage collect the unused version while it's still only in CURRENT. I'm not making any judgement on which implementation is better. If I pulled the wrong one, feel free to swap the existing implementation out and replace it with the other code (conforming to the API that actually gets used in randomdev, of course). We only need one generic implementation. Sponsored by: Dell EMC Isilon Deleted: head/sys/crypto/chacha20/chacha20.c head/sys/crypto/chacha20/chacha20.h head/sys/modules/chacha20/ Modified: head/sys/conf/files head/sys/modules/Makefile Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Fri Mar 16 07:05:09 2018 (r331048) +++ head/sys/conf/files Fri Mar 16 07:11:53 2018 (r331049) @@ -652,7 +652,6 @@ crypto/blowfish/bf_ecb.c optional ipsec | ipsec_suppor crypto/blowfish/bf_skey.c optional crypto | ipsec | ipsec_support crypto/camellia/camellia.c optional crypto | ipsec | ipsec_support crypto/camellia/camellia-api.c optional crypto | ipsec | ipsec_support -crypto/chacha20/chacha20.c optional chacha20 crypto/des/des_ecb.c optional crypto | ipsec | ipsec_support | netsmb crypto/des/des_setkey.c optional crypto | ipsec | ipsec_support | netsmb crypto/rc4/rc4.c optional netgraph_mppc_encryption | kgssapi Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Fri Mar 16 07:05:09 2018 (r331048) +++ head/sys/modules/Makefile Fri Mar 16 07:11:53 2018 (r331049) @@ -86,7 +86,6 @@ SUBDIR= \ cd9660_iconv \ ${_ce} \ ${_cfi} \ - chacha20 \ ${_chromebook_platform} \ ${_ciss} \ cloudabi \