diff mbox series

[01/30] crypto: shash - remove crypto_shash_ctx_aligned()

Message ID 20231022081100.123613-2-ebiggers@kernel.org (mailing list archive)
State Accepted
Delegated to: Herbert Xu
Headers show
Series crypto: reduce ahash API overhead | expand

Commit Message

Eric Biggers Oct. 22, 2023, 8:10 a.m. UTC 
From: Eric Biggers <ebiggers@google.com>

crypto_shash_ctx_aligned() is no longer used, and it is useless now that
shash algorithms don't support nonzero alignmasks, so remove it.

Also remove crypto_tfm_ctx_aligned() which was only called by
crypto_shash_ctx_aligned().  It's unlikely to be useful again, since it
seems inappropriate to use cra_alignmask to represent alignment for the
tfm context when it already means alignment for inputs/outputs.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 include/crypto/algapi.h        | 5 -----
 include/crypto/internal/hash.h | 5 -----
 2 files changed, 10 deletions(-)
diff mbox series

Patch

diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index ca86f4c6ba439..7a4a71af653fa 100644
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -188,25 +188,20 @@  static inline void *crypto_tfm_ctx(struct crypto_tfm *tfm)
 
 static inline void *crypto_tfm_ctx_align(struct crypto_tfm *tfm,
 					 unsigned int align)
 {
 	if (align <= crypto_tfm_ctx_alignment())
 		align = 1;
 
 	return PTR_ALIGN(crypto_tfm_ctx(tfm), align);
 }
 
-static inline void *crypto_tfm_ctx_aligned(struct crypto_tfm *tfm)
-{
-	return crypto_tfm_ctx_align(tfm, crypto_tfm_alg_alignmask(tfm) + 1);
-}
-
 static inline unsigned int crypto_dma_align(void)
 {
 	return CRYPTO_DMA_ALIGN;
 }
 
 static inline unsigned int crypto_dma_padding(void)
 {
 	return (crypto_dma_align() - 1) & ~(crypto_tfm_ctx_alignment() - 1);
 }
 
diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h
index cf65676e45f4d..8d0cd0c591a09 100644
--- a/include/crypto/internal/hash.h
+++ b/include/crypto/internal/hash.h
@@ -262,22 +262,17 @@  static inline void *shash_instance_ctx(struct shash_instance *inst)
 {
 	return crypto_instance_ctx(shash_crypto_instance(inst));
 }
 
 static inline struct crypto_shash *crypto_spawn_shash(
 	struct crypto_shash_spawn *spawn)
 {
 	return crypto_spawn_tfm2(&spawn->base);
 }
 
-static inline void *crypto_shash_ctx_aligned(struct crypto_shash *tfm)
-{
-	return crypto_tfm_ctx_aligned(&tfm->base);
-}
-
 static inline struct crypto_shash *__crypto_shash_cast(struct crypto_tfm *tfm)
 {
 	return container_of(tfm, struct crypto_shash, base);
 }
 
 #endif	/* _CRYPTO_INTERNAL_HASH_H */