projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[IP6TUNNEL]: Use proper net in hash-lookup functions.
[deliverable/linux.git]
/
crypto
/
hmac.c
diff --git
a/crypto/hmac.c
b/crypto/hmac.c
index 0f05be769c346c71d6ed3a70228d947c4699e50f..b60c3c7aa320ba08548c050f4fc05d231321de61 100644
(file)
--- a/
crypto/hmac.c
+++ b/
crypto/hmac.c
@@
-17,6
+17,7
@@
*/
#include <crypto/algapi.h>
*/
#include <crypto/algapi.h>
+#include <crypto/scatterwalk.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/kernel.h>
@@
-160,7
+161,7
@@
static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg,
sg_init_table(sg1, 2);
sg_set_buf(sg1, ipad, bs);
sg_init_table(sg1, 2);
sg_set_buf(sg1, ipad, bs);
- s
g_set_page(&sg1[1], (void *) sg, 0, 0
);
+ s
catterwalk_sg_chain(sg1, 2, sg
);
sg_init_table(sg2, 1);
sg_set_buf(sg2, opad, bs + ds);
sg_init_table(sg2, 1);
sg_set_buf(sg2, opad, bs + ds);
@@
-212,7
+213,7
@@
static struct crypto_instance *hmac_alloc(struct rtattr **tb)
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_HASH,
CRYPTO_ALG_TYPE_HASH_MASK);
if (IS_ERR(alg))
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_HASH,
CRYPTO_ALG_TYPE_HASH_MASK);
if (IS_ERR(alg))
- return ERR_
PTR(PTR_ERR(alg)
);
+ return ERR_
CAST(alg
);
inst = crypto_alloc_instance("hmac", alg);
if (IS_ERR(inst))
inst = crypto_alloc_instance("hmac", alg);
if (IS_ERR(inst))
This page took
0.029476 seconds
and
5
git commands to generate.