patch-2.4.25 linux-2.4.25/crypto/cipher.c
Next file: linux-2.4.25/crypto/crypto_null.c
Previous file: linux-2.4.25/crypto/cast6.c
Back to the patch index
Back to the overall index
- Lines: 28
- Date:
2004-02-18 05:36:31.000000000 -0800
- Orig file:
linux-2.4.24/crypto/cipher.c
- Orig date:
2003-08-25 04:44:40.000000000 -0700
diff -urN linux-2.4.24/crypto/cipher.c linux-2.4.25/crypto/cipher.c
@@ -345,7 +345,6 @@
int crypto_init_cipher_ops(struct crypto_tfm *tfm)
{
int ret = 0;
- struct crypto_alg *alg = tfm->__crt_alg;
struct cipher_tfm *ops = &tfm->crt_cipher;
ops->cit_setkey = setkey;
@@ -381,8 +380,7 @@
BUG();
}
- if (alg->cra_cipher.cia_ivsize &&
- ops->cit_mode != CRYPTO_TFM_MODE_ECB) {
+ if (ops->cit_mode == CRYPTO_TFM_MODE_CBC) {
switch (crypto_tfm_alg_blocksize(tfm)) {
case 8:
@@ -401,7 +399,8 @@
goto out;
}
- ops->cit_iv = kmalloc(alg->cra_cipher.cia_ivsize, GFP_KERNEL);
+ ops->cit_ivsize = crypto_tfm_alg_blocksize(tfm);
+ ops->cit_iv = kmalloc(ops->cit_ivsize, GFP_KERNEL);
if (ops->cit_iv == NULL)
ret = -ENOMEM;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)