From nobody Thu Dec 16 22:09:31 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1BBCE18D9676; Thu, 16 Dec 2021 22:09:33 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JFR9S3jrdz3CBJ; Thu, 16 Dec 2021 22:09:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 88C1C10615; Thu, 16 Dec 2021 22:09:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BGM9V1E089237; Thu, 16 Dec 2021 22:09:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BGM9Vh1089236; Thu, 16 Dec 2021 22:09:31 GMT (envelope-from git) Date: Thu, 16 Dec 2021 22:09:31 GMT Message-Id: <202112162209.1BGM9Vh1089236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a62478aa05a1 - main - cryptocheck: Test Camellia-CBC cipher and RIPEMD-160 HMAC. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a62478aa05a10cc7881eebea005bafb1ec3ef406 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639692572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G6pX3x0idcC017qbA5VTA4+gfX71e1RYXHxc1Yl4ZGk=; b=sPGyccS7vcYnnSjcMWRgqDC8Us2L2eXbcV29ral/UQncJQlTKOVZAIPq1nvHo7Lyz9bg4G Q/2qE+LEpfBBYuDAwqAe0/bTQu5O3I57to7pE1bnHq45ybG0xEPDvd/DHYJLn9vmPrWZb2 0gvyshc6wAN3ylaUUIuNMHuSEUmK590k/NH5MGk94KDVlBgNvO8/dQryB4Wczk09uGunPQ nTJRu4yJKPiC14KC8Sx6K/rmRc9EGUQbH0Be7RatGiRbxg73fozJ6xIpBwcvW5YWxTMHti vwM93eiozsGR82aLslmyvDK/3tLEymDbHYhzJh5rGcMyRe2nLIbEzfWxcPQxTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639692572; a=rsa-sha256; cv=none; b=wLAuCFawlXuv30DfHJ/0WRNK+l+PIsyYl3MNk7NZd593gnn18eXfQrJl1IwPGqbSJFXdyI 2CcTIyhwtycEiogiuuVa/W8GYyiPfkqkwXx1+onMaIYaBqE8akO0xTFncSAN4+/KQMI8w/ bCvVFIqYu3rzTf13Pa9M82fFvqJmaOTF+yLrjwjNXy44/fU3V+ggtivdlTBxMcGNPzSld5 GuycLrrfoTieP5JcyBVDjyoc6o1q4y9jpNIx7hwIPbMAbNsZLixVbDktLimq98PrEQtZor 1t1IoJTacbyqHYmhM3FcBNoxaVN5qKxL+qE4be8T+QooJD1xClK1YeTcYIg8ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a62478aa05a10cc7881eebea005bafb1ec3ef406 commit a62478aa05a10cc7881eebea005bafb1ec3ef406 Author: John Baldwin AuthorDate: 2021-12-16 21:48:39 +0000 Commit: John Baldwin CommitDate: 2021-12-16 21:48:39 +0000 cryptocheck: Test Camellia-CBC cipher and RIPEMD-160 HMAC. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33518 --- tools/tools/crypto/cryptocheck.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/tools/crypto/cryptocheck.c b/tools/tools/crypto/cryptocheck.c index 05b761a0c87a..a2343675b927 100644 --- a/tools/tools/crypto/cryptocheck.c +++ b/tools/tools/crypto/cryptocheck.c @@ -86,6 +86,7 @@ * tests * * Hashes: + * ripemd160 160-bit RIPEMD * sha1 SHA-1 * sha224 224-bit SHA-2 * sha256 256-bit SHA-2 @@ -95,6 +96,7 @@ * blake2s Blake2-S * * MACs: + * ripemd160hmac 160-bit RIPEMD HMAC * sha1hmac SHA-1 HMAC * sha224hmac 224-bit SHA-2 HMAC * sha256hmac 256-bit SHA-2 HMAC @@ -114,6 +116,9 @@ * aes-ctr256 256-bit AES-CTR * aes-xts 128-bit AES-XTS * aes-xts256 256-bit AES-XTS + * camellia-cbc 128-bit Camellia-CBC + * camellia-cbc192 192-bit Camellia-CBC + * camellia-cbc256 256-bit Camellia-CBC * chacha20 * * Encrypt then Authenticate: @@ -173,6 +178,8 @@ static const struct alg { .evp_md = EVP_sha384 }, { .name = "sha512", .mac = CRYPTO_SHA2_512, .type = T_HASH, .evp_md = EVP_sha512 }, + { .name = "ripemd160hmac", .mac = CRYPTO_RIPEMD160_HMAC, .type = T_HMAC, + .evp_md = EVP_ripemd160 }, { .name = "sha1hmac", .mac = CRYPTO_SHA1_HMAC, .type = T_HMAC, .evp_md = EVP_sha1 }, { .name = "sha224hmac", .mac = CRYPTO_SHA2_224_HMAC, .type = T_HMAC, @@ -211,6 +218,12 @@ static const struct alg { .evp_cipher = EVP_aes_128_xts }, { .name = "aes-xts256", .cipher = CRYPTO_AES_XTS, .type = T_CIPHER, .evp_cipher = EVP_aes_256_xts }, + { .name = "camellia-cbc", .cipher = CRYPTO_CAMELLIA_CBC, + .type = T_CIPHER, .evp_cipher = EVP_camellia_128_cbc }, + { .name = "camellia-cbc192", .cipher = CRYPTO_CAMELLIA_CBC, + .type = T_CIPHER, .evp_cipher = EVP_camellia_192_cbc }, + { .name = "camellia-cbc256", .cipher = CRYPTO_CAMELLIA_CBC, + .type = T_CIPHER, .evp_cipher = EVP_camellia_256_cbc }, { .name = "chacha20", .cipher = CRYPTO_CHACHA20, .type = T_CIPHER, .evp_cipher = EVP_chacha20 }, { .name = "aes-gcm", .cipher = CRYPTO_AES_NIST_GCM_16, .type = T_AEAD,