diff options
Diffstat (limited to 'crypto/cipher.c')
-rw-r--r-- | crypto/cipher.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/cipher.c b/crypto/cipher.c index 1c92c6bb138b..8da644364cb4 100644 --- a/crypto/cipher.c +++ b/crypto/cipher.c | |||
@@ -41,7 +41,7 @@ static unsigned int crypt_slow(const struct cipher_desc *desc, | |||
41 | struct scatter_walk *in, | 41 | struct scatter_walk *in, |
42 | struct scatter_walk *out, unsigned int bsize) | 42 | struct scatter_walk *out, unsigned int bsize) |
43 | { | 43 | { |
44 | unsigned int alignmask = crypto_tfm_alg_alignmask(desc->tfm); | 44 | unsigned long alignmask = crypto_tfm_alg_alignmask(desc->tfm); |
45 | u8 buffer[bsize * 2 + alignmask]; | 45 | u8 buffer[bsize * 2 + alignmask]; |
46 | u8 *src = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); | 46 | u8 *src = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); |
47 | u8 *dst = src + bsize; | 47 | u8 *dst = src + bsize; |
@@ -160,7 +160,7 @@ static int crypt_iv_unaligned(struct cipher_desc *desc, | |||
160 | unsigned int nbytes) | 160 | unsigned int nbytes) |
161 | { | 161 | { |
162 | struct crypto_tfm *tfm = desc->tfm; | 162 | struct crypto_tfm *tfm = desc->tfm; |
163 | unsigned int alignmask = crypto_tfm_alg_alignmask(tfm); | 163 | unsigned long alignmask = crypto_tfm_alg_alignmask(tfm); |
164 | u8 *iv = desc->info; | 164 | u8 *iv = desc->info; |
165 | 165 | ||
166 | if (unlikely(((unsigned long)iv & alignmask))) { | 166 | if (unlikely(((unsigned long)iv & alignmask))) { |
@@ -424,7 +424,7 @@ int crypto_init_cipher_ops(struct crypto_tfm *tfm) | |||
424 | } | 424 | } |
425 | 425 | ||
426 | if (ops->cit_mode == CRYPTO_TFM_MODE_CBC) { | 426 | if (ops->cit_mode == CRYPTO_TFM_MODE_CBC) { |
427 | unsigned int align; | 427 | unsigned long align; |
428 | unsigned long addr; | 428 | unsigned long addr; |
429 | 429 | ||
430 | switch (crypto_tfm_alg_blocksize(tfm)) { | 430 | switch (crypto_tfm_alg_blocksize(tfm)) { |