projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/rockchip: Correct printk formats for info dump
[firefly-linux-kernel-4.4.55.git]
/
crypto
/
ahash.c
diff --git
a/crypto/ahash.c
b/crypto/ahash.c
index 9c1dc8d6106a89a0f853271c1dfc49cd301ec983..dac1c24e9c3e5d0771beeb8bea56e89f1c88efbc 100644
(file)
--- a/
crypto/ahash.c
+++ b/
crypto/ahash.c
@@
-69,8
+69,9
@@
static int hash_walk_new_entry(struct crypto_hash_walk *walk)
struct scatterlist *sg;
sg = walk->sg;
struct scatterlist *sg;
sg = walk->sg;
- walk->pg = sg_page(sg);
walk->offset = sg->offset;
walk->offset = sg->offset;
+ walk->pg = sg_page(walk->sg) + (walk->offset >> PAGE_SHIFT);
+ walk->offset = offset_in_page(walk->offset);
walk->entrylen = sg->length;
if (walk->entrylen > walk->total)
walk->entrylen = sg->length;
if (walk->entrylen > walk->total)
@@
-451,6
+452,7
@@
static int crypto_ahash_init_tfm(struct crypto_tfm *tfm)
struct ahash_alg *alg = crypto_ahash_alg(hash);
hash->setkey = ahash_nosetkey;
struct ahash_alg *alg = crypto_ahash_alg(hash);
hash->setkey = ahash_nosetkey;
+ hash->has_setkey = false;
hash->export = ahash_no_export;
hash->import = ahash_no_import;
hash->export = ahash_no_export;
hash->import = ahash_no_import;
@@
-463,8
+465,10
@@
static int crypto_ahash_init_tfm(struct crypto_tfm *tfm)
hash->finup = alg->finup ?: ahash_def_finup;
hash->digest = alg->digest;
hash->finup = alg->finup ?: ahash_def_finup;
hash->digest = alg->digest;
- if (alg->setkey)
+ if (alg->setkey)
{
hash->setkey = alg->setkey;
hash->setkey = alg->setkey;
+ hash->has_setkey = true;
+ }
if (alg->export)
hash->export = alg->export;
if (alg->import)
if (alg->export)
hash->export = alg->export;
if (alg->import)