From patchwork Thu Jul 2 10:19:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 11638459 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D9A0E161F for ; Thu, 2 Jul 2020 10:22:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BFC48206DD for ; Thu, 2 Jul 2020 10:22:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593685367; bh=Dgcjvy0hCTfHOwCVOrjRfrBiKApvt8n4dhLRuzaQnTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=usTHRaHL+Y1PRoHNBViBYuTwL8fJ+3fcrOH6Cqayr5sCpuAF9rjowP6FyjT8LCFXm FHxTT7KTND01ALGDCdGiREjXREgKwDBmECyjxtpc2BojrEWe4YRGjjpxlzlwsWWsRy twhF6E8Whzvm/8b3EtAD4+BxDAYltDm/NVToHow4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728008AbgGBKWJ (ORCPT ); Thu, 2 Jul 2020 06:22:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:59972 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728389AbgGBKUp (ORCPT ); Thu, 2 Jul 2020 06:20:45 -0400 Received: from e123331-lin.nice.arm.com (lfbn-nic-1-188-42.w2-15.abo.wanadoo.fr [2.15.37.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3092E208D5; Thu, 2 Jul 2020 10:20:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593685244; bh=Dgcjvy0hCTfHOwCVOrjRfrBiKApvt8n4dhLRuzaQnTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eih0jVBvh7Y1bN4cY1nF7fJ9CwT3o2BoGfRUZVQM+4FJmd7mGUPmo4UWNkrVfYdiB QtE+5mjRUT1SuE5e5DJezfzxeQKrJTsTgcuMrq10aCUG0TYfa2oHkEK9CcqHd7Gq5J oTxHKpYq7H7UmQRq7PM5eDzFiReX5/NUi4ukBBWA= From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Cc: Ard Biesheuvel , Herbert Xu , "David S. Miller" , Greg Kroah-Hartman , Trond Myklebust , Anna Schumaker , "J. Bruce Fields" , Chuck Lever , Eric Biggers , linux-crypto@vger.kernel.org, netdev@vger.kernel.org, devel@driverdev.osuosl.org, linux-nfs@vger.kernel.org Subject: [RFC PATCH 7/7] crypto: tcrypt - remove ecb(arc4) testing/benchmarking support Date: Thu, 2 Jul 2020 12:19:47 +0200 Message-Id: <20200702101947.682-8-ardb@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200702101947.682-1-ardb@kernel.org> References: <20200702101947.682-1-ardb@kernel.org> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Ard Biesheuvel --- crypto/tcrypt.c | 21 +------ crypto/testmgr.c | 7 --- crypto/testmgr.h | 62 -------------------- 3 files changed, 1 insertion(+), 89 deletions(-) diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index ba0b7702f2e9..72828c4acd3a 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -68,7 +68,7 @@ static char *tvmem[TVMEMSIZE]; static const char *check[] = { "des", "md5", "des3_ede", "rot13", "sha1", "sha224", "sha256", "sm3", "blowfish", "twofish", "serpent", "sha384", "sha512", "md4", "aes", - "cast6", "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea", + "cast6", "michael_mic", "deflate", "crc32c", "tea", "xtea", "khazad", "wp512", "wp384", "wp256", "tnepres", "xeta", "fcrypt", "camellia", "seed", "salsa20", "rmd128", "rmd160", "rmd256", "rmd320", "lzo", "lzo-rle", "cts", "sha3-224", "sha3-256", "sha3-384", @@ -1762,10 +1762,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) ret += tcrypt_test("xts(cast6)"); break; - case 16: - ret += tcrypt_test("ecb(arc4)"); - break; - case 17: ret += tcrypt_test("michael_mic"); break; @@ -2201,11 +2197,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) speed_template_32_64); break; - case 208: - test_cipher_speed("ecb(arc4)", ENCRYPT, sec, NULL, 0, - speed_template_8); - break; - case 209: test_cipher_speed("ecb(cast5)", ENCRYPT, sec, NULL, 0, speed_template_8_16); @@ -2720,11 +2711,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) speed_template_32_48_64); break; - case 505: - test_acipher_speed("ecb(arc4)", ENCRYPT, sec, NULL, 0, - speed_template_8); - break; - case 506: test_acipher_speed("ecb(cast5)", ENCRYPT, sec, NULL, 0, speed_template_8_16); @@ -2932,11 +2918,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) speed_template_32_48_64, num_mb); break; - case 605: - test_mb_skcipher_speed("ecb(arc4)", ENCRYPT, sec, NULL, 0, - speed_template_8, num_mb); - break; - case 606: test_mb_skcipher_speed("ecb(cast5)", ENCRYPT, sec, NULL, 0, speed_template_8_16, num_mb); diff --git a/crypto/testmgr.c b/crypto/testmgr.c index 6863f911fcee..7c1bdc5690e2 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -4783,13 +4783,6 @@ static const struct alg_test_desc alg_test_descs[] = { .suite = { .cipher = __VECS(anubis_tv_template) } - }, { - .alg = "ecb(arc4)", - .generic_driver = "ecb(arc4)-generic", - .test = alg_test_skcipher, - .suite = { - .cipher = __VECS(arc4_tv_template) - } }, { .alg = "ecb(blowfish)", .test = alg_test_skcipher, diff --git a/crypto/testmgr.h b/crypto/testmgr.h index d29983908c38..48cd6330ec8d 100644 --- a/crypto/testmgr.h +++ b/crypto/testmgr.h @@ -22490,68 +22490,6 @@ static const struct cipher_testvec cast5_ctr_tv_template[] = { }, }; -/* - * ARC4 test vectors from OpenSSL - */ -static const struct cipher_testvec arc4_tv_template[] = { - { - .key = "\x01\x23\x45\x67\x89\xab\xcd\xef", - .klen = 8, - .ptext = "\x01\x23\x45\x67\x89\xab\xcd\xef", - .ctext = "\x75\xb7\x87\x80\x99\xe0\xc5\x96", - .len = 8, - }, { - .key = "\x01\x23\x45\x67\x89\xab\xcd\xef", - .klen = 8, - .ptext = "\x00\x00\x00\x00\x00\x00\x00\x00", - .ctext = "\x74\x94\xc2\xe7\x10\x4b\x08\x79", - .len = 8, - }, { - .key = "\x00\x00\x00\x00\x00\x00\x00\x00", - .klen = 8, - .ptext = "\x00\x00\x00\x00\x00\x00\x00\x00", - .ctext = "\xde\x18\x89\x41\xa3\x37\x5d\x3a", - .len = 8, - }, { - .key = "\xef\x01\x23\x45", - .klen = 4, - .ptext = "\x00\x00\x00\x00\x00\x00\x00\x00" - "\x00\x00\x00\x00\x00\x00\x00\x00" - "\x00\x00\x00\x00", - .ctext = "\xd6\xa1\x41\xa7\xec\x3c\x38\xdf" - "\xbd\x61\x5a\x11\x62\xe1\xc7\xba" - "\x36\xb6\x78\x58", - .len = 20, - }, { - .key = "\x01\x23\x45\x67\x89\xab\xcd\xef", - .klen = 8, - .ptext = "\x12\x34\x56\x78\x9A\xBC\xDE\xF0" - "\x12\x34\x56\x78\x9A\xBC\xDE\xF0" - "\x12\x34\x56\x78\x9A\xBC\xDE\xF0" - "\x12\x34\x56\x78", - .ctext = "\x66\xa0\x94\x9f\x8a\xf7\xd6\x89" - "\x1f\x7f\x83\x2b\xa8\x33\xc0\x0c" - "\x89\x2e\xbe\x30\x14\x3c\xe2\x87" - "\x40\x01\x1e\xcf", - .len = 28, - }, { - .key = "\xef\x01\x23\x45", - .klen = 4, - .ptext = "\x00\x00\x00\x00\x00\x00\x00\x00" - "\x00\x00", - .ctext = "\xd6\xa1\x41\xa7\xec\x3c\x38\xdf" - "\xbd\x61", - .len = 10, - }, { - .key = "\x01\x23\x45\x67\x89\xAB\xCD\xEF" - "\x00\x00\x00\x00\x00\x00\x00\x00", - .klen = 16, - .ptext = "\x01\x23\x45\x67\x89\xAB\xCD\xEF", - .ctext = "\x69\x72\x36\x59\x1B\x52\x42\xB1", - .len = 8, - }, -}; - /* * TEA test vectors */