From: Michal Ludvig Date: Sun, 21 May 2006 22:28:06 +0000 (+1000) Subject: [CRYPTO] api: Fixed incorrect passing of context instead of tfm X-Git-Tag: v2.6.18-rc1~603^2~7 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=110bf1c0e932615cbe43a8af8a07bc3750ae4295;p=linux.git [CRYPTO] api: Fixed incorrect passing of context instead of tfm Fix a few omissions in passing TFM instead of CTX to algorithms. Signed-off-by: Michal Ludvig Signed-off-by: Herbert Xu --- diff --git a/crypto/compress.c b/crypto/compress.c index c12fc0c41dac..f3e07334afd0 100644 --- a/crypto/compress.c +++ b/crypto/compress.c @@ -44,7 +44,7 @@ int crypto_init_compress_ops(struct crypto_tfm *tfm) int ret = 0; struct compress_tfm *ops = &tfm->crt_compress; - ret = tfm->__crt_alg->cra_compress.coa_init(crypto_tfm_ctx(tfm)); + ret = tfm->__crt_alg->cra_compress.coa_init(tfm); if (ret) goto out; @@ -57,5 +57,5 @@ int crypto_init_compress_ops(struct crypto_tfm *tfm) void crypto_exit_compress_ops(struct crypto_tfm *tfm) { - tfm->__crt_alg->cra_compress.coa_exit(crypto_tfm_ctx(tfm)); + tfm->__crt_alg->cra_compress.coa_exit(tfm); } diff --git a/crypto/digest.c b/crypto/digest.c index 2d9d509c2c51..603006a7bef2 100644 --- a/crypto/digest.c +++ b/crypto/digest.c @@ -70,10 +70,10 @@ static void final(struct crypto_tfm *tfm, u8 *out) unsigned int size = crypto_tfm_alg_digestsize(tfm); u8 buffer[size + alignmask]; u8 *dst = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); - tfm->__crt_alg->cra_digest.dia_final(crypto_tfm_ctx(tfm), dst); + tfm->__crt_alg->cra_digest.dia_final(tfm, dst); memcpy(out, dst, size); } else - tfm->__crt_alg->cra_digest.dia_final(crypto_tfm_ctx(tfm), out); + tfm->__crt_alg->cra_digest.dia_final(tfm, out); } static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)