lib/crypto: gf128hash: Remove unused content from ghash.h

Now that the structures in <crypto/ghash.h> are no longer used, remove
them.  Since this leaves <crypto/ghash.h> as just containing constants,
include it from <crypto/gf128hash.h> to deduplicate these definitions.

Acked-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20260319061723.1140720-19-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@kernel.org>

diff --git a/include/crypto/gf128hash.h b/include/crypto/gf128hash.h
index 0bc649d01e12bbb6ecb791d2df6c0580e04503e1..41c557d559655471172c9bdb42149db5e698736c 100644 (file)
--- a/include/crypto/gf128hash.h
+++ b/include/crypto/gf128hash.h
@@ -8,11 +8,10 @@
 #ifndef _CRYPTO_GF128HASH_H
 #define _CRYPTO_GF128HASH_H
 
+#include <crypto/ghash.h>
 #include <linux/string.h>
 #include <linux/types.h>
 
-#define GHASH_BLOCK_SIZE       16
-#define GHASH_DIGEST_SIZE      16
 #define POLYVAL_BLOCK_SIZE     16
 #define POLYVAL_DIGEST_SIZE    16
 

diff --git a/include/crypto/ghash.h b/include/crypto/ghash.h
index 043d938e9a2c3c4b616975f610067d905eba7d91..d187e5af99258e30bf2a54ca679016204bb560eb 100644 (file)
--- a/include/crypto/ghash.h
+++ b/include/crypto/ghash.h
@@ -6,19 +6,7 @@
 #ifndef __CRYPTO_GHASH_H__
 #define __CRYPTO_GHASH_H__
 
-#include <linux/types.h>
-
 #define GHASH_BLOCK_SIZE       16
 #define GHASH_DIGEST_SIZE      16
 
-struct gf128mul_4k;
-
-struct ghash_ctx {
-       struct gf128mul_4k *gf128;
-};
-
-struct ghash_desc_ctx {
-       u8 buffer[GHASH_BLOCK_SIZE];
-};
-
 #endif