Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  [CRYPTO] aes: Fixed array boundary violation
  [CRYPTO] tcrypt: Fix key alignment
  [CRYPTO] all: Add missing cra_alignmask
  [CRYPTO] all: Use kzalloc where possible
  [CRYPTO] api: Align tfm context as wide as possible
  [CRYPTO] twofish: Use rol32/ror32 where appropriate
This commit is contained in:
Linus Torvalds 2006-03-21 09:33:19 -08:00
commit ec1248e70e
10 changed files with 50 additions and 39 deletions

View File

@ -77,12 +77,11 @@ static inline u8 byte(const u32 x, const unsigned n)
struct aes_ctx struct aes_ctx
{ {
u32 key_length; u32 key_length;
u32 E[60]; u32 buf[120];
u32 D[60];
}; };
#define E_KEY ctx->E #define E_KEY (&ctx->buf[0])
#define D_KEY ctx->D #define D_KEY (&ctx->buf[60])
static u8 pow_tab[256] __initdata; static u8 pow_tab[256] __initdata;
static u8 log_tab[256] __initdata; static u8 log_tab[256] __initdata;

View File

@ -75,12 +75,11 @@ byte(const u32 x, const unsigned n)
struct aes_ctx { struct aes_ctx {
int key_length; int key_length;
u32 E[60]; u32 buf[120];
u32 D[60];
}; };
#define E_KEY ctx->E #define E_KEY (&ctx->buf[0])
#define D_KEY ctx->D #define D_KEY (&ctx->buf[60])
static u8 pow_tab[256] __initdata; static u8 pow_tab[256] __initdata;
static u8 log_tab[256] __initdata; static u8 log_tab[256] __initdata;

View File

@ -165,7 +165,7 @@ static unsigned int crypto_ctxsize(struct crypto_alg *alg, int flags)
break; break;
} }
return len + alg->cra_alignmask; return len + (alg->cra_alignmask & ~(crypto_tfm_ctx_alignment() - 1));
} }
struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags) struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags)
@ -179,12 +179,10 @@ struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags)
goto out; goto out;
tfm_size = sizeof(*tfm) + crypto_ctxsize(alg, flags); tfm_size = sizeof(*tfm) + crypto_ctxsize(alg, flags);
tfm = kmalloc(tfm_size, GFP_KERNEL); tfm = kzalloc(tfm_size, GFP_KERNEL);
if (tfm == NULL) if (tfm == NULL)
goto out_put; goto out_put;
memset(tfm, 0, tfm_size);
tfm->__crt_alg = alg; tfm->__crt_alg = alg;
if (crypto_init_flags(tfm, flags)) if (crypto_init_flags(tfm, flags))

View File

@ -73,12 +73,11 @@ static int deflate_decomp_init(struct deflate_ctx *ctx)
int ret = 0; int ret = 0;
struct z_stream_s *stream = &ctx->decomp_stream; struct z_stream_s *stream = &ctx->decomp_stream;
stream->workspace = kmalloc(zlib_inflate_workspacesize(), GFP_KERNEL); stream->workspace = kzalloc(zlib_inflate_workspacesize(), GFP_KERNEL);
if (!stream->workspace ) { if (!stream->workspace ) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
memset(stream->workspace, 0, zlib_inflate_workspacesize());
ret = zlib_inflateInit2(stream, -DEFLATE_DEF_WINBITS); ret = zlib_inflateInit2(stream, -DEFLATE_DEF_WINBITS);
if (ret != Z_OK) { if (ret != Z_OK) {
ret = -EINVAL; ret = -EINVAL;

View File

@ -965,6 +965,7 @@ static struct crypto_alg des3_ede_alg = {
.cra_blocksize = DES3_EDE_BLOCK_SIZE, .cra_blocksize = DES3_EDE_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct des3_ede_ctx), .cra_ctxsize = sizeof(struct des3_ede_ctx),
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_alignmask = 3,
.cra_list = LIST_HEAD_INIT(des3_ede_alg.cra_list), .cra_list = LIST_HEAD_INIT(des3_ede_alg.cra_list),
.cra_u = { .cipher = { .cra_u = { .cipher = {
.cia_min_keysize = DES3_EDE_KEY_SIZE, .cia_min_keysize = DES3_EDE_KEY_SIZE,

View File

@ -481,6 +481,7 @@ static struct crypto_alg serpent_alg = {
.cra_flags = CRYPTO_ALG_TYPE_CIPHER, .cra_flags = CRYPTO_ALG_TYPE_CIPHER,
.cra_blocksize = SERPENT_BLOCK_SIZE, .cra_blocksize = SERPENT_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct serpent_ctx), .cra_ctxsize = sizeof(struct serpent_ctx),
.cra_alignmask = 3,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_list = LIST_HEAD_INIT(serpent_alg.cra_list), .cra_list = LIST_HEAD_INIT(serpent_alg.cra_list),
.cra_u = { .cipher = { .cra_u = { .cipher = {

View File

@ -26,37 +26,38 @@
#define MAX_IVLEN 32 #define MAX_IVLEN 32
struct hash_testvec { struct hash_testvec {
/* only used with keyed hash algorithms */
char key[128] __attribute__ ((__aligned__(4)));
char plaintext[128]; char plaintext[128];
unsigned char psize;
char digest[MAX_DIGEST_SIZE]; char digest[MAX_DIGEST_SIZE];
unsigned char np;
unsigned char tap[MAX_TAP]; unsigned char tap[MAX_TAP];
char key[128]; /* only used with keyed hash algorithms */ unsigned char psize;
unsigned char np;
unsigned char ksize; unsigned char ksize;
}; };
struct hmac_testvec { struct hmac_testvec {
char key[128]; char key[128];
unsigned char ksize;
char plaintext[128]; char plaintext[128];
unsigned char psize;
char digest[MAX_DIGEST_SIZE]; char digest[MAX_DIGEST_SIZE];
unsigned char np;
unsigned char tap[MAX_TAP]; unsigned char tap[MAX_TAP];
unsigned char ksize;
unsigned char psize;
unsigned char np;
}; };
struct cipher_testvec { struct cipher_testvec {
unsigned char fail; char key[MAX_KEYLEN] __attribute__ ((__aligned__(4)));
unsigned char wk; /* weak key flag */
char key[MAX_KEYLEN];
unsigned char klen;
char iv[MAX_IVLEN]; char iv[MAX_IVLEN];
char input[48]; char input[48];
unsigned char ilen;
char result[48]; char result[48];
unsigned char rlen;
int np;
unsigned char tap[MAX_TAP]; unsigned char tap[MAX_TAP];
int np;
unsigned char fail;
unsigned char wk; /* weak key flag */
unsigned char klen;
unsigned char ilen;
unsigned char rlen;
}; };
struct cipher_speed { struct cipher_speed {

View File

@ -44,6 +44,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <linux/bitops.h>
/* The large precomputed tables for the Twofish cipher (twofish.c) /* The large precomputed tables for the Twofish cipher (twofish.c)
@ -542,9 +543,9 @@ static const u8 calc_sb_tbl[512] = {
#define CALC_K(a, j, k, l, m, n) \ #define CALC_K(a, j, k, l, m, n) \
x = CALC_K_2 (k, l, k, l, 0); \ x = CALC_K_2 (k, l, k, l, 0); \
y = CALC_K_2 (m, n, m, n, 4); \ y = CALC_K_2 (m, n, m, n, 4); \
y = (y << 8) + (y >> 24); \ y = rol32(y, 8); \
x += y; y += x; ctx->a[j] = x; \ x += y; y += x; ctx->a[j] = x; \
ctx->a[(j) + 1] = (y << 9) + (y >> 23) ctx->a[(j) + 1] = rol32(y, 9)
#define CALC_K192_2(a, b, c, d, j) \ #define CALC_K192_2(a, b, c, d, j) \
CALC_K_2 (q0[a ^ key[(j) + 16]], \ CALC_K_2 (q0[a ^ key[(j) + 16]], \
@ -555,9 +556,9 @@ static const u8 calc_sb_tbl[512] = {
#define CALC_K192(a, j, k, l, m, n) \ #define CALC_K192(a, j, k, l, m, n) \
x = CALC_K192_2 (l, l, k, k, 0); \ x = CALC_K192_2 (l, l, k, k, 0); \
y = CALC_K192_2 (n, n, m, m, 4); \ y = CALC_K192_2 (n, n, m, m, 4); \
y = (y << 8) + (y >> 24); \ y = rol32(y, 8); \
x += y; y += x; ctx->a[j] = x; \ x += y; y += x; ctx->a[j] = x; \
ctx->a[(j) + 1] = (y << 9) + (y >> 23) ctx->a[(j) + 1] = rol32(y, 9)
#define CALC_K256_2(a, b, j) \ #define CALC_K256_2(a, b, j) \
CALC_K192_2 (q1[b ^ key[(j) + 24]], \ CALC_K192_2 (q1[b ^ key[(j) + 24]], \
@ -568,9 +569,9 @@ static const u8 calc_sb_tbl[512] = {
#define CALC_K256(a, j, k, l, m, n) \ #define CALC_K256(a, j, k, l, m, n) \
x = CALC_K256_2 (k, l, 0); \ x = CALC_K256_2 (k, l, 0); \
y = CALC_K256_2 (m, n, 4); \ y = CALC_K256_2 (m, n, 4); \
y = (y << 8) + (y >> 24); \ y = rol32(y, 8); \
x += y; y += x; ctx->a[j] = x; \ x += y; y += x; ctx->a[j] = x; \
ctx->a[(j) + 1] = (y << 9) + (y >> 23) ctx->a[(j) + 1] = rol32(y, 9)
/* Macros to compute the g() function in the encryption and decryption /* Macros to compute the g() function in the encryption and decryption
@ -594,15 +595,15 @@ static const u8 calc_sb_tbl[512] = {
x = G1 (a); y = G2 (b); \ x = G1 (a); y = G2 (b); \
x += y; y += x + ctx->k[2 * (n) + 1]; \ x += y; y += x + ctx->k[2 * (n) + 1]; \
(c) ^= x + ctx->k[2 * (n)]; \ (c) ^= x + ctx->k[2 * (n)]; \
(c) = ((c) >> 1) + ((c) << 31); \ (c) = ror32((c), 1); \
(d) = (((d) << 1)+((d) >> 31)) ^ y (d) = rol32((d), 1) ^ y
#define DECROUND(n, a, b, c, d) \ #define DECROUND(n, a, b, c, d) \
x = G1 (a); y = G2 (b); \ x = G1 (a); y = G2 (b); \
x += y; y += x; \ x += y; y += x; \
(d) ^= y + ctx->k[2 * (n) + 1]; \ (d) ^= y + ctx->k[2 * (n) + 1]; \
(d) = ((d) >> 1) + ((d) << 31); \ (d) = ror32((d), 1); \
(c) = (((c) << 1)+((c) >> 31)); \ (c) = rol32((c), 1); \
(c) ^= (x + ctx->k[2 * (n)]) (c) ^= (x + ctx->k[2 * (n)])
/* Encryption and decryption cycles; each one is simply two Feistel rounds /* Encryption and decryption cycles; each one is simply two Feistel rounds

View File

@ -284,7 +284,11 @@ aes_hw_extkey_available(uint8_t key_len)
static inline struct aes_ctx *aes_ctx(void *ctx) static inline struct aes_ctx *aes_ctx(void *ctx)
{ {
return (struct aes_ctx *)ALIGN((unsigned long)ctx, PADLOCK_ALIGNMENT); unsigned long align = PADLOCK_ALIGNMENT;
if (align <= crypto_tfm_ctx_alignment())
align = 1;
return (struct aes_ctx *)ALIGN((unsigned long)ctx, align);
} }
static int static int

View File

@ -229,6 +229,8 @@ struct crypto_tfm {
} crt_u; } crt_u;
struct crypto_alg *__crt_alg; struct crypto_alg *__crt_alg;
char __crt_ctx[] __attribute__ ((__aligned__));
}; };
/* /*
@ -301,7 +303,13 @@ static inline unsigned int crypto_tfm_alg_alignmask(struct crypto_tfm *tfm)
static inline void *crypto_tfm_ctx(struct crypto_tfm *tfm) static inline void *crypto_tfm_ctx(struct crypto_tfm *tfm)
{ {
return (void *)&tfm[1]; return tfm->__crt_ctx;
}
static inline unsigned int crypto_tfm_ctx_alignment(void)
{
struct crypto_tfm *tfm;
return __alignof__(tfm->__crt_ctx);
} }
/* /*