Skip to content

L
linux
Commit 7ada42d2 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files
Options

crypto: atmel-aes - switch to skcipher API 

Commit 7a7ffe65 ("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.

Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Ludovic Desroches <ludovic.desroches@microchip.com>
Tested-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Reviewed-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e6b98ce6
Show whitespace changes
Inline Side-by-side
Showing with 247 additions and 264 deletions
drivers/crypto/atmel-aes.c
View file @ 7ada42d2
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <crypto/gcm.h> #include <crypto/gcm.h>
#include <crypto/xts.h> #include <crypto/xts.h>
#include <crypto/internal/aead.h> #include <crypto/internal/aead.h>
#include <crypto/internal/skcipher.h>
#include <linux/platform_data/crypto-atmel.h> #include <linux/platform_data/crypto-atmel.h>
#include <dt-bindings/dma/at91.h> #include <dt-bindings/dma/at91.h>
#include "atmel-aes-regs.h" #include "atmel-aes-regs.h"
...@@ -492,23 +493,23 @@ static void atmel_aes_authenc_complete(struct atmel_aes_dev *dd, int err); ...@@ -492,23 +493,23 @@ static void atmel_aes_authenc_complete(struct atmel_aes_dev *dd, int err);
static void atmel_aes_set_iv_as_last_ciphertext_block(struct atmel_aes_dev *dd) static void atmel_aes_set_iv_as_last_ciphertext_block(struct atmel_aes_dev *dd)
{ {
struct ablkcipher_request *req = ablkcipher_request_cast(dd->areq); struct skcipher_request *req = skcipher_request_cast(dd->areq);
struct atmel_aes_reqctx *rctx = ablkcipher_request_ctx(req); struct atmel_aes_reqctx *rctx = skcipher_request_ctx(req);
struct crypto_ablkcipher *ablkcipher = crypto_ablkcipher_reqtfm(req); struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req);
unsigned int ivsize = crypto_ablkcipher_ivsize(ablkcipher); unsigned int ivsize = crypto_skcipher_ivsize(skcipher);
if (req->nbytes < ivsize) if (req->cryptlen < ivsize)
return; return;
if (rctx->mode & AES_FLAGS_ENCRYPT) { if (rctx->mode & AES_FLAGS_ENCRYPT) {
scatterwalk_map_and_copy(req->info, req->dst, scatterwalk_map_and_copy(req->iv, req->dst,
req->nbytes - ivsize, ivsize, 0); req->cryptlen - ivsize, ivsize, 0);
} else { } else {
if (req->src == req->dst) if (req->src == req->dst)
memcpy(req->info, rctx->lastc, ivsize); memcpy(req->iv, rctx->lastc, ivsize);
else else
scatterwalk_map_and_copy(req->info, req->src, scatterwalk_map_and_copy(req->iv, req->src,
req->nbytes - ivsize, req->cryptlen - ivsize,
ivsize, 0); ivsize, 0);
} }
} }
...@@ -981,9 +982,9 @@ static int atmel_aes_transfer_complete(struct atmel_aes_dev *dd) ...@@ -981,9 +982,9 @@ static int atmel_aes_transfer_complete(struct atmel_aes_dev *dd)
static int atmel_aes_start(struct atmel_aes_dev *dd) static int atmel_aes_start(struct atmel_aes_dev *dd)
{ {
struct ablkcipher_request *req = ablkcipher_request_cast(dd->areq); struct skcipher_request *req = skcipher_request_cast(dd->areq);
struct atmel_aes_reqctx *rctx = ablkcipher_request_ctx(req); struct atmel_aes_reqctx *rctx = skcipher_request_ctx(req);
bool use_dma = (req->nbytes >= ATMEL_AES_DMA_THRESHOLD || bool use_dma = (req->cryptlen >= ATMEL_AES_DMA_THRESHOLD ||
dd->ctx->block_size != AES_BLOCK_SIZE); dd->ctx->block_size != AES_BLOCK_SIZE);
int err; int err;
...@@ -993,12 +994,13 @@ static int atmel_aes_start(struct atmel_aes_dev *dd) ...@@ -993,12 +994,13 @@ static int atmel_aes_start(struct atmel_aes_dev *dd)
if (err) if (err)
return atmel_aes_complete(dd, err); return atmel_aes_complete(dd, err);
atmel_aes_write_ctrl(dd, use_dma, req->info); atmel_aes_write_ctrl(dd, use_dma, (void *)req->iv);
if (use_dma) if (use_dma)
return atmel_aes_dma_start(dd, req->src, req->dst, req->nbytes, return atmel_aes_dma_start(dd, req->src, req->dst,
req->cryptlen,
atmel_aes_transfer_complete); atmel_aes_transfer_complete);
return atmel_aes_cpu_start(dd, req->src, req->dst, req->nbytes, return atmel_aes_cpu_start(dd, req->src, req->dst, req->cryptlen,
atmel_aes_transfer_complete); atmel_aes_transfer_complete);
} }
...@@ -1011,7 +1013,7 @@ atmel_aes_ctr_ctx_cast(struct atmel_aes_base_ctx *ctx) ...@@ -1011,7 +1013,7 @@ atmel_aes_ctr_ctx_cast(struct atmel_aes_base_ctx *ctx)
static int atmel_aes_ctr_transfer(struct atmel_aes_dev *dd) static int atmel_aes_ctr_transfer(struct atmel_aes_dev *dd)
{ {
struct atmel_aes_ctr_ctx *ctx = atmel_aes_ctr_ctx_cast(dd->ctx); struct atmel_aes_ctr_ctx *ctx = atmel_aes_ctr_ctx_cast(dd->ctx);
struct ablkcipher_request *req = ablkcipher_request_cast(dd->areq); struct skcipher_request *req = skcipher_request_cast(dd->areq);
struct scatterlist *src, *dst; struct scatterlist *src, *dst;
u32 ctr, blocks; u32 ctr, blocks;
size_t datalen; size_t datalen;
...@@ -1019,11 +1021,11 @@ static int atmel_aes_ctr_transfer(struct atmel_aes_dev *dd) ...@@ -1019,11 +1021,11 @@ static int atmel_aes_ctr_transfer(struct atmel_aes_dev *dd)
/* Check for transfer completion. */ /* Check for transfer completion. */
ctx->offset += dd->total; ctx->offset += dd->total;
if (ctx->offset >= req->nbytes) if (ctx->offset >= req->cryptlen)
return atmel_aes_transfer_complete(dd); return atmel_aes_transfer_complete(dd);
/* Compute data length. */ /* Compute data length. */
datalen = req->nbytes - ctx->offset; datalen = req->cryptlen - ctx->offset;
blocks = DIV_ROUND_UP(datalen, AES_BLOCK_SIZE); blocks = DIV_ROUND_UP(datalen, AES_BLOCK_SIZE);
ctr = be32_to_cpu(ctx->iv[3]); ctr = be32_to_cpu(ctx->iv[3]);
if (dd->caps.has_ctr32) { if (dd->caps.has_ctr32) {
...@@ -1076,8 +1078,8 @@ static int atmel_aes_ctr_transfer(struct atmel_aes_dev *dd) ...@@ -1076,8 +1078,8 @@ static int atmel_aes_ctr_transfer(struct atmel_aes_dev *dd)
static int atmel_aes_ctr_start(struct atmel_aes_dev *dd) static int atmel_aes_ctr_start(struct atmel_aes_dev *dd)
{ {
struct atmel_aes_ctr_ctx *ctx = atmel_aes_ctr_ctx_cast(dd->ctx); struct atmel_aes_ctr_ctx *ctx = atmel_aes_ctr_ctx_cast(dd->ctx);
struct ablkcipher_request *req = ablkcipher_request_cast(dd->areq); struct skcipher_request *req = skcipher_request_cast(dd->areq);
struct atmel_aes_reqctx *rctx = ablkcipher_request_ctx(req); struct atmel_aes_reqctx *rctx = skcipher_request_ctx(req);
int err; int err;
atmel_aes_set_mode(dd, rctx); atmel_aes_set_mode(dd, rctx);
...@@ -1086,16 +1088,16 @@ static int atmel_aes_ctr_start(struct atmel_aes_dev *dd) ...@@ -1086,16 +1088,16 @@ static int atmel_aes_ctr_start(struct atmel_aes_dev *dd)
if (err) if (err)
return atmel_aes_complete(dd, err); return atmel_aes_complete(dd, err);
memcpy(ctx->iv, req->info, AES_BLOCK_SIZE); memcpy(ctx->iv, req->iv, AES_BLOCK_SIZE);
ctx->offset = 0; ctx->offset = 0;
dd->total = 0; dd->total = 0;
return atmel_aes_ctr_transfer(dd); return atmel_aes_ctr_transfer(dd);
} }
static int atmel_aes_crypt(struct ablkcipher_request *req, unsigned long mode) static int atmel_aes_crypt(struct skcipher_request *req, unsigned long mode)
{ {
struct crypto_ablkcipher *ablkcipher = crypto_ablkcipher_reqtfm(req); struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req);
struct atmel_aes_base_ctx *ctx = crypto_ablkcipher_ctx(ablkcipher); struct atmel_aes_base_ctx *ctx = crypto_skcipher_ctx(skcipher);
struct atmel_aes_reqctx *rctx; struct atmel_aes_reqctx *rctx;
struct atmel_aes_dev *dd; struct atmel_aes_dev *dd;
...@@ -1126,30 +1128,30 @@ static int atmel_aes_crypt(struct ablkcipher_request *req, unsigned long mode) ...@@ -1126,30 +1128,30 @@ static int atmel_aes_crypt(struct ablkcipher_request *req, unsigned long mode)
if (!dd) if (!dd)
return -ENODEV; return -ENODEV;
rctx = ablkcipher_request_ctx(req); rctx = skcipher_request_ctx(req);
rctx->mode = mode; rctx->mode = mode;
if (!(mode & AES_FLAGS_ENCRYPT) && (req->src == req->dst)) { if (!(mode & AES_FLAGS_ENCRYPT) && (req->src == req->dst)) {
unsigned int ivsize = crypto_ablkcipher_ivsize(ablkcipher); unsigned int ivsize = crypto_skcipher_ivsize(skcipher);
if (req->nbytes >= ivsize) if (req->cryptlen >= ivsize)
scatterwalk_map_and_copy(rctx->lastc, req->src, scatterwalk_map_and_copy(rctx->lastc, req->src,
req->nbytes - ivsize, req->cryptlen - ivsize,
ivsize, 0); ivsize, 0);
} }
return atmel_aes_handle_queue(dd, &req->base); return atmel_aes_handle_queue(dd, &req->base);
} }
static int atmel_aes_setkey(struct crypto_ablkcipher *tfm, const u8 *key, static int atmel_aes_setkey(struct crypto_skcipher *tfm, const u8 *key,
unsigned int keylen) unsigned int keylen)
{ {
struct atmel_aes_base_ctx *ctx = crypto_ablkcipher_ctx(tfm); struct atmel_aes_base_ctx *ctx = crypto_skcipher_ctx(tfm);
if (keylen != AES_KEYSIZE_128 && if (keylen != AES_KEYSIZE_128 &&
keylen != AES_KEYSIZE_192 && keylen != AES_KEYSIZE_192 &&
keylen != AES_KEYSIZE_256) { keylen != AES_KEYSIZE_256) {
crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN); crypto_skcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
return -EINVAL; return -EINVAL;
} }
...@@ -1159,297 +1161,279 @@ static int atmel_aes_setkey(struct crypto_ablkcipher *tfm, const u8 *key, ...@@ -1159,297 +1161,279 @@ static int atmel_aes_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
return 0; return 0;
} }
static int atmel_aes_ecb_encrypt(struct ablkcipher_request *req) static int atmel_aes_ecb_encrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_ECB | AES_FLAGS_ENCRYPT); return atmel_aes_crypt(req, AES_FLAGS_ECB | AES_FLAGS_ENCRYPT);
} }
static int atmel_aes_ecb_decrypt(struct ablkcipher_request *req) static int atmel_aes_ecb_decrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_ECB); return atmel_aes_crypt(req, AES_FLAGS_ECB);
} }
static int atmel_aes_cbc_encrypt(struct ablkcipher_request *req) static int atmel_aes_cbc_encrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_CBC | AES_FLAGS_ENCRYPT); return atmel_aes_crypt(req, AES_FLAGS_CBC | AES_FLAGS_ENCRYPT);
} }
static int atmel_aes_cbc_decrypt(struct ablkcipher_request *req) static int atmel_aes_cbc_decrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_CBC); return atmel_aes_crypt(req, AES_FLAGS_CBC);
} }
static int atmel_aes_ofb_encrypt(struct ablkcipher_request *req) static int atmel_aes_ofb_encrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_OFB | AES_FLAGS_ENCRYPT); return atmel_aes_crypt(req, AES_FLAGS_OFB | AES_FLAGS_ENCRYPT);
} }
static int atmel_aes_ofb_decrypt(struct ablkcipher_request *req) static int atmel_aes_ofb_decrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_OFB); return atmel_aes_crypt(req, AES_FLAGS_OFB);
} }
static int atmel_aes_cfb_encrypt(struct ablkcipher_request *req) static int atmel_aes_cfb_encrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_CFB128 | AES_FLAGS_ENCRYPT); return atmel_aes_crypt(req, AES_FLAGS_CFB128 | AES_FLAGS_ENCRYPT);
} }
static int atmel_aes_cfb_decrypt(struct ablkcipher_request *req) static int atmel_aes_cfb_decrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_CFB128); return atmel_aes_crypt(req, AES_FLAGS_CFB128);
} }
static int atmel_aes_cfb64_encrypt(struct ablkcipher_request *req) static int atmel_aes_cfb64_encrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_CFB64 | AES_FLAGS_ENCRYPT); return atmel_aes_crypt(req, AES_FLAGS_CFB64 | AES_FLAGS_ENCRYPT);
} }
static int atmel_aes_cfb64_decrypt(struct ablkcipher_request *req) static int atmel_aes_cfb64_decrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_CFB64); return atmel_aes_crypt(req, AES_FLAGS_CFB64);
} }
static int atmel_aes_cfb32_encrypt(struct ablkcipher_request *req) static int atmel_aes_cfb32_encrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_CFB32 | AES_FLAGS_ENCRYPT); return atmel_aes_crypt(req, AES_FLAGS_CFB32 | AES_FLAGS_ENCRYPT);
} }
static int atmel_aes_cfb32_decrypt(struct ablkcipher_request *req) static int atmel_aes_cfb32_decrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_CFB32); return atmel_aes_crypt(req, AES_FLAGS_CFB32);
} }
static int atmel_aes_cfb16_encrypt(struct ablkcipher_request *req) static int atmel_aes_cfb16_encrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_CFB16 | AES_FLAGS_ENCRYPT); return atmel_aes_crypt(req, AES_FLAGS_CFB16 | AES_FLAGS_ENCRYPT);
} }
static int atmel_aes_cfb16_decrypt(struct ablkcipher_request *req) static int atmel_aes_cfb16_decrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_CFB16); return atmel_aes_crypt(req, AES_FLAGS_CFB16);
} }
static int atmel_aes_cfb8_encrypt(struct ablkcipher_request *req) static int atmel_aes_cfb8_encrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_CFB8 | AES_FLAGS_ENCRYPT); return atmel_aes_crypt(req, AES_FLAGS_CFB8 | AES_FLAGS_ENCRYPT);
} }
static int atmel_aes_cfb8_decrypt(struct ablkcipher_request *req) static int atmel_aes_cfb8_decrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_CFB8); return atmel_aes_crypt(req, AES_FLAGS_CFB8);
} }
static int atmel_aes_ctr_encrypt(struct ablkcipher_request *req) static int atmel_aes_ctr_encrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_CTR | AES_FLAGS_ENCRYPT); return atmel_aes_crypt(req, AES_FLAGS_CTR | AES_FLAGS_ENCRYPT);
} }
static int atmel_aes_ctr_decrypt(struct ablkcipher_request *req) static int atmel_aes_ctr_decrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_CTR); return atmel_aes_crypt(req, AES_FLAGS_CTR);
} }
static int atmel_aes_cra_init(struct crypto_tfm *tfm) static int atmel_aes_init_tfm(struct crypto_skcipher *tfm)
{ {
struct atmel_aes_ctx *ctx = crypto_tfm_ctx(tfm); struct atmel_aes_ctx *ctx = crypto_skcipher_ctx(tfm);
tfm->crt_ablkcipher.reqsize = sizeof(struct atmel_aes_reqctx); crypto_skcipher_set_reqsize(tfm, sizeof(struct atmel_aes_reqctx));
ctx->base.start = atmel_aes_start; ctx->base.start = atmel_aes_start;
return 0; return 0;
} }
static int atmel_aes_ctr_cra_init(struct crypto_tfm *tfm) static int atmel_aes_ctr_init_tfm(struct crypto_skcipher *tfm)
{ {
struct atmel_aes_ctx *ctx = crypto_tfm_ctx(tfm); struct atmel_aes_ctx *ctx = crypto_skcipher_ctx(tfm);
tfm->crt_ablkcipher.reqsize = sizeof(struct atmel_aes_reqctx); crypto_skcipher_set_reqsize(tfm, sizeof(struct atmel_aes_reqctx));
ctx->base.start = atmel_aes_ctr_start; ctx->base.start = atmel_aes_ctr_start;
return 0; return 0;
} }
static struct crypto_alg aes_algs[] = { static struct skcipher_alg aes_algs[] = {
{ {
.cra_name = "ecb(aes)", .base.cra_name = "ecb(aes)",
.cra_driver_name = "atmel-ecb-aes", .base.cra_driver_name = "atmel-ecb-aes",
.cra_priority = ATMEL_AES_PRIORITY, .base.cra_priority = ATMEL_AES_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .base.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = AES_BLOCK_SIZE, .base.cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct atmel_aes_ctx), .base.cra_ctxsize = sizeof(struct atmel_aes_ctx),
.cra_alignmask = 0xf, .base.cra_alignmask = 0xf,
.cra_type = &crypto_ablkcipher_type, .base.cra_module = THIS_MODULE,
.cra_module = THIS_MODULE,
.cra_init = atmel_aes_cra_init, .init = atmel_aes_init_tfm,
.cra_u.ablkcipher = {
.min_keysize = AES_MIN_KEY_SIZE, .min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE,
.setkey = atmel_aes_setkey, .setkey = atmel_aes_setkey,
.encrypt = atmel_aes_ecb_encrypt, .encrypt = atmel_aes_ecb_encrypt,
.decrypt = atmel_aes_ecb_decrypt, .decrypt = atmel_aes_ecb_decrypt,
}
}, },
{ {
.cra_name = "cbc(aes)", .base.cra_name = "cbc(aes)",
.cra_driver_name = "atmel-cbc-aes", .base.cra_driver_name = "atmel-cbc-aes",
.cra_priority = ATMEL_AES_PRIORITY, .base.cra_priority = ATMEL_AES_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .base.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = AES_BLOCK_SIZE, .base.cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct atmel_aes_ctx), .base.cra_ctxsize = sizeof(struct atmel_aes_ctx),
.cra_alignmask = 0xf, .base.cra_alignmask = 0xf,
.cra_type = &crypto_ablkcipher_type, .base.cra_module = THIS_MODULE,
.cra_module = THIS_MODULE,
.cra_init = atmel_aes_cra_init, .init = atmel_aes_init_tfm,
.cra_u.ablkcipher = {
.min_keysize = AES_MIN_KEY_SIZE, .min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE,
.ivsize = AES_BLOCK_SIZE,
.setkey = atmel_aes_setkey, .setkey = atmel_aes_setkey,
.encrypt = atmel_aes_cbc_encrypt, .encrypt = atmel_aes_cbc_encrypt,
.decrypt = atmel_aes_cbc_decrypt, .decrypt = atmel_aes_cbc_decrypt,
} .ivsize = AES_BLOCK_SIZE,
}, },
{ {
.cra_name = "ofb(aes)", .base.cra_name = "ofb(aes)",
.cra_driver_name = "atmel-ofb-aes", .base.cra_driver_name = "atmel-ofb-aes",
.cra_priority = ATMEL_AES_PRIORITY, .base.cra_priority = ATMEL_AES_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .base.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = AES_BLOCK_SIZE, .base.cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct atmel_aes_ctx), .base.cra_ctxsize = sizeof(struct atmel_aes_ctx),
.cra_alignmask = 0xf, .base.cra_alignmask = 0xf,
.cra_type = &crypto_ablkcipher_type, .base.cra_module = THIS_MODULE,
.cra_module = THIS_MODULE,
.cra_init = atmel_aes_cra_init, .init = atmel_aes_init_tfm,
.cra_u.ablkcipher = {
.min_keysize = AES_MIN_KEY_SIZE, .min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE,
.ivsize = AES_BLOCK_SIZE,
.setkey = atmel_aes_setkey, .setkey = atmel_aes_setkey,
.encrypt = atmel_aes_ofb_encrypt, .encrypt = atmel_aes_ofb_encrypt,
.decrypt = atmel_aes_ofb_decrypt, .decrypt = atmel_aes_ofb_decrypt,
} .ivsize = AES_BLOCK_SIZE,
}, },
{ {
.cra_name = "cfb(aes)", .base.cra_name = "cfb(aes)",
.cra_driver_name = "atmel-cfb-aes", .base.cra_driver_name = "atmel-cfb-aes",
.cra_priority = ATMEL_AES_PRIORITY, .base.cra_priority = ATMEL_AES_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .base.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = AES_BLOCK_SIZE, .base.cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct atmel_aes_ctx), .base.cra_ctxsize = sizeof(struct atmel_aes_ctx),
.cra_alignmask = 0xf, .base.cra_alignmask = 0xf,
.cra_type = &crypto_ablkcipher_type, .base.cra_module = THIS_MODULE,
.cra_module = THIS_MODULE,
.cra_init = atmel_aes_cra_init, .init = atmel_aes_init_tfm,
.cra_u.ablkcipher = {
.min_keysize = AES_MIN_KEY_SIZE, .min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE,
.ivsize = AES_BLOCK_SIZE,
.setkey = atmel_aes_setkey, .setkey = atmel_aes_setkey,
.encrypt = atmel_aes_cfb_encrypt, .encrypt = atmel_aes_cfb_encrypt,
.decrypt = atmel_aes_cfb_decrypt, .decrypt = atmel_aes_cfb_decrypt,
} .ivsize = AES_BLOCK_SIZE,
}, },
{ {
.cra_name = "cfb32(aes)", .base.cra_name = "cfb32(aes)",
.cra_driver_name = "atmel-cfb32-aes", .base.cra_driver_name = "atmel-cfb32-aes",
.cra_priority = ATMEL_AES_PRIORITY, .base.cra_priority = ATMEL_AES_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .base.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = CFB32_BLOCK_SIZE, .base.cra_blocksize = CFB32_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct atmel_aes_ctx), .base.cra_ctxsize = sizeof(struct atmel_aes_ctx),
.cra_alignmask = 0x3, .base.cra_alignmask = 0xf,
.cra_type = &crypto_ablkcipher_type, .base.cra_module = THIS_MODULE,
.cra_module = THIS_MODULE,
.cra_init = atmel_aes_cra_init, .init = atmel_aes_init_tfm,
.cra_u.ablkcipher = {
.min_keysize = AES_MIN_KEY_SIZE, .min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE,
.ivsize = AES_BLOCK_SIZE,
.setkey = atmel_aes_setkey, .setkey = atmel_aes_setkey,
.encrypt = atmel_aes_cfb32_encrypt, .encrypt = atmel_aes_cfb32_encrypt,
.decrypt = atmel_aes_cfb32_decrypt, .decrypt = atmel_aes_cfb32_decrypt,
} .ivsize = AES_BLOCK_SIZE,
}, },
{ {
.cra_name = "cfb16(aes)", .base.cra_name = "cfb16(aes)",
.cra_driver_name = "atmel-cfb16-aes", .base.cra_driver_name = "atmel-cfb16-aes",
.cra_priority = ATMEL_AES_PRIORITY, .base.cra_priority = ATMEL_AES_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .base.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = CFB16_BLOCK_SIZE, .base.cra_blocksize = CFB16_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct atmel_aes_ctx), .base.cra_ctxsize = sizeof(struct atmel_aes_ctx),
.cra_alignmask = 0x1, .base.cra_alignmask = 0xf,
.cra_type = &crypto_ablkcipher_type, .base.cra_module = THIS_MODULE,
.cra_module = THIS_MODULE,
.cra_init = atmel_aes_cra_init, .init = atmel_aes_init_tfm,
.cra_u.ablkcipher = {
.min_keysize = AES_MIN_KEY_SIZE, .min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE,
.ivsize = AES_BLOCK_SIZE,
.setkey = atmel_aes_setkey, .setkey = atmel_aes_setkey,
.encrypt = atmel_aes_cfb16_encrypt, .encrypt = atmel_aes_cfb16_encrypt,
.decrypt = atmel_aes_cfb16_decrypt, .decrypt = atmel_aes_cfb16_decrypt,
} .ivsize = AES_BLOCK_SIZE,
}, },
{ {
.cra_name = "cfb8(aes)", .base.cra_name = "cfb8(aes)",
.cra_driver_name = "atmel-cfb8-aes", .base.cra_driver_name = "atmel-cfb8-aes",
.cra_priority = ATMEL_AES_PRIORITY, .base.cra_priority = ATMEL_AES_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .base.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = CFB8_BLOCK_SIZE, .base.cra_blocksize = CFB8_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct atmel_aes_ctx), .base.cra_ctxsize = sizeof(struct atmel_aes_ctx),
.cra_alignmask = 0x0, .base.cra_alignmask = 0xf,
.cra_type = &crypto_ablkcipher_type, .base.cra_module = THIS_MODULE,
.cra_module = THIS_MODULE,
.cra_init = atmel_aes_cra_init, .init = atmel_aes_init_tfm,
.cra_u.ablkcipher = {
.min_keysize = AES_MIN_KEY_SIZE, .min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE,
.ivsize = AES_BLOCK_SIZE,
.setkey = atmel_aes_setkey, .setkey = atmel_aes_setkey,
.encrypt = atmel_aes_cfb8_encrypt, .encrypt = atmel_aes_cfb8_encrypt,
.decrypt = atmel_aes_cfb8_decrypt, .decrypt = atmel_aes_cfb8_decrypt,
} .ivsize = AES_BLOCK_SIZE,
}, },
{ {
.cra_name = "ctr(aes)", .base.cra_name = "ctr(aes)",
.cra_driver_name = "atmel-ctr-aes", .base.cra_driver_name = "atmel-ctr-aes",
.cra_priority = ATMEL_AES_PRIORITY, .base.cra_priority = ATMEL_AES_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .base.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = 1, .base.cra_blocksize = 1,
.cra_ctxsize = sizeof(struct atmel_aes_ctr_ctx), .base.cra_ctxsize = sizeof(struct atmel_aes_ctr_ctx),
.cra_alignmask = 0xf, .base.cra_alignmask = 0xf,
.cra_type = &crypto_ablkcipher_type, .base.cra_module = THIS_MODULE,
.cra_module = THIS_MODULE,
.cra_init = atmel_aes_ctr_cra_init, .init = atmel_aes_ctr_init_tfm,
.cra_u.ablkcipher = {
.min_keysize = AES_MIN_KEY_SIZE, .min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE,
.ivsize = AES_BLOCK_SIZE,
.setkey = atmel_aes_setkey, .setkey = atmel_aes_setkey,
.encrypt = atmel_aes_ctr_encrypt, .encrypt = atmel_aes_ctr_encrypt,
.decrypt = atmel_aes_ctr_decrypt, .decrypt = atmel_aes_ctr_decrypt,
} .ivsize = AES_BLOCK_SIZE,
}, },
}; };
static struct crypto_alg aes_cfb64_alg = { static struct skcipher_alg aes_cfb64_alg = {
.cra_name = "cfb64(aes)", .base.cra_name = "cfb64(aes)",
.cra_driver_name = "atmel-cfb64-aes", .base.cra_driver_name = "atmel-cfb64-aes",
.cra_priority = ATMEL_AES_PRIORITY, .base.cra_priority = ATMEL_AES_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .base.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = CFB64_BLOCK_SIZE, .base.cra_blocksize = CFB64_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct atmel_aes_ctx), .base.cra_ctxsize = sizeof(struct atmel_aes_ctx),
.cra_alignmask = 0x7, .base.cra_alignmask = 0xf,
.cra_type = &crypto_ablkcipher_type, .base.cra_module = THIS_MODULE,
.cra_module = THIS_MODULE,
.cra_init = atmel_aes_cra_init, .init = atmel_aes_init_tfm,
.cra_u.ablkcipher = {
.min_keysize = AES_MIN_KEY_SIZE, .min_keysize = AES_MIN_KEY_SIZE,
.max_keysize = AES_MAX_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE,
.ivsize = AES_BLOCK_SIZE,
.setkey = atmel_aes_setkey, .setkey = atmel_aes_setkey,
.encrypt = atmel_aes_cfb64_encrypt, .encrypt = atmel_aes_cfb64_encrypt,
.decrypt = atmel_aes_cfb64_decrypt, .decrypt = atmel_aes_cfb64_decrypt,
} .ivsize = AES_BLOCK_SIZE,
}; };
...@@ -1864,8 +1848,8 @@ static int atmel_aes_xts_process_data(struct atmel_aes_dev *dd); ...@@ -1864,8 +1848,8 @@ static int atmel_aes_xts_process_data(struct atmel_aes_dev *dd);
static int atmel_aes_xts_start(struct atmel_aes_dev *dd) static int atmel_aes_xts_start(struct atmel_aes_dev *dd)
{ {
struct atmel_aes_xts_ctx *ctx = atmel_aes_xts_ctx_cast(dd->ctx); struct atmel_aes_xts_ctx *ctx = atmel_aes_xts_ctx_cast(dd->ctx);
struct ablkcipher_request *req = ablkcipher_request_cast(dd->areq); struct skcipher_request *req = skcipher_request_cast(dd->areq);
struct atmel_aes_reqctx *rctx = ablkcipher_request_ctx(req); struct atmel_aes_reqctx *rctx = skcipher_request_ctx(req);
unsigned long flags; unsigned long flags;
int err; int err;
...@@ -1875,7 +1859,7 @@ static int atmel_aes_xts_start(struct atmel_aes_dev *dd) ...@@ -1875,7 +1859,7 @@ static int atmel_aes_xts_start(struct atmel_aes_dev *dd)
if (err) if (err)
return atmel_aes_complete(dd, err); return atmel_aes_complete(dd, err);
/* Compute the tweak value from req->info with ecb(aes). */ /* Compute the tweak value from req->iv with ecb(aes). */
flags = dd->flags; flags = dd->flags;
dd->flags &= ~AES_FLAGS_MODE_MASK; dd->flags &= ~AES_FLAGS_MODE_MASK;
dd->flags |= (AES_FLAGS_ECB | AES_FLAGS_ENCRYPT); dd->flags |= (AES_FLAGS_ECB | AES_FLAGS_ENCRYPT);
...@@ -1883,14 +1867,14 @@ static int atmel_aes_xts_start(struct atmel_aes_dev *dd) ...@@ -1883,14 +1867,14 @@ static int atmel_aes_xts_start(struct atmel_aes_dev *dd)
ctx->key2, ctx->base.keylen); ctx->key2, ctx->base.keylen);
dd->flags = flags; dd->flags = flags;
atmel_aes_write_block(dd, AES_IDATAR(0), req->info); atmel_aes_write_block(dd, AES_IDATAR(0), req->iv);
return atmel_aes_wait_for_data_ready(dd, atmel_aes_xts_process_data); return atmel_aes_wait_for_data_ready(dd, atmel_aes_xts_process_data);
} }
static int atmel_aes_xts_process_data(struct atmel_aes_dev *dd) static int atmel_aes_xts_process_data(struct atmel_aes_dev *dd)
{ {
struct ablkcipher_request *req = ablkcipher_request_cast(dd->areq); struct skcipher_request *req = skcipher_request_cast(dd->areq);
bool use_dma = (req->nbytes >= ATMEL_AES_DMA_THRESHOLD); bool use_dma = (req->cryptlen >= ATMEL_AES_DMA_THRESHOLD);
u32 tweak[AES_BLOCK_SIZE / sizeof(u32)]; u32 tweak[AES_BLOCK_SIZE / sizeof(u32)];
static const __le32 one[AES_BLOCK_SIZE / sizeof(u32)] = {cpu_to_le32(1), }; static const __le32 one[AES_BLOCK_SIZE / sizeof(u32)] = {cpu_to_le32(1), };
u8 *tweak_bytes = (u8 *)tweak; u8 *tweak_bytes = (u8 *)tweak;
...@@ -1915,20 +1899,21 @@ static int atmel_aes_xts_process_data(struct atmel_aes_dev *dd) ...@@ -1915,20 +1899,21 @@ static int atmel_aes_xts_process_data(struct atmel_aes_dev *dd)
atmel_aes_write_block(dd, AES_TWR(0), tweak); atmel_aes_write_block(dd, AES_TWR(0), tweak);
atmel_aes_write_block(dd, AES_ALPHAR(0), one); atmel_aes_write_block(dd, AES_ALPHAR(0), one);
if (use_dma) if (use_dma)
return atmel_aes_dma_start(dd, req->src, req->dst, req->nbytes, return atmel_aes_dma_start(dd, req->src, req->dst,
req->cryptlen,
atmel_aes_transfer_complete); atmel_aes_transfer_complete);
return atmel_aes_cpu_start(dd, req->src, req->dst, req->nbytes, return atmel_aes_cpu_start(dd, req->src, req->dst, req->cryptlen,
atmel_aes_transfer_complete); atmel_aes_transfer_complete);
} }
static int atmel_aes_xts_setkey(struct crypto_ablkcipher *tfm, const u8 *key, static int atmel_aes_xts_setkey(struct crypto_skcipher *tfm, const u8 *key,
unsigned int keylen) unsigned int keylen)
{ {
struct atmel_aes_xts_ctx *ctx = crypto_ablkcipher_ctx(tfm); struct atmel_aes_xts_ctx *ctx = crypto_skcipher_ctx(tfm);
int err; int err;
err = xts_check_key(crypto_ablkcipher_tfm(tfm), key, keylen); err = xts_check_key(crypto_skcipher_tfm(tfm), key, keylen);
if (err) if (err)
return err; return err;
...@@ -1939,45 +1924,43 @@ static int atmel_aes_xts_setkey(struct crypto_ablkcipher *tfm, const u8 *key, ...@@ -1939,45 +1924,43 @@ static int atmel_aes_xts_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
return 0; return 0;
} }
static int atmel_aes_xts_encrypt(struct ablkcipher_request *req) static int atmel_aes_xts_encrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_XTS | AES_FLAGS_ENCRYPT); return atmel_aes_crypt(req, AES_FLAGS_XTS | AES_FLAGS_ENCRYPT);
} }
static int atmel_aes_xts_decrypt(struct ablkcipher_request *req) static int atmel_aes_xts_decrypt(struct skcipher_request *req)
{ {
return atmel_aes_crypt(req, AES_FLAGS_XTS); return atmel_aes_crypt(req, AES_FLAGS_XTS);
} }
static int atmel_aes_xts_cra_init(struct crypto_tfm *tfm) static int atmel_aes_xts_init_tfm(struct crypto_skcipher *tfm)
{ {
struct atmel_aes_xts_ctx *ctx = crypto_tfm_ctx(tfm); struct atmel_aes_xts_ctx *ctx = crypto_skcipher_ctx(tfm);
tfm->crt_ablkcipher.reqsize = sizeof(struct atmel_aes_reqctx); crypto_skcipher_set_reqsize(tfm, sizeof(struct atmel_aes_reqctx));
ctx->base.start = atmel_aes_xts_start; ctx->base.start = atmel_aes_xts_start;
return 0; return 0;
} }
static struct crypto_alg aes_xts_alg = { static struct skcipher_alg aes_xts_alg = {
.cra_name = "xts(aes)", .base.cra_name = "xts(aes)",
.cra_driver_name = "atmel-xts-aes", .base.cra_driver_name = "atmel-xts-aes",
.cra_priority = ATMEL_AES_PRIORITY, .base.cra_priority = ATMEL_AES_PRIORITY,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .base.cra_flags = CRYPTO_ALG_ASYNC,
.cra_blocksize = AES_BLOCK_SIZE, .base.cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct atmel_aes_xts_ctx), .base.cra_ctxsize = sizeof(struct atmel_aes_xts_ctx),
.cra_alignmask = 0xf, .base.cra_alignmask = 0xf,
.cra_type = &crypto_ablkcipher_type, .base.cra_module = THIS_MODULE,
.cra_module = THIS_MODULE,
.cra_init = atmel_aes_xts_cra_init,
.cra_u.ablkcipher = {
.min_keysize = 2 * AES_MIN_KEY_SIZE, .min_keysize = 2 * AES_MIN_KEY_SIZE,
.max_keysize = 2 * AES_MAX_KEY_SIZE, .max_keysize = 2 * AES_MAX_KEY_SIZE,
.ivsize = AES_BLOCK_SIZE, .ivsize = AES_BLOCK_SIZE,
.setkey = atmel_aes_xts_setkey, .setkey = atmel_aes_xts_setkey,
.encrypt = atmel_aes_xts_encrypt, .encrypt = atmel_aes_xts_encrypt,
.decrypt = atmel_aes_xts_decrypt, .decrypt = atmel_aes_xts_decrypt,
} .init = atmel_aes_xts_init_tfm,
}; };
#if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC) #if IS_ENABLED(CONFIG_CRYPTO_DEV_ATMEL_AUTHENC)
...@@ -2474,16 +2457,16 @@ static void atmel_aes_unregister_algs(struct atmel_aes_dev *dd) ...@@ -2474,16 +2457,16 @@ static void atmel_aes_unregister_algs(struct atmel_aes_dev *dd)
#endif #endif
if (dd->caps.has_xts) if (dd->caps.has_xts)
crypto_unregister_alg(&aes_xts_alg); crypto_unregister_skcipher(&aes_xts_alg);
if (dd->caps.has_gcm) if (dd->caps.has_gcm)
crypto_unregister_aead(&aes_gcm_alg); crypto_unregister_aead(&aes_gcm_alg);
if (dd->caps.has_cfb64) if (dd->caps.has_cfb64)
crypto_unregister_alg(&aes_cfb64_alg); crypto_unregister_skcipher(&aes_cfb64_alg);
for (i = 0; i < ARRAY_SIZE(aes_algs); i++) for (i = 0; i < ARRAY_SIZE(aes_algs); i++)
crypto_unregister_alg(&aes_algs[i]); crypto_unregister_skcipher(&aes_algs[i]);
} }
static int atmel_aes_register_algs(struct atmel_aes_dev *dd) static int atmel_aes_register_algs(struct atmel_aes_dev *dd)
...@@ -2491,13 +2474,13 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd) ...@@ -2491,13 +2474,13 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd)
int err, i, j; int err, i, j;
for (i = 0; i < ARRAY_SIZE(aes_algs); i++) { for (i = 0; i < ARRAY_SIZE(aes_algs); i++) {
err = crypto_register_alg(&aes_algs[i]); err = crypto_register_skcipher(&aes_algs[i]);
if (err) if (err)
goto err_aes_algs; goto err_aes_algs;
} }
if (dd->caps.has_cfb64) { if (dd->caps.has_cfb64) {
err = crypto_register_alg(&aes_cfb64_alg); err = crypto_register_skcipher(&aes_cfb64_alg);
if (err) if (err)
goto err_aes_cfb64_alg; goto err_aes_cfb64_alg;
} }
...@@ -2509,7 +2492,7 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd) ...@@ -2509,7 +2492,7 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd)
} }
if (dd->caps.has_xts) { if (dd->caps.has_xts) {
err = crypto_register_alg(&aes_xts_alg); err = crypto_register_skcipher(&aes_xts_alg);
if (err) if (err)
goto err_aes_xts_alg; goto err_aes_xts_alg;
} }
...@@ -2531,17 +2514,17 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd) ...@@ -2531,17 +2514,17 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd)
err_aes_authenc_alg: err_aes_authenc_alg:
for (j = 0; j < i; j++) for (j = 0; j < i; j++)
crypto_unregister_aead(&aes_authenc_algs[j]); crypto_unregister_aead(&aes_authenc_algs[j]);
crypto_unregister_alg(&aes_xts_alg); crypto_unregister_skcipher(&aes_xts_alg);
#endif #endif
err_aes_xts_alg: err_aes_xts_alg:
crypto_unregister_aead(&aes_gcm_alg); crypto_unregister_aead(&aes_gcm_alg);
err_aes_gcm_alg: err_aes_gcm_alg:
crypto_unregister_alg(&aes_cfb64_alg); crypto_unregister_skcipher(&aes_cfb64_alg);
err_aes_cfb64_alg: err_aes_cfb64_alg:
i = ARRAY_SIZE(aes_algs); i = ARRAY_SIZE(aes_algs);
err_aes_algs: err_aes_algs:
for (j = 0; j < i; j++) for (j = 0; j < i; j++)
crypto_unregister_alg(&aes_algs[j]); crypto_unregister_skcipher(&aes_algs[j]);
return err; return err;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7