diff options
| author |   Eric Biggers <ebiggers@google.com> | 2025-04-28 09:24:58 -0700 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2025-04-28 10:02:45 -0700 |
| commit | 46e3311607d6c18a760fba4afbd5d24d42abb0f3 (patch) | |
| tree | cb4996681c7a556174d01fcc8f4239ecff8f35a0 | |
| parent | x86/crc: drop "glue" from filenames (diff) | |
| download | wireguard-linux-46e3311607d6c18a760fba4afbd5d24d42abb0f3.tar.xz wireguard-linux-46e3311607d6c18a760fba4afbd5d24d42abb0f3.zip | |
crypto: crc32 - remove "generic" from file and module names
Since crc32_generic.c and crc32c_generic.c now expose both the generic
and architecture-optimized implementations via the crypto_shash API,
rather than just the generic implementations as they originally did,
remove the "generic" part of the filenames and module names:
crypto/crc32-generic.c => crypto/crc32.c
crypto/crc32c-generic.c => crypto/crc32c.c
crc32-generic.ko => crc32-cryptoapi.ko
crc32c-generic.ko => crc32c-cryptoapi.ko
The reason for adding the -cryptoapi suffixes to the module names is to
avoid a module name collision with crc32.ko which is the library API.
We could instead rename the library module to libcrc32.ko. However,
while lib/crypto/ uses that convention, the rest of lib/ doesn't. Since
the library API is the primary API for CRC-32, I'd like to keep the
unsuffixed name for it and make the Crypto API modules use a suffix.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20250428162458.29732-1-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
| -rw-r--r-- | crypto/Makefile | 10 | ||||
| -rw-r--r-- | crypto/crc32.c (renamed from crypto/crc32_generic.c) | 0 | ||||
| -rw-r--r-- | crypto/crc32c.c (renamed from crypto/crc32c_generic.c) | 0 |
3 files changed, 6 insertions, 4 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index 0e6ab5ffd3f7..186f968baa39 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -152,10 +152,12 @@ obj-$(CONFIG_CRYPTO_CHACHA20) += chacha_generic.o obj-$(CONFIG_CRYPTO_POLY1305) += poly1305_generic.o obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o -obj-$(CONFIG_CRYPTO_CRC32C) += crc32c_generic.o -obj-$(CONFIG_CRYPTO_CRC32) += crc32_generic.o -CFLAGS_crc32c_generic.o += -DARCH=$(ARCH) -CFLAGS_crc32_generic.o += -DARCH=$(ARCH) +obj-$(CONFIG_CRYPTO_CRC32C) += crc32c-cryptoapi.o +crc32c-cryptoapi-y := crc32c.o +CFLAGS_crc32c.o += -DARCH=$(ARCH) +obj-$(CONFIG_CRYPTO_CRC32) += crc32-cryptoapi.o +crc32-cryptoapi-y := crc32.o +CFLAGS_crc32.o += -DARCH=$(ARCH) obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o obj-$(CONFIG_CRYPTO_KRB5ENC) += krb5enc.o obj-$(CONFIG_CRYPTO_LZO) += lzo.o lzo-rle.o diff --git a/crypto/crc32_generic.c b/crypto/crc32.c index 783a30b27398..783a30b27398 100644 --- a/crypto/crc32_generic.c +++ b/crypto/crc32.c diff --git a/crypto/crc32c_generic.c b/crypto/crc32c.c index b1a36d32dc50..b1a36d32dc50 100644 --- a/crypto/crc32c_generic.c +++ b/crypto/crc32c.c |