diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2005-07-06 13:53:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-07-06 13:53:29 -0700 |
| commit | fbdae9f3e7fb57c07cb0d973f113eb25da2e8ff2 (patch) | |
| tree | b20909c92c2d48ab449343967b1c365732d7e4ff /crypto/internal.h | |
| parent | 176c3652c544b6f8d4bb1984c58c10080f45dbf0 (diff) | |
| download | linux-3.10-fbdae9f3e7fb57c07cb0d973f113eb25da2e8ff2.tar.gz linux-3.10-fbdae9f3e7fb57c07cb0d973f113eb25da2e8ff2.tar.bz2 linux-3.10-fbdae9f3e7fb57c07cb0d973f113eb25da2e8ff2.zip | |
[CRYPTO] Ensure cit_iv is aligned correctly
This patch ensures that cit_iv is aligned according to cra_alignmask
by allocating it as part of the tfm structure. As a side effect the
crypto layer will also guarantee that the tfm ctx area has enough space
to be aligned by cra_alignmask. This allows us to remove the extra
space reservation from the Padlock driver.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto/internal.h')
| -rw-r--r-- | crypto/internal.h | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/crypto/internal.h b/crypto/internal.h index 83b1b6d6d92..68612874b5f 100644 --- a/crypto/internal.h +++ b/crypto/internal.h @@ -16,6 +16,7 @@ #include <linux/highmem.h> #include <linux/interrupt.h> #include <linux/init.h> +#include <linux/kernel.h> #include <asm/kmap_types.h> extern enum km_type crypto_km_types[]; @@ -61,6 +62,33 @@ static inline void crypto_init_proc(void) { } #endif +static inline unsigned int crypto_digest_ctxsize(struct crypto_alg *alg, + int flags) +{ + return alg->cra_ctxsize; +} + +static inline unsigned int crypto_cipher_ctxsize(struct crypto_alg *alg, + int flags) +{ + unsigned int len = alg->cra_ctxsize; + + switch (flags & CRYPTO_TFM_MODE_MASK) { + case CRYPTO_TFM_MODE_CBC: + len = ALIGN(len, alg->cra_alignmask + 1); + len += alg->cra_blocksize; + break; + } + + return len; +} + +static inline unsigned int crypto_compress_ctxsize(struct crypto_alg *alg, + int flags) +{ + return alg->cra_ctxsize; +} + int crypto_init_digest_flags(struct crypto_tfm *tfm, u32 flags); int crypto_init_cipher_flags(struct crypto_tfm *tfm, u32 flags); int crypto_init_compress_flags(struct crypto_tfm *tfm, u32 flags); |