Revert "crypto: ahash - Set default reqsize from ahash_alg"
This reverts commit 9f27b38771 which is
commit 9e01aaa1033d6e40f8d7cf4f20931a61ce9e3f04 upstream.
It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.
Bug: 161946584
Change-Id: Ib90b0adcb219ff6bbb5771482f0e456bed7cdc40
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
@@ -473,7 +473,6 @@ static int crypto_ahash_init_tfm(struct crypto_tfm *tfm)
|
||||
struct ahash_alg *alg = crypto_ahash_alg(hash);
|
||||
|
||||
crypto_ahash_set_statesize(hash, alg->halg.statesize);
|
||||
crypto_ahash_set_reqsize(hash, alg->reqsize);
|
||||
|
||||
if (tfm->__crt_alg->cra_type == &crypto_shash_type)
|
||||
return crypto_init_ahash_using_shash(tfm);
|
||||
@@ -639,9 +638,6 @@ static int ahash_prepare_alg(struct ahash_alg *alg)
|
||||
if (alg->halg.statesize == 0)
|
||||
return -EINVAL;
|
||||
|
||||
if (alg->reqsize && alg->reqsize < alg->halg.statesize)
|
||||
return -EINVAL;
|
||||
|
||||
err = hash_prepare_alg(&alg->halg);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
@@ -132,7 +132,6 @@ struct ahash_request {
|
||||
* This is a counterpart to @init_tfm, used to remove
|
||||
* various changes set in @init_tfm.
|
||||
* @clone_tfm: Copy transform into new object, may allocate memory.
|
||||
* @reqsize: Size of the request context.
|
||||
* @halg: see struct hash_alg_common
|
||||
*/
|
||||
struct ahash_alg {
|
||||
@@ -149,8 +148,6 @@ struct ahash_alg {
|
||||
void (*exit_tfm)(struct crypto_ahash *tfm);
|
||||
int (*clone_tfm)(struct crypto_ahash *dst, struct crypto_ahash *src);
|
||||
|
||||
unsigned int reqsize;
|
||||
|
||||
struct hash_alg_common halg;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user