diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 09:33:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 09:33:19 -0800 |
| commit | ec1248e70edc5cf7b485efcc7b41e44e10f422e5 (patch) | |
| tree | 80ca10a1ad9dc572e131a56a93fcf0c63c14d168 /crypto/serpent.c | |
| parent | 3d1f337b3e7378923c89f37afb573a918ef40be5 (diff) | |
| parent | 55e9dce37ddf3ab358ba1d1e9eef4ee4bd8174a6 (diff) | |
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
Diffstat (limited to 'crypto/serpent.c')
| -rw-r--r-- | crypto/serpent.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/serpent.c b/crypto/serpent.c index 52ad1a49262..e366406ab49 100644 --- a/crypto/serpent.c +++ b/crypto/serpent.c @@ -481,6 +481,7 @@ static struct crypto_alg serpent_alg = { .cra_flags = CRYPTO_ALG_TYPE_CIPHER, .cra_blocksize = SERPENT_BLOCK_SIZE, .cra_ctxsize = sizeof(struct serpent_ctx), + .cra_alignmask = 3, .cra_module = THIS_MODULE, .cra_list = LIST_HEAD_INIT(serpent_alg.cra_list), .cra_u = { .cipher = { |