diff options
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/shash.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/crypto/shash.c b/crypto/shash.c index 23e05a1e9038..14a3b707a31f 100644 --- a/crypto/shash.c +++ b/crypto/shash.c | |||
@@ -172,19 +172,15 @@ int crypto_shash_digest(struct shash_desc *desc, const u8 *data, | |||
172 | } | 172 | } |
173 | EXPORT_SYMBOL_GPL(crypto_shash_digest); | 173 | EXPORT_SYMBOL_GPL(crypto_shash_digest); |
174 | 174 | ||
175 | int crypto_shash_import(struct shash_desc *desc, const u8 *in) | 175 | static int shash_no_export(struct shash_desc *desc, void *out) |
176 | { | 176 | { |
177 | struct crypto_shash *tfm = desc->tfm; | 177 | return -ENOSYS; |
178 | struct shash_alg *alg = crypto_shash_alg(tfm); | 178 | } |
179 | |||
180 | memcpy(shash_desc_ctx(desc), in, crypto_shash_descsize(tfm)); | ||
181 | |||
182 | if (alg->reinit) | ||
183 | return alg->reinit(desc); | ||
184 | 179 | ||
185 | return 0; | 180 | static int shash_no_import(struct shash_desc *desc, const void *in) |
181 | { | ||
182 | return -ENOSYS; | ||
186 | } | 183 | } |
187 | EXPORT_SYMBOL_GPL(crypto_shash_import); | ||
188 | 184 | ||
189 | static int shash_async_setkey(struct crypto_ahash *tfm, const u8 *key, | 185 | static int shash_async_setkey(struct crypto_ahash *tfm, const u8 *key, |
190 | unsigned int keylen) | 186 | unsigned int keylen) |
@@ -484,12 +480,19 @@ static int shash_prepare_alg(struct shash_alg *alg) | |||
484 | struct crypto_alg *base = &alg->base; | 480 | struct crypto_alg *base = &alg->base; |
485 | 481 | ||
486 | if (alg->digestsize > PAGE_SIZE / 8 || | 482 | if (alg->digestsize > PAGE_SIZE / 8 || |
487 | alg->descsize > PAGE_SIZE / 8) | 483 | alg->descsize > PAGE_SIZE / 8 || |
484 | alg->statesize > PAGE_SIZE / 8) | ||
488 | return -EINVAL; | 485 | return -EINVAL; |
489 | 486 | ||
490 | base->cra_type = &crypto_shash_type; | 487 | base->cra_type = &crypto_shash_type; |
491 | base->cra_flags &= ~CRYPTO_ALG_TYPE_MASK; | 488 | base->cra_flags &= ~CRYPTO_ALG_TYPE_MASK; |
492 | base->cra_flags |= CRYPTO_ALG_TYPE_SHASH; | 489 | base->cra_flags |= CRYPTO_ALG_TYPE_SHASH; |
490 | |||
491 | if (!alg->import) | ||
492 | alg->import = shash_no_import; | ||
493 | if (!alg->export) | ||
494 | alg->export = shash_no_export; | ||
495 | |||
493 | return 0; | 496 | return 0; |
494 | } | 497 | } |
495 | 498 | ||