summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorVlad Yasevich <vladislav.yasevich@hp.com>2007-10-26 03:46:26 +0200
committerDavid S. Miller <davem@davemloft.net>2007-10-26 03:46:26 +0200
commit41fb285430e9cb57da624d838afef7b2fc67e276 (patch)
tree5cbf870440316b9f2520b4220da3c695296f3bd9 /crypto
parent[IPV4]: Remove no longer used snmp4_icmp_list. (diff)
downloadlinux-41fb285430e9cb57da624d838afef7b2fc67e276.tar.xz
linux-41fb285430e9cb57da624d838afef7b2fc67e276.zip
[CRYPTO]: Fix hmac_digest from the SG breakage.
Crypto now uses SG helper functions. Fix hmac_digest to use those functions correctly and fix the oops associated with it. Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/hmac.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/hmac.c b/crypto/hmac.c
index 6691981bda11..e3f5c0f3e2f7 100644
--- a/crypto/hmac.c
+++ b/crypto/hmac.c
@@ -158,9 +158,11 @@ static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg,
desc.tfm = ctx->child;
desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
+ sg_init_table(sg1, 2);
sg_set_buf(sg1, ipad, bs);
+ sg_set_page(&sg1[1], (void *) sg, 0, 0);
- sg_set_page(&sg[1], (void *) sg, 0, 0);
+ sg_init_table(sg2, 1);
sg_set_buf(sg2, opad, bs + ds);
err = crypto_hash_digest(&desc, sg1, nbytes + bs, digest);