summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-10-11 16:45:17 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2007-11-23 19:32:09 +0800
commit6af5c01eccc9e384c12bb5cc20c8e025f8b2e7c2 (patch)
tree068a8f42db9b0b87225c26337120e9fc0560982a
parente5c1b37a931916ef0137b2baca0e32fc9df32c13 (diff)
downloadlinux-crypto-6af5c01eccc9e384c12bb5cc20c8e025f8b2e7c2.tar.gz
linux-crypto-6af5c01eccc9e384c12bb5cc20c8e025f8b2e7c2.zip
[CRYPTO] authenc: Move initialisations up to shut up gcc
It seems that newer versions of gcc have regressed in their abilities to analyse initialisations. This patch moves the initialisations up to avoid the warnings. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--crypto/authenc.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/crypto/authenc.c b/crypto/authenc.c
index 0b29a6ae..126a529b 100644
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -84,8 +84,8 @@ static int crypto_authenc_hash(struct aead_request *req)
.tfm = auth,
};
u8 *hash = aead_request_ctx(req);
- struct scatterlist *dst;
- unsigned int cryptlen;
+ struct scatterlist *dst = req->dst;
+ unsigned int cryptlen = req->cryptlen;
int err;
hash = (u8 *)ALIGN((unsigned long)hash + crypto_hash_alignmask(auth),
@@ -100,8 +100,6 @@ static int crypto_authenc_hash(struct aead_request *req)
if (err)
goto auth_unlock;
- cryptlen = req->cryptlen;
- dst = req->dst;
err = crypto_hash_update(&desc, dst, cryptlen);
if (err)
goto auth_unlock;
@@ -159,8 +157,8 @@ static int crypto_authenc_verify(struct aead_request *req)
};
u8 *ohash = aead_request_ctx(req);
u8 *ihash;
- struct scatterlist *src;
- unsigned int cryptlen;
+ struct scatterlist *src = req->src;
+ unsigned int cryptlen = req->cryptlen;
unsigned int authsize;
int err;
@@ -177,8 +175,6 @@ static int crypto_authenc_verify(struct aead_request *req)
if (err)
goto auth_unlock;
- cryptlen = req->cryptlen;
- src = req->src;
err = crypto_hash_update(&desc, src, cryptlen);
if (err)
goto auth_unlock;