Commit c3715cb90f722b1cf5f6f073be02cc8a49659b90

Authored by Sebastian Siewior
Committed by Herbert Xu
1 parent 76cb952179

[CRYPTO] api: Make the crypto subsystem fully modular

Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Showing 4 changed files with 6 additions and 9 deletions Side-by-side Diff

... ... @@ -13,7 +13,7 @@
13 13 # Cryptographic API Configuration
14 14 #
15 15 menuconfig CRYPTO
16   - bool "Cryptographic API"
  16 + tristate "Cryptographic API"
17 17 help
18 18 This option provides the core Cryptographic API.
19 19  
... ... @@ -2,7 +2,8 @@
2 2 # Cryptographic API
3 3 #
4 4  
5   -obj-$(CONFIG_CRYPTO) += api.o cipher.o digest.o compress.o
  5 +obj-$(CONFIG_CRYPTO) += crypto.o
  6 +crypto-objs := api.o cipher.o digest.o compress.o
6 7  
7 8 crypto_algapi-$(CONFIG_PROC_FS) += proc.o
8 9 crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y)
... ... @@ -445,4 +445,7 @@
445 445 return ret;
446 446 }
447 447 EXPORT_SYMBOL_GPL(crypto_has_alg);
  448 +
  449 +MODULE_DESCRIPTION("Cryptographic core API");
  450 +MODULE_LICENSE("GPL");
include/linux/crypto.h
... ... @@ -317,14 +317,7 @@
317 317 /*
318 318 * Algorithm query interface.
319 319 */
320   -#ifdef CONFIG_CRYPTO
321 320 int crypto_has_alg(const char *name, u32 type, u32 mask);
322   -#else
323   -static inline int crypto_has_alg(const char *name, u32 type, u32 mask)
324   -{
325   - return 0;
326   -}
327   -#endif
328 321  
329 322 /*
330 323 * Transforms: user-instantiated objects which encapsulate algorithms