aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2005-07-15 10:41:31 -0400
committerDavid S. Miller <davem@davemloft.net>2005-07-15 10:41:31 -0400
commit9d853c3757ef74ded5ae564d68370f22208fb88b (patch)
treeaaf87a1a75d7e1c449e058867a1c4883dcc34838 /crypto
parentba460e48064edeb57e3398eb8972c58de33f11ea (diff)
[CRYPTO]: Fix zero-extension bug on 64-bit architectures.
Noticed by Ken-ichirou MATSUZAWA. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/cipher.c6
-rw-r--r--crypto/internal.h2
2 files changed, 4 insertions, 4 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)) {
diff --git a/crypto/internal.h b/crypto/internal.h
index 68612874b5fd..37515beafc8c 100644
--- a/crypto/internal.h
+++ b/crypto/internal.h
@@ -75,7 +75,7 @@ static inline unsigned int crypto_cipher_ctxsize(struct crypto_alg *alg,
75 75
76 switch (flags & CRYPTO_TFM_MODE_MASK) { 76 switch (flags & CRYPTO_TFM_MODE_MASK) {
77 case CRYPTO_TFM_MODE_CBC: 77 case CRYPTO_TFM_MODE_CBC:
78 len = ALIGN(len, alg->cra_alignmask + 1); 78 len = ALIGN(len, (unsigned long)alg->cra_alignmask + 1);
79 len += alg->cra_blocksize; 79 len += alg->cra_blocksize;
80 break; 80 break;
81 } 81 }