Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6aeb49bc5a6fffe2f8ba0668cf7459b6a4b672dc

Authored by Jussi Kivilinna
Committed by Herbert Xu
1 parent a5e7a2dcfc
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

crypto: sha256 - use crypto_[un]register_shashes 

Combine all shash algs to be registered and use new crypto_[un]register_shashes
functions. This simplifies init/exit code.

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Showing 1 changed file with 5 additions and 20 deletions Side-by-side Diff

crypto/sha256_generic.c
Diff comments   View file @ 6aeb49b
... ... @@ -336,7 +336,7 @@
336 336 return 0;
337 337 }
338 338  
339   -static struct shash_alg sha256 = {
  339 +static struct shash_alg sha256_algs[2] = { {
340 340 .digestsize = SHA256_DIGEST_SIZE,
341 341 .init = sha256_init,
342 342 .update = sha256_update,
... ... @@ -352,9 +352,7 @@
352 352 .cra_blocksize = SHA256_BLOCK_SIZE,
353 353 .cra_module = THIS_MODULE,
354 354 }
355   -};
356   -
357   -static struct shash_alg sha224 = {
  355 +}, {
358 356 .digestsize = SHA224_DIGEST_SIZE,
359 357 .init = sha224_init,
360 358 .update = sha256_update,
361 359  
362 360  
... ... @@ -367,29 +365,16 @@
367 365 .cra_blocksize = SHA224_BLOCK_SIZE,
368 366 .cra_module = THIS_MODULE,
369 367 }
370   -};
  368 +} };
371 369  
372 370 static int __init sha256_generic_mod_init(void)
373 371 {
374   - int ret = 0;
375   -
376   - ret = crypto_register_shash(&sha224);
377   -
378   - if (ret < 0)
379   - return ret;
380   -
381   - ret = crypto_register_shash(&sha256);
382   -
383   - if (ret < 0)
384   - crypto_unregister_shash(&sha224);
385   -
386   - return ret;
  372 + return crypto_register_shashes(sha256_algs, ARRAY_SIZE(sha256_algs));
387 373 }
388 374  
389 375 static void __exit sha256_generic_mod_fini(void)
390 376 {
391   - crypto_unregister_shash(&sha224);
392   - crypto_unregister_shash(&sha256);
  377 + crypto_unregister_shashes(sha256_algs, ARRAY_SIZE(sha256_algs));
393 378 }
394 379  
395 380 module_init(sha256_generic_mod_init);