diff options
| author | Mikael Ylikoski <my@post.utfors.se> | 2003-08-17 14:04:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-08-17 14:04:17 -0700 |
| commit | f7ab034d70d50dadd7801d3970dec18edd6b07a1 (patch) | |
| tree | 19aef5b060f1f92cb59c03da65f10ded67bd57d1 /include/linux | |
| parent | 68bc1ac97a21214d62a04468eda26c775fc1bc97 (diff) | |
[IPSEC]: Fix oops using null ciper in CBC mode.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/crypto.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/crypto.h b/include/linux/crypto.h index 07820d52922d..2331966abe8f 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -65,7 +65,6 @@ struct scatterlist; struct cipher_alg { unsigned int cia_min_keysize; unsigned int cia_max_keysize; - unsigned int cia_ivsize; int (*cia_setkey)(void *ctx, const u8 *key, unsigned int keylen, u32 *flags); void (*cia_encrypt)(void *ctx, u8 *dst, const u8 *src); @@ -128,6 +127,7 @@ struct crypto_tfm; struct cipher_tfm { void *cit_iv; + unsigned int cit_ivsize; u32 cit_mode; int (*cit_setkey)(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen); @@ -237,7 +237,7 @@ static inline unsigned int crypto_tfm_alg_max_keysize(struct crypto_tfm *tfm) static inline unsigned int crypto_tfm_alg_ivsize(struct crypto_tfm *tfm) { BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); - return tfm->__crt_alg->cra_cipher.cia_ivsize; + return tfm->crt_cipher.cit_ivsize; } static inline unsigned int crypto_tfm_alg_blocksize(struct crypto_tfm *tfm) |