Skip to content

L
linux
Commit 3c7f076d authored by Herbert Xu's avatar Herbert Xu
Browse files
Options

[CRYPTO] cbc: Use crypto_xor 

This patch replaces the custom xor in CBC with the generic crypto_xor.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 7613636d
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 77 deletions
crypto/cbc.c
View file @ 3c7f076d
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
struct crypto_cbc_ctx { struct crypto_cbc_ctx {
struct crypto_cipher *child; struct crypto_cipher *child;
void (*xor)(u8 *dst, const u8 *src, unsigned int bs);
}; };
static int crypto_cbc_setkey(struct crypto_tfm *parent, const u8 *key, static int crypto_cbc_setkey(struct crypto_tfm *parent, const u8 *key,
...@@ -41,9 +40,7 @@ static int crypto_cbc_setkey(struct crypto_tfm *parent, const u8 *key, ...@@ -41,9 +40,7 @@ static int crypto_cbc_setkey(struct crypto_tfm *parent, const u8 *key,
static int crypto_cbc_encrypt_segment(struct blkcipher_desc *desc, static int crypto_cbc_encrypt_segment(struct blkcipher_desc *desc,
struct blkcipher_walk *walk, struct blkcipher_walk *walk,
struct crypto_cipher *tfm, struct crypto_cipher *tfm)
void (*xor)(u8 *, const u8 *,
unsigned int))
{ {
void (*fn)(struct crypto_tfm *, u8 *, const u8 *) = void (*fn)(struct crypto_tfm *, u8 *, const u8 *) =
crypto_cipher_alg(tfm)->cia_encrypt; crypto_cipher_alg(tfm)->cia_encrypt;
...@@ -54,7 +51,7 @@ static int crypto_cbc_encrypt_segment(struct blkcipher_desc *desc, ...@@ -54,7 +51,7 @@ static int crypto_cbc_encrypt_segment(struct blkcipher_desc *desc,
u8 *iv = walk->iv; u8 *iv = walk->iv;
do { do {
xor(iv, src, bsize); crypto_xor(iv, src, bsize);
fn(crypto_cipher_tfm(tfm), dst, iv); fn(crypto_cipher_tfm(tfm), dst, iv);
memcpy(iv, dst, bsize); memcpy(iv, dst, bsize);
...@@ -67,9 +64,7 @@ static int crypto_cbc_encrypt_segment(struct blkcipher_desc *desc, ...@@ -67,9 +64,7 @@ static int crypto_cbc_encrypt_segment(struct blkcipher_desc *desc,
static int crypto_cbc_encrypt_inplace(struct blkcipher_desc *desc, static int crypto_cbc_encrypt_inplace(struct blkcipher_desc *desc,
struct blkcipher_walk *walk, struct blkcipher_walk *walk,
struct crypto_cipher *tfm, struct crypto_cipher *tfm)
void (*xor)(u8 *, const u8 *,
unsigned int))
{ {
void (*fn)(struct crypto_tfm *, u8 *, const u8 *) = void (*fn)(struct crypto_tfm *, u8 *, const u8 *) =
crypto_cipher_alg(tfm)->cia_encrypt; crypto_cipher_alg(tfm)->cia_encrypt;
...@@ -79,7 +74,7 @@ static int crypto_cbc_encrypt_inplace(struct blkcipher_desc *desc, ...@@ -79,7 +74,7 @@ static int crypto_cbc_encrypt_inplace(struct blkcipher_desc *desc,
u8 *iv = walk->iv; u8 *iv = walk->iv;
do { do {
xor(src, iv, bsize); crypto_xor(src, iv, bsize);
fn(crypto_cipher_tfm(tfm), src, src); fn(crypto_cipher_tfm(tfm), src, src);
iv = src; iv = src;
...@@ -99,7 +94,6 @@ static int crypto_cbc_encrypt(struct blkcipher_desc *desc, ...@@ -99,7 +94,6 @@ static int crypto_cbc_encrypt(struct blkcipher_desc *desc,
struct crypto_blkcipher *tfm = desc->tfm; struct crypto_blkcipher *tfm = desc->tfm;
struct crypto_cbc_ctx *ctx = crypto_blkcipher_ctx(tfm); struct crypto_cbc_ctx *ctx = crypto_blkcipher_ctx(tfm);
struct crypto_cipher *child = ctx->child; struct crypto_cipher *child = ctx->child;
void (*xor)(u8 *, const u8 *, unsigned int bs) = ctx->xor;
int err; int err;
blkcipher_walk_init(&walk, dst, src, nbytes); blkcipher_walk_init(&walk, dst, src, nbytes);
...@@ -107,11 +101,9 @@ static int crypto_cbc_encrypt(struct blkcipher_desc *desc, ...@@ -107,11 +101,9 @@ static int crypto_cbc_encrypt(struct blkcipher_desc *desc,
while ((nbytes = walk.nbytes)) { while ((nbytes = walk.nbytes)) {
if (walk.src.virt.addr == walk.dst.virt.addr) if (walk.src.virt.addr == walk.dst.virt.addr)
nbytes = crypto_cbc_encrypt_inplace(desc, &walk, child, nbytes = crypto_cbc_encrypt_inplace(desc, &walk, child);
xor);
else else
nbytes = crypto_cbc_encrypt_segment(desc, &walk, child, nbytes = crypto_cbc_encrypt_segment(desc, &walk, child);
xor);
err = blkcipher_walk_done(desc, &walk, nbytes); err = blkcipher_walk_done(desc, &walk, nbytes);
} }
...@@ -120,9 +112,7 @@ static int crypto_cbc_encrypt(struct blkcipher_desc *desc, ...@@ -120,9 +112,7 @@ static int crypto_cbc_encrypt(struct blkcipher_desc *desc,
static int crypto_cbc_decrypt_segment(struct blkcipher_desc *desc, static int crypto_cbc_decrypt_segment(struct blkcipher_desc *desc,
struct blkcipher_walk *walk, struct blkcipher_walk *walk,
struct crypto_cipher *tfm, struct crypto_cipher *tfm)
void (*xor)(u8 *, const u8 *,
unsigned int))
{ {
void (*fn)(struct crypto_tfm *, u8 *, const u8 *) = void (*fn)(struct crypto_tfm *, u8 *, const u8 *) =
crypto_cipher_alg(tfm)->cia_decrypt; crypto_cipher_alg(tfm)->cia_decrypt;
...@@ -134,7 +124,7 @@ static int crypto_cbc_decrypt_segment(struct blkcipher_desc *desc, ...@@ -134,7 +124,7 @@ static int crypto_cbc_decrypt_segment(struct blkcipher_desc *desc,
do { do {
fn(crypto_cipher_tfm(tfm), dst, src); fn(crypto_cipher_tfm(tfm), dst, src);
xor(dst, iv, bsize); crypto_xor(dst, iv, bsize);
iv = src; iv = src;
src += bsize; src += bsize;
...@@ -148,9 +138,7 @@ static int crypto_cbc_decrypt_segment(struct blkcipher_desc *desc, ...@@ -148,9 +138,7 @@ static int crypto_cbc_decrypt_segment(struct blkcipher_desc *desc,
static int crypto_cbc_decrypt_inplace(struct blkcipher_desc *desc, static int crypto_cbc_decrypt_inplace(struct blkcipher_desc *desc,
struct blkcipher_walk *walk, struct blkcipher_walk *walk,
struct crypto_cipher *tfm, struct crypto_cipher *tfm)
void (*xor)(u8 *, const u8 *,
unsigned int))
{ {
void (*fn)(struct crypto_tfm *, u8 *, const u8 *) = void (*fn)(struct crypto_tfm *, u8 *, const u8 *) =
crypto_cipher_alg(tfm)->cia_decrypt; crypto_cipher_alg(tfm)->cia_decrypt;
...@@ -171,11 +159,11 @@ static int crypto_cbc_decrypt_inplace(struct blkcipher_desc *desc, ...@@ -171,11 +159,11 @@ static int crypto_cbc_decrypt_inplace(struct blkcipher_desc *desc,
fn(crypto_cipher_tfm(tfm), src, src); fn(crypto_cipher_tfm(tfm), src, src);
if ((nbytes -= bsize) < bsize) if ((nbytes -= bsize) < bsize)
break; break;
xor(src, src - bsize, bsize); crypto_xor(src, src - bsize, bsize);
src -= bsize; src -= bsize;
} }
xor(src, first_iv, bsize); crypto_xor(src, first_iv, bsize);
return nbytes; return nbytes;
} }
...@@ -188,7 +176,6 @@ static int crypto_cbc_decrypt(struct blkcipher_desc *desc, ...@@ -188,7 +176,6 @@ static int crypto_cbc_decrypt(struct blkcipher_desc *desc,
struct crypto_blkcipher *tfm = desc->tfm; struct crypto_blkcipher *tfm = desc->tfm;
struct crypto_cbc_ctx *ctx = crypto_blkcipher_ctx(tfm); struct crypto_cbc_ctx *ctx = crypto_blkcipher_ctx(tfm);
struct crypto_cipher *child = ctx->child; struct crypto_cipher *child = ctx->child;
void (*xor)(u8 *, const u8 *, unsigned int bs) = ctx->xor;
int err; int err;
blkcipher_walk_init(&walk, dst, src, nbytes); blkcipher_walk_init(&walk, dst, src, nbytes);
...@@ -196,48 +183,15 @@ static int crypto_cbc_decrypt(struct blkcipher_desc *desc, ...@@ -196,48 +183,15 @@ static int crypto_cbc_decrypt(struct blkcipher_desc *desc,
while ((nbytes = walk.nbytes)) { while ((nbytes = walk.nbytes)) {
if (walk.src.virt.addr == walk.dst.virt.addr) if (walk.src.virt.addr == walk.dst.virt.addr)
nbytes = crypto_cbc_decrypt_inplace(desc, &walk, child, nbytes = crypto_cbc_decrypt_inplace(desc, &walk, child);
xor);
else else
nbytes = crypto_cbc_decrypt_segment(desc, &walk, child, nbytes = crypto_cbc_decrypt_segment(desc, &walk, child);
xor);
err = blkcipher_walk_done(desc, &walk, nbytes); err = blkcipher_walk_done(desc, &walk, nbytes);
} }
return err; return err;
} }
static void xor_byte(u8 *a, const u8 *b, unsigned int bs)
{
do {
*a++ ^= *b++;
} while (--bs);
}
static void xor_quad(u8 *dst, const u8 *src, unsigned int bs)
{
u32 *a = (u32 *)dst;
u32 *b = (u32 *)src;
do {
*a++ ^= *b++;
} while ((bs -= 4));
}
static void xor_64(u8 *a, const u8 *b, unsigned int bs)
{
((u32 *)a)[0] ^= ((u32 *)b)[0];
((u32 *)a)[1] ^= ((u32 *)b)[1];
}
static void xor_128(u8 *a, const u8 *b, unsigned int bs)
{
((u32 *)a)[0] ^= ((u32 *)b)[0];
((u32 *)a)[1] ^= ((u32 *)b)[1];
((u32 *)a)[2] ^= ((u32 *)b)[2];
((u32 *)a)[3] ^= ((u32 *)b)[3];
}
static int crypto_cbc_init_tfm(struct crypto_tfm *tfm) static int crypto_cbc_init_tfm(struct crypto_tfm *tfm)
{ {
struct crypto_instance *inst = (void *)tfm->__crt_alg; struct crypto_instance *inst = (void *)tfm->__crt_alg;
...@@ -245,22 +199,6 @@ static int crypto_cbc_init_tfm(struct crypto_tfm *tfm) ...@@ -245,22 +199,6 @@ static int crypto_cbc_init_tfm(struct crypto_tfm *tfm)
struct crypto_cbc_ctx *ctx = crypto_tfm_ctx(tfm); struct crypto_cbc_ctx *ctx = crypto_tfm_ctx(tfm);
struct crypto_cipher *cipher; struct crypto_cipher *cipher;
switch (crypto_tfm_alg_blocksize(tfm)) {
case 8:
ctx->xor = xor_64;
break;
case 16:
ctx->xor = xor_128;
break;
default:
if (crypto_tfm_alg_blocksize(tfm) % 4)
ctx->xor = xor_byte;
else
ctx->xor = xor_quad;
}
cipher = crypto_spawn_cipher(spawn); cipher = crypto_spawn_cipher(spawn);
if (IS_ERR(cipher)) if (IS_ERR(cipher))
return PTR_ERR(cipher); return PTR_ERR(cipher);
...@@ -300,8 +238,9 @@ static struct crypto_instance *crypto_cbc_alloc(struct rtattr **tb) ...@@ -300,8 +238,9 @@ static struct crypto_instance *crypto_cbc_alloc(struct rtattr **tb)
inst->alg.cra_alignmask = alg->cra_alignmask; inst->alg.cra_alignmask = alg->cra_alignmask;
inst->alg.cra_type = &crypto_blkcipher_type; inst->alg.cra_type = &crypto_blkcipher_type;
if (!(alg->cra_blocksize % 4)) /* We access the data as u32s when xoring. */
inst->alg.cra_alignmask |= 3; inst->alg.cra_alignmask |= __alignof__(u32) - 1;
inst->alg.cra_blkcipher.ivsize = alg->cra_blocksize; inst->alg.cra_blkcipher.ivsize = alg->cra_blocksize;
inst->alg.cra_blkcipher.min_keysize = alg->cra_cipher.cia_min_keysize; inst->alg.cra_blkcipher.min_keysize = alg->cra_cipher.cia_min_keysize;
inst->alg.cra_blkcipher.max_keysize = alg->cra_cipher.cia_max_keysize; inst->alg.cra_blkcipher.max_keysize = alg->cra_cipher.cia_max_keysize;
......
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