summaryrefslogtreecommitdiffstats
path: root/crypto/shash.c
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/shash.c')
-rw-r--r--crypto/shash.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/crypto/shash.c b/crypto/shash.c
index 15b369c4745f..e55c1f558bc3 100644
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -238,7 +238,6 @@ static int shash_async_init(struct ahash_request *req)
238 struct shash_desc *desc = ahash_request_ctx(req); 238 struct shash_desc *desc = ahash_request_ctx(req);
239 239
240 desc->tfm = *ctx; 240 desc->tfm = *ctx;
241 desc->flags = req->base.flags;
242 241
243 return crypto_shash_init(desc); 242 return crypto_shash_init(desc);
244} 243}
@@ -293,7 +292,6 @@ static int shash_async_finup(struct ahash_request *req)
293 struct shash_desc *desc = ahash_request_ctx(req); 292 struct shash_desc *desc = ahash_request_ctx(req);
294 293
295 desc->tfm = *ctx; 294 desc->tfm = *ctx;
296 desc->flags = req->base.flags;
297 295
298 return shash_ahash_finup(req, desc); 296 return shash_ahash_finup(req, desc);
299} 297}
@@ -307,14 +305,13 @@ int shash_ahash_digest(struct ahash_request *req, struct shash_desc *desc)
307 305
308 if (nbytes && 306 if (nbytes &&
309 (sg = req->src, offset = sg->offset, 307 (sg = req->src, offset = sg->offset,
310 nbytes < min(sg->length, ((unsigned int)(PAGE_SIZE)) - offset))) { 308 nbytes <= min(sg->length, ((unsigned int)(PAGE_SIZE)) - offset))) {
311 void *data; 309 void *data;
312 310
313 data = kmap_atomic(sg_page(sg)); 311 data = kmap_atomic(sg_page(sg));
314 err = crypto_shash_digest(desc, data + offset, nbytes, 312 err = crypto_shash_digest(desc, data + offset, nbytes,
315 req->result); 313 req->result);
316 kunmap_atomic(data); 314 kunmap_atomic(data);
317 crypto_yield(desc->flags);
318 } else 315 } else
319 err = crypto_shash_init(desc) ?: 316 err = crypto_shash_init(desc) ?:
320 shash_ahash_finup(req, desc); 317 shash_ahash_finup(req, desc);
@@ -329,7 +326,6 @@ static int shash_async_digest(struct ahash_request *req)
329 struct shash_desc *desc = ahash_request_ctx(req); 326 struct shash_desc *desc = ahash_request_ctx(req);
330 327
331 desc->tfm = *ctx; 328 desc->tfm = *ctx;
332 desc->flags = req->base.flags;
333 329
334 return shash_ahash_digest(req, desc); 330 return shash_ahash_digest(req, desc);
335} 331}
@@ -345,7 +341,6 @@ static int shash_async_import(struct ahash_request *req, const void *in)
345 struct shash_desc *desc = ahash_request_ctx(req); 341 struct shash_desc *desc = ahash_request_ctx(req);
346 342
347 desc->tfm = *ctx; 343 desc->tfm = *ctx;
348 desc->flags = req->base.flags;
349 344
350 return crypto_shash_import(desc, in); 345 return crypto_shash_import(desc, in);
351} 346}