From owner-svn-src-head@freebsd.org Thu Mar 29 04:07: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 2706BF72589; Thu, 29 Mar 2018 04:07: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 C90DF78330; Thu, 29 Mar 2018 04:07:53 +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 C2D2814BAD; Thu, 29 Mar 2018 04:07:53 +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 w2T47rF2014037; Thu, 29 Mar 2018 04:07:53 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2T47rOr014036; Thu, 29 Mar 2018 04:07:53 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201803290407.w2T47rOr014036@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Thu, 29 Mar 2018 04:07:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331725 - head/tools/tools/crypto X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/tools/tools/crypto X-SVN-Commit-Revision: 331725 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: Thu, 29 Mar 2018 04:07:54 -0000 Author: cem Date: Thu Mar 29 04:07:53 2018 New Revision: 331725 URL: https://svnweb.freebsd.org/changeset/base/331725 Log: cryptotest: Add chacha20 cipher Modified: head/tools/tools/crypto/cryptotest.c Modified: head/tools/tools/crypto/cryptotest.c ============================================================================== --- head/tools/tools/crypto/cryptotest.c Thu Mar 29 04:02:50 2018 (r331724) +++ head/tools/tools/crypto/cryptotest.c Thu Mar 29 04:07:53 2018 (r331725) @@ -56,6 +56,7 @@ * aes rijndael/aes 128-bit cbc * aes192 rijndael/aes 192-bit cbc * aes256 rijndael/aes 256-bit cbc + * chacha20 Chacha20 stream cipher * blake2b Blake2b * blake2s Blake2s * md5 md5 hmac @@ -134,6 +135,7 @@ struct alg { { "aes", 0, 16, 16, 16, CRYPTO_AES_CBC}, { "aes192", 0, 16, 24, 24, CRYPTO_AES_CBC}, { "aes256", 0, 16, 32, 32, CRYPTO_AES_CBC}, + { "chacha20", 0, 1, 32, 32, CRYPTO_CHACHA20}, { "blake2b", 1, 128, 64, 64, CRYPTO_BLAKE2B }, { "blake2s", 1, 64, 32, 32, CRYPTO_BLAKE2S }, { "md5", 1, 8, 16, 16, CRYPTO_MD5_HMAC }, @@ -150,7 +152,7 @@ usage(const char* cmd) cmd); printf("where algorithm is one of:\n"); printf(" null des 3des (default) blowfish cast skipjack rij\n"); - printf(" aes aes192 aes256 md5 sha1 sha256 sha384 sha512\n"); + printf(" aes aes192 aes256 chacha20 md5 sha1 sha256 sha384 sha512\n"); printf(" blake2b blake2s\n"); printf(" or an encryption algorithm concatented with authentication\n"); printf(" algorithm with '+' in the middle, e.g., aes+sha1.\n");