From: Eric Biggers <ebiggers@kernel.org>
To: linux-crypto@vger.kernel.org, Herbert Xu <herbert@gondor.apana.org.au>
Subject: [PATCH 12/16] crypto: pcbc - remove ability to wrap internal ciphers
Date: Thu, 3 Jan 2019 20:16:21 -0800 [thread overview]
Message-ID: <20190104041625.3259-13-ebiggers@kernel.org> (raw)
In-Reply-To: <20190104041625.3259-1-ebiggers@kernel.org>
From: Eric Biggers <ebiggers@google.com>
Following commit 944585a64f5e ("crypto: x86/aes-ni - remove special
handling of AES in PCBC mode"), it's no longer needed for the PCBC
template to support wrapping a cipher that has the CRYPTO_ALG_INTERNAL
flag set. Thus, remove this now-unused functionality to make PCBC
consistent with the other single block cipher templates.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
crypto/pcbc.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/crypto/pcbc.c b/crypto/pcbc.c
index 1b182dfedc948..4f97a9d069b62 100644
--- a/crypto/pcbc.c
+++ b/crypto/pcbc.c
@@ -219,18 +219,15 @@ static int crypto_pcbc_create(struct crypto_template *tmpl, struct rtattr **tb)
if (IS_ERR(algt))
return PTR_ERR(algt);
- if (((algt->type ^ CRYPTO_ALG_TYPE_SKCIPHER) & algt->mask) &
- ~CRYPTO_ALG_INTERNAL)
+ if ((algt->type ^ CRYPTO_ALG_TYPE_SKCIPHER) & algt->mask)
return -EINVAL;
inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
if (!inst)
return -ENOMEM;
- alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER |
- (algt->type & CRYPTO_ALG_INTERNAL),
- CRYPTO_ALG_TYPE_MASK |
- (algt->mask & CRYPTO_ALG_INTERNAL));
+ alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
+ CRYPTO_ALG_TYPE_MASK);
err = PTR_ERR(alg);
if (IS_ERR(alg))
goto err_free_inst;
@@ -245,7 +242,6 @@ static int crypto_pcbc_create(struct crypto_template *tmpl, struct rtattr **tb)
if (err)
goto err_drop_spawn;
- inst->alg.base.cra_flags = alg->cra_flags & CRYPTO_ALG_INTERNAL;
inst->alg.base.cra_priority = alg->cra_priority;
inst->alg.base.cra_blocksize = alg->cra_blocksize;
inst->alg.base.cra_alignmask = alg->cra_alignmask;
--
2.20.1
next prev parent reply other threads:[~2019-01-04 4:20 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-04 4:16 [PATCH 00/16] crypto: skcipher template simplifications and conversions Eric Biggers
2019-01-04 4:16 ` [PATCH 01/16] crypto: cfb - add missing 'chunksize' property Eric Biggers
[not found] ` <20190104210311.5AC542087F@mail.kernel.org>
2019-01-05 3:07 ` Eric Biggers
2019-01-05 3:40 ` Herbert Xu
2019-01-04 4:16 ` [PATCH 02/16] crypto: cfb - remove bogus memcpy() with src == dest Eric Biggers
2019-01-04 4:16 ` [PATCH 03/16] crypto: ofb - fix handling partial blocks and make thread-safe Eric Biggers
2019-01-06 10:38 ` Gilad Ben-Yossef
2019-01-04 4:16 ` [PATCH 04/16] crypto: pcbc - remove bogus memcpy()s with src == dest Eric Biggers
2019-01-04 9:57 ` David Howells
2019-01-04 17:07 ` Eric Biggers
2019-01-04 17:24 ` David Howells
2019-01-04 4:16 ` [PATCH 05/16] crypto: skcipher - add helper for simple block cipher modes Eric Biggers
2019-01-05 12:03 ` Stephan Mueller
2019-01-06 21:09 ` Eric Biggers
2019-01-04 4:16 ` [PATCH 06/16] crypto: cbc - convert to skcipher_alloc_instance_simple() Eric Biggers
2019-01-04 4:16 ` [PATCH 07/16] crypto: cfb " Eric Biggers
2019-01-04 4:16 ` [PATCH 08/16] crypto: ctr - convert to skcipher API Eric Biggers
2019-01-04 4:16 ` [PATCH 09/16] crypto: ecb " Eric Biggers
2019-01-04 4:16 ` [PATCH 10/16] crypto: keywrap " Eric Biggers
2019-01-05 11:40 ` Stephan Mueller
2019-01-04 4:16 ` [PATCH 11/16] crypto: ofb - convert to skcipher_alloc_instance_simple() Eric Biggers
2019-01-04 4:16 ` Eric Biggers [this message]
2019-01-04 4:16 ` [PATCH 13/16] crypto: pcbc " Eric Biggers
2019-01-04 4:16 ` [PATCH 14/16] crypto: arc4 - convert to skcipher API Eric Biggers
2019-01-04 4:16 ` [PATCH 15/16] crypto: null - convert ecb-cipher_null " Eric Biggers
2019-01-04 4:16 ` [PATCH 16/16] crypto: algapi - remove crypto_alloc_instance() Eric Biggers
2019-01-11 6:33 ` [PATCH 00/16] crypto: skcipher template simplifications and conversions Herbert Xu
2019-01-11 17:58 ` Eric Biggers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190104041625.3259-13-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).