From owner-svn-src-all@freebsd.org Fri Mar 23 05:37:19 2018 Return-Path: Delivered-To: svn-src-all@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 8CDC8F6EB74; Fri, 23 Mar 2018 05:37:19 +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 3FF37817C2; Fri, 23 Mar 2018 05:37:19 +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 369D51BBA1; Fri, 23 Mar 2018 05:37:19 +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 w2N5bI9W071282; Fri, 23 Mar 2018 05:37:18 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2N5bI6h071280; Fri, 23 Mar 2018 05:37:18 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201803230537.w2N5bI6h071280@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Fri, 23 Mar 2018 05:37:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331418 - 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: 331418 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Mar 2018 05:37:19 -0000 Author: cem Date: Fri Mar 23 05:37:18 2018 New Revision: 331418 URL: https://svnweb.freebsd.org/changeset/base/331418 Log: cryptocheck: Add support for Blake2{B,S} hashes Since they are not yet present in the version of openssl in base, this will require installing the ports openssl. Sponsored by: Dell EMC Isilon Modified: head/tools/tools/crypto/Makefile head/tools/tools/crypto/cryptocheck.c Modified: head/tools/tools/crypto/Makefile ============================================================================== --- head/tools/tools/crypto/Makefile Fri Mar 23 04:31:19 2018 (r331417) +++ head/tools/tools/crypto/Makefile Fri Mar 23 05:37:18 2018 (r331418) @@ -32,7 +32,10 @@ MAN= BINDIR?= /usr/local/bin # cryptocheck: test symmetric crypto functions -LIBADD.cryptocheck+= crypto ssl util +# Use openssl from ports for Blake2 algorithms +CFLAGS.cryptocheck.c+= $$(pkg-config --cflags openssl) +LDFLAGS.cryptocheck+= $$(pkg-config --libs openssl) +LIBADD.cryptocheck+= util # cryptokeytest: test asymmetric crypto functions LIBADD.cryptokeytest+= crypto Modified: head/tools/tools/crypto/cryptocheck.c ============================================================================== --- head/tools/tools/crypto/cryptocheck.c Fri Mar 23 04:31:19 2018 (r331417) +++ head/tools/tools/crypto/cryptocheck.c Fri Mar 23 05:37:18 2018 (r331418) @@ -59,6 +59,8 @@ * sha256 256-bit sha2 hmac * sha384 384-bit sha2 hmac * sha512 512-bit sha2 hmac + * blake2b Blake2-B + * blake2s Blake2-S * * Block Ciphers: * aes-cbc 128-bit aes cbc @@ -115,6 +117,10 @@ struct alg { .evp_md = EVP_sha384 }, { .name = "sha512", .mac = CRYPTO_SHA2_512_HMAC, .type = T_HMAC, .evp_md = EVP_sha512 }, + { .name = "blake2b", .mac = CRYPTO_BLAKE2B, .type = T_HMAC, + .evp_md = EVP_blake2b512 }, + { .name = "blake2s", .mac = CRYPTO_BLAKE2S, .type = T_HMAC, + .evp_md = EVP_blake2s256 }, { .name = "aes-cbc", .cipher = CRYPTO_AES_CBC, .type = T_BLKCIPHER, .evp_cipher = EVP_aes_128_cbc }, { .name = "aes-cbc192", .cipher = CRYPTO_AES_CBC, .type = T_BLKCIPHER,