Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c9418f2 authored by Kamil Konieczny's avatar Kamil Konieczny Committed by Herbert Xu
Browse files

crypto: ux500/hash - Add empty export and import 



Crypto framework requires export/import in async hash. If driver do not
implement them, wrapper functions in framework will be used, and it will
cause error during ahash alg registration (unless one disables crypto
internal tests). To make change in framework and expose this requirement,
I will remove wrappers from crypto/ahash.c , but this can broke code which
depends on them. Add empty hash export and import, with the same behaviour
as in framework and expose this directly in driver. This can also prevent
OOPS when config option in Cryptographic API 'Disable run-time self tests'
will be enabled.

Signed-off-by: default avatarKamil Konieczny <k.konieczny@partner.samsung.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 378fe6fb

drivers/crypto/ux500/hash/hash_core.c

+18 −0
Original line number Diff line number Diff line
@@ -1403,6 +1403,16 @@ static int ahash_sha256_digest(struct ahash_request *req) 
	return ret1 ? ret1 : ret2;

}



static int ahash_noimport(struct ahash_request *req, const void *in)

{

	return -ENOSYS;

}



static int ahash_noexport(struct ahash_request *req, void *out)

{

	return -ENOSYS;

}



static int hmac_sha1_init(struct ahash_request *req)

{

	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
@@ -1507,6 +1517,8 @@ static struct hash_algo_template hash_algs[] = { 
			.update = ahash_update,

			.final = ahash_final,

			.digest = ahash_sha1_digest,

			.export = ahash_noexport,

			.import = ahash_noimport,

			.halg.digestsize = SHA1_DIGEST_SIZE,

			.halg.statesize = sizeof(struct hash_ctx),

			.halg.base = {
@@ -1529,6 +1541,8 @@ static struct hash_algo_template hash_algs[] = { 
			.update	= ahash_update,

			.final = ahash_final,

			.digest = ahash_sha256_digest,

			.export = ahash_noexport,

			.import = ahash_noimport,

			.halg.digestsize = SHA256_DIGEST_SIZE,

			.halg.statesize = sizeof(struct hash_ctx),

			.halg.base = {
@@ -1553,6 +1567,8 @@ static struct hash_algo_template hash_algs[] = { 
			.final = ahash_final,

			.digest = hmac_sha1_digest,

			.setkey = hmac_sha1_setkey,

			.export = ahash_noexport,

			.import = ahash_noimport,

			.halg.digestsize = SHA1_DIGEST_SIZE,

			.halg.statesize = sizeof(struct hash_ctx),

			.halg.base = {
@@ -1577,6 +1593,8 @@ static struct hash_algo_template hash_algs[] = { 
			.final = ahash_final,

			.digest = hmac_sha256_digest,

			.setkey = hmac_sha256_setkey,

			.export = ahash_noexport,

			.import = ahash_noimport,

			.halg.digestsize = SHA256_DIGEST_SIZE,

			.halg.statesize = sizeof(struct hash_ctx),

			.halg.base = {