git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] m68knommu: common RAM based 68360 startup code
[pandora-kernel.git]
/
crypto
/
cipher.c
diff --git
a/crypto/cipher.c
b/crypto/cipher.c
index
1c92c6b
..
dfd4bcf
100644
(file)
--- a/
crypto/cipher.c
+++ b/
crypto/cipher.c
@@
-41,7
+41,7
@@
static unsigned int crypt_slow(const struct cipher_desc *desc,
struct scatter_walk *in,
struct scatter_walk *out, unsigned int bsize)
{
struct scatter_walk *in,
struct scatter_walk *out, unsigned int bsize)
{
- unsigned
int
alignmask = crypto_tfm_alg_alignmask(desc->tfm);
+ unsigned
long
alignmask = crypto_tfm_alg_alignmask(desc->tfm);
u8 buffer[bsize * 2 + alignmask];
u8 *src = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);
u8 *dst = src + bsize;
u8 buffer[bsize * 2 + alignmask];
u8 *src = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);
u8 *dst = src + bsize;
@@
-160,7
+160,7
@@
static int crypt_iv_unaligned(struct cipher_desc *desc,
unsigned int nbytes)
{
struct crypto_tfm *tfm = desc->tfm;
unsigned int nbytes)
{
struct crypto_tfm *tfm = desc->tfm;
- unsigned
int
alignmask = crypto_tfm_alg_alignmask(tfm);
+ unsigned
long
alignmask = crypto_tfm_alg_alignmask(tfm);
u8 *iv = desc->info;
if (unlikely(((unsigned long)iv & alignmask))) {
u8 *iv = desc->info;
if (unlikely(((unsigned long)iv & alignmask))) {
@@
-191,6
+191,8
@@
static unsigned int cbc_process_encrypt(const struct cipher_desc *desc,
u8 *iv = desc->info;
unsigned int done = 0;
u8 *iv = desc->info;
unsigned int done = 0;
+ nbytes -= bsize;
+
do {
xor(iv, src);
fn(crypto_tfm_ctx(tfm), dst, iv);
do {
xor(iv, src);
fn(crypto_tfm_ctx(tfm), dst, iv);
@@
-198,7
+200,7
@@
static unsigned int cbc_process_encrypt(const struct cipher_desc *desc,
src += bsize;
dst += bsize;
src += bsize;
dst += bsize;
- } while ((done += bsize) < nbytes);
+ } while ((done += bsize) <
=
nbytes);
return done;
}
return done;
}
@@
-219,6
+221,8
@@
static unsigned int cbc_process_decrypt(const struct cipher_desc *desc,
u8 *iv = desc->info;
unsigned int done = 0;
u8 *iv = desc->info;
unsigned int done = 0;
+ nbytes -= bsize;
+
do {
u8 *tmp_dst = *dst_p;
do {
u8 *tmp_dst = *dst_p;
@@
-230,7
+234,7
@@
static unsigned int cbc_process_decrypt(const struct cipher_desc *desc,
src += bsize;
dst += bsize;
src += bsize;
dst += bsize;
- } while ((done += bsize) < nbytes);
+ } while ((done += bsize) <
=
nbytes);
return done;
}
return done;
}
@@
-243,12
+247,14
@@
static unsigned int ecb_process(const struct cipher_desc *desc, u8 *dst,
void (*fn)(void *, u8 *, const u8 *) = desc->crfn;
unsigned int done = 0;
void (*fn)(void *, u8 *, const u8 *) = desc->crfn;
unsigned int done = 0;
+ nbytes -= bsize;
+
do {
fn(crypto_tfm_ctx(tfm), dst, src);
src += bsize;
dst += bsize;
do {
fn(crypto_tfm_ctx(tfm), dst, src);
src += bsize;
dst += bsize;
- } while ((done += bsize) < nbytes);
+ } while ((done += bsize) <
=
nbytes);
return done;
}
return done;
}
@@
-377,11
+383,7
@@
static int nocrypt_iv(struct crypto_tfm *tfm,
int crypto_init_cipher_flags(struct crypto_tfm *tfm, u32 flags)
{
u32 mode = flags & CRYPTO_TFM_MODE_MASK;
int crypto_init_cipher_flags(struct crypto_tfm *tfm, u32 flags)
{
u32 mode = flags & CRYPTO_TFM_MODE_MASK;
-
tfm->crt_cipher.cit_mode = mode ? mode : CRYPTO_TFM_MODE_ECB;
tfm->crt_cipher.cit_mode = mode ? mode : CRYPTO_TFM_MODE_ECB;
- if (flags & CRYPTO_TFM_REQ_WEAK_KEY)
- tfm->crt_flags = CRYPTO_TFM_REQ_WEAK_KEY;
-
return 0;
}
return 0;
}
@@
-424,7
+426,7
@@
int crypto_init_cipher_ops(struct crypto_tfm *tfm)
}
if (ops->cit_mode == CRYPTO_TFM_MODE_CBC) {
}
if (ops->cit_mode == CRYPTO_TFM_MODE_CBC) {
- unsigned
int
align;
+ unsigned
long
align;
unsigned long addr;
switch (crypto_tfm_alg_blocksize(tfm)) {
unsigned long addr;
switch (crypto_tfm_alg_blocksize(tfm)) {