diff options
| -rw-r--r-- | crypto/Kconfig | 2 | ||||
| -rw-r--r-- | crypto/Makefile | 3 | ||||
| -rw-r--r-- | crypto/api.c | 3 | ||||
| -rw-r--r-- | include/linux/crypto.h | 7 |
4 files changed, 6 insertions, 9 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index e14ff1275018..edd00c5307a4 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -13,7 +13,7 @@ source "crypto/async_tx/Kconfig" # Cryptographic API Configuration # menuconfig CRYPTO - bool "Cryptographic API" + tristate "Cryptographic API" help This option provides the core Cryptographic API. diff --git a/crypto/Makefile b/crypto/Makefile index 6d34bf7ecf8d..ca024418f4fb 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -2,7 +2,8 @@ # Cryptographic API # -obj-$(CONFIG_CRYPTO) += api.o cipher.o digest.o compress.o +obj-$(CONFIG_CRYPTO) += crypto.o +crypto-objs := api.o cipher.o digest.o compress.o crypto_algapi-$(CONFIG_PROC_FS) += proc.o crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y) diff --git a/crypto/api.c b/crypto/api.c index a2496d1bc6d4..0a0f41ef255f 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -445,3 +445,6 @@ int crypto_has_alg(const char *name, u32 type, u32 mask) return ret; } EXPORT_SYMBOL_GPL(crypto_has_alg); + +MODULE_DESCRIPTION("Cryptographic core API"); +MODULE_LICENSE("GPL"); diff --git a/include/linux/crypto.h b/include/linux/crypto.h index 5e02d1b46370..425824bd49f3 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -317,14 +317,7 @@ int crypto_unregister_alg(struct crypto_alg *alg); /* * Algorithm query interface. */ -#ifdef CONFIG_CRYPTO int crypto_has_alg(const char *name, u32 type, u32 mask); -#else -static inline int crypto_has_alg(const char *name, u32 type, u32 mask) -{ - return 0; -} -#endif /* * Transforms: user-instantiated objects which encapsulate algorithms |