From patchwork Fri Mar 27 22:50:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Mueller X-Patchwork-Id: 6112671 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8D71F9F1C6 for ; Fri, 27 Mar 2015 23:06:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AA3E2203DF for ; Fri, 27 Mar 2015 23:06:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B1556203C3 for ; Fri, 27 Mar 2015 23:06:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932082AbbC0XFj (ORCPT ); Fri, 27 Mar 2015 19:05:39 -0400 Received: from mail.eperm.de ([89.247.134.16]:46771 "EHLO mail.eperm.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753456AbbC0XFi (ORCPT ); Fri, 27 Mar 2015 19:05:38 -0400 Received: from tachyon.chronox.de (mail.eperm.de [89.247.134.16]) by mail.eperm.de (Postfix) with ESMTPSA id AB2612A0E72; Sat, 28 Mar 2015 00:05:23 +0100 (CET) From: Stephan Mueller To: 'Herbert Xu Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 02/20] crypto: testmgr to use CRYPTO_ALG_INTERNAL Date: Fri, 27 Mar 2015 23:50:42 +0100 Message-ID: <1657882.6iCTT84gKK@tachyon.chronox.de> User-Agent: KMail/4.14.4 (Linux/3.19.1-201.fc21.x86_64; KDE/4.14.6; x86_64; ; ) In-Reply-To: <1746748.uPZFXamDiM@tachyon.chronox.de> References: <1746748.uPZFXamDiM@tachyon.chronox.de> MIME-Version: 1.0 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If a cipher allocation fails with -ENOENT, the testmgr now retries to allocate the cipher with CRYPTO_ALG_INTERNAL flag. As all ciphers, including the internal ciphers will be processed by the testmgr, it needs to be able to allocate those ciphers. Signed-off-by: Stephan Mueller --- crypto/testmgr.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/crypto/testmgr.c b/crypto/testmgr.c index 1f879ad..609bafa 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -1506,6 +1506,9 @@ static int alg_test_aead(const struct alg_test_desc *desc, const char *driver, int err = 0; tfm = crypto_alloc_aead(driver, type, mask); + if (PTR_ERR(tfm) == -ENOENT) + tfm = crypto_alloc_aead(driver, type | CRYPTO_ALG_INTERNAL, + mask | CRYPTO_ALG_INTERNAL); if (IS_ERR(tfm)) { printk(KERN_ERR "alg: aead: Failed to load transform for %s: " "%ld\n", driver, PTR_ERR(tfm)); @@ -1535,6 +1538,9 @@ static int alg_test_cipher(const struct alg_test_desc *desc, int err = 0; tfm = crypto_alloc_cipher(driver, type, mask); + if (PTR_ERR(tfm) == -ENOENT) + tfm = crypto_alloc_cipher(driver, type | CRYPTO_ALG_INTERNAL, + mask | CRYPTO_ALG_INTERNAL); if (IS_ERR(tfm)) { printk(KERN_ERR "alg: cipher: Failed to load transform for " "%s: %ld\n", driver, PTR_ERR(tfm)); @@ -1564,6 +1570,10 @@ static int alg_test_skcipher(const struct alg_test_desc *desc, int err = 0; tfm = crypto_alloc_ablkcipher(driver, type, mask); + if (PTR_ERR(tfm) == -ENOENT) + tfm = crypto_alloc_ablkcipher(driver, + type | CRYPTO_ALG_INTERNAL, + mask | CRYPTO_ALG_INTERNAL); if (IS_ERR(tfm)) { printk(KERN_ERR "alg: skcipher: Failed to load transform for " "%s: %ld\n", driver, PTR_ERR(tfm)); @@ -1637,6 +1647,9 @@ static int alg_test_hash(const struct alg_test_desc *desc, const char *driver, int err; tfm = crypto_alloc_ahash(driver, type, mask); + if (PTR_ERR(tfm) == -ENOENT) + tfm = crypto_alloc_ahash(driver, type | CRYPTO_ALG_INTERNAL, + mask | CRYPTO_ALG_INTERNAL); if (IS_ERR(tfm)) { printk(KERN_ERR "alg: hash: Failed to load transform for %s: " "%ld\n", driver, PTR_ERR(tfm)); @@ -1665,6 +1678,9 @@ static int alg_test_crc32c(const struct alg_test_desc *desc, goto out; tfm = crypto_alloc_shash(driver, type, mask); + if (PTR_ERR(tfm) == -ENOENT) + tfm = crypto_alloc_shash(driver, type | CRYPTO_ALG_INTERNAL, + mask | CRYPTO_ALG_INTERNAL); if (IS_ERR(tfm)) { printk(KERN_ERR "alg: crc32c: Failed to load transform for %s: " "%ld\n", driver, PTR_ERR(tfm)); @@ -1707,6 +1723,9 @@ static int alg_test_cprng(const struct alg_test_desc *desc, const char *driver, int err; rng = crypto_alloc_rng(driver, type, mask); + if (PTR_ERR(rng) == -ENOENT) + rng = crypto_alloc_rng(driver, type | CRYPTO_ALG_INTERNAL, + mask | CRYPTO_ALG_INTERNAL); if (IS_ERR(rng)) { printk(KERN_ERR "alg: cprng: Failed to load transform for %s: " "%ld\n", driver, PTR_ERR(rng)); @@ -1734,6 +1753,9 @@ static int drbg_cavs_test(struct drbg_testvec *test, int pr, return -ENOMEM; drng = crypto_alloc_rng(driver, type, mask); + if (PTR_ERR(drng) == -ENOENT) + drng = crypto_alloc_rng(driver, type | CRYPTO_ALG_INTERNAL, + mask | CRYPTO_ALG_INTERNAL); if (IS_ERR(drng)) { printk(KERN_ERR "alg: drbg: could not allocate DRNG handle for " "%s\n", driver);