projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git]
/
crypto
/
serpent.c
diff --git
a/crypto/serpent.c
b/crypto/serpent.c
index
465d091
..
2b0a19a
100644
(file)
--- a/
crypto/serpent.c
+++ b/
crypto/serpent.c
@@
-364,10
+364,10
@@
static void serpent_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
{
struct serpent_ctx *ctx = crypto_tfm_ctx(tfm);
const u32
{
struct serpent_ctx *ctx = crypto_tfm_ctx(tfm);
const u32
- *k = ctx->expkey
,
-
*s = (const u
32 *)src;
- u32 *d = (u32 *)dst,
-
r0, r1, r2, r3, r4;
+ *k = ctx->expkey
;
+
const __le32 *s = (const __le
32 *)src;
+ __le32 *d = (__le32 *)dst;
+
u32
r0, r1, r2, r3, r4;
/*
* Note: The conversions between u8* and u32* might cause trouble
/*
* Note: The conversions between u8* and u32* might cause trouble
@@
-423,10
+423,10
@@
static void serpent_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
{
struct serpent_ctx *ctx = crypto_tfm_ctx(tfm);
const u32
{
struct serpent_ctx *ctx = crypto_tfm_ctx(tfm);
const u32
- *k = ((struct serpent_ctx *)ctx)->expkey
,
-
*s = (const u
32 *)src;
- u32 *d = (u32 *)dst,
-
r0, r1, r2, r3, r4;
+ *k = ((struct serpent_ctx *)ctx)->expkey
;
+
const __le32 *s = (const __le
32 *)src;
+ __le32 *d = (__le32 *)dst;
+
u32
r0, r1, r2, r3, r4;
r0 = le32_to_cpu(s[0]);
r1 = le32_to_cpu(s[1]);
r0 = le32_to_cpu(s[0]);
r1 = le32_to_cpu(s[1]);