aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/crypto/qce/common.h
diff options
context:
space:
mode:
authorArd Biesheuvel <ardb@kernel.org>2019-11-09 18:09:45 +0100
committerHerbert Xu <herbert@gondor.apana.org.au>2019-11-17 09:02:48 +0800
commit8bf0871539faa090fa057cee83cf06ef4e76e7c5 (patch)
tree7e5de6884a48e4a1f6bdd5b387495481717d1370 /drivers/crypto/qce/common.h
parentb3cde6bab4e8d2d76e3a2f2a41336136a51ee6e7 (diff)
downloadlinux-8bf0871539faa090fa057cee83cf06ef4e76e7c5.tar.gz
crypto: qce - switch to skcipher API
Commit 7a7ffe65c8c5 ("crypto: skcipher - Add top-level skcipher interface") dated 20 august 2015 introduced the new skcipher API which is supposed to replace both blkcipher and ablkcipher. While all consumers of the API have been converted long ago, some producers of the ablkcipher remain, forcing us to keep the ablkcipher support routines alive, along with the matching code to expose [a]blkciphers via the skcipher API. So switch this driver to the skcipher API, allowing us to finally drop the ablkcipher code in the near future. Reviewed-by: Stanimir Varbanov <stanimir.varbanov@linaro.org> Signed-off-by: Ard Biesheuvel <ardb@kernel.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/qce/common.h')
-rw-r--r--drivers/crypto/qce/common.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/crypto/qce/common.h b/drivers/crypto/qce/common.h
index 47fb523357ac..282d4317470d 100644
--- a/drivers/crypto/qce/common.h
+++ b/drivers/crypto/qce/common.h
@@ -10,6 +10,7 @@
#include <linux/types.h>
#include <crypto/aes.h>
#include <crypto/hash.h>
+#include <crypto/internal/skcipher.h>
/* key size in bytes */
#define QCE_SHA_HMAC_KEY_SIZE 64
@@ -79,7 +80,7 @@ struct qce_alg_template {
unsigned long alg_flags;
const u32 *std_iv;
union {
- struct crypto_alg crypto;
+ struct skcipher_alg skcipher;
struct ahash_alg ahash;
} alg;
struct qce_device *qce;