Commit f9d2691f authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by Herbert Xu

crypto: xts - use blocksize constant

XTS has fixed blocksize of 16. Define XTS_BLOCK_SIZE and use in place of
crypto_cipher_blocksize().
Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 81559f9a
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#include <crypto/b128ops.h> #include <crypto/b128ops.h>
#include <crypto/gf128mul.h> #include <crypto/gf128mul.h>
#define XTS_BLOCK_SIZE 16
struct priv { struct priv {
struct crypto_cipher *child; struct crypto_cipher *child;
struct crypto_cipher *tweak; struct crypto_cipher *tweak;
...@@ -96,7 +98,7 @@ static int crypt(struct blkcipher_desc *d, ...@@ -96,7 +98,7 @@ static int crypt(struct blkcipher_desc *d,
{ {
int err; int err;
unsigned int avail; unsigned int avail;
const int bs = crypto_cipher_blocksize(ctx->child); const int bs = XTS_BLOCK_SIZE;
struct sinfo s = { struct sinfo s = {
.tfm = crypto_cipher_tfm(ctx->child), .tfm = crypto_cipher_tfm(ctx->child),
.fn = fn .fn = fn
...@@ -177,7 +179,7 @@ static int init_tfm(struct crypto_tfm *tfm) ...@@ -177,7 +179,7 @@ static int init_tfm(struct crypto_tfm *tfm)
if (IS_ERR(cipher)) if (IS_ERR(cipher))
return PTR_ERR(cipher); return PTR_ERR(cipher);
if (crypto_cipher_blocksize(cipher) != 16) { if (crypto_cipher_blocksize(cipher) != XTS_BLOCK_SIZE) {
*flags |= CRYPTO_TFM_RES_BAD_BLOCK_LEN; *flags |= CRYPTO_TFM_RES_BAD_BLOCK_LEN;
crypto_free_cipher(cipher); crypto_free_cipher(cipher);
return -EINVAL; return -EINVAL;
...@@ -192,7 +194,7 @@ static int init_tfm(struct crypto_tfm *tfm) ...@@ -192,7 +194,7 @@ static int init_tfm(struct crypto_tfm *tfm)
} }
/* this check isn't really needed, leave it here just in case */ /* this check isn't really needed, leave it here just in case */
if (crypto_cipher_blocksize(cipher) != 16) { if (crypto_cipher_blocksize(cipher) != XTS_BLOCK_SIZE) {
crypto_free_cipher(cipher); crypto_free_cipher(cipher);
crypto_free_cipher(ctx->child); crypto_free_cipher(ctx->child);
*flags |= CRYPTO_TFM_RES_BAD_BLOCK_LEN; *flags |= CRYPTO_TFM_RES_BAD_BLOCK_LEN;
......
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