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
Pull bugzilla-5452 into release branch
[pandora-kernel.git]
/
crypto
/
aes.c
diff --git
a/crypto/aes.c
b/crypto/aes.c
index
b9b2afb
..
a501729
100644
(file)
--- a/
crypto/aes.c
+++ b/
crypto/aes.c
@@
-75,12
+75,11
@@
byte(const u32 x, const unsigned n)
struct aes_ctx {
int key_length;
struct aes_ctx {
int key_length;
- u32 E[60];
- u32 D[60];
+ u32 buf[120];
};
};
-#define E_KEY
ctx->E
-#define D_KEY
ctx->D
+#define E_KEY
(&ctx->buf[0])
+#define D_KEY
(&ctx->buf[60])
static u8 pow_tab[256] __initdata;
static u8 log_tab[256] __initdata;
static u8 pow_tab[256] __initdata;
static u8 log_tab[256] __initdata;
@@
-423,6
+422,7
@@
static struct crypto_alg aes_alg = {
.cra_flags = CRYPTO_ALG_TYPE_CIPHER,
.cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct aes_ctx),
.cra_flags = CRYPTO_ALG_TYPE_CIPHER,
.cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct aes_ctx),
+ .cra_alignmask = 3,
.cra_module = THIS_MODULE,
.cra_list = LIST_HEAD_INIT(aes_alg.cra_list),
.cra_u = {
.cra_module = THIS_MODULE,
.cra_list = LIST_HEAD_INIT(aes_alg.cra_list),
.cra_u = {