diff options
| -rw-r--r-- | crypto/Kconfig | 10 | ||||
| -rw-r--r-- | crypto/Makefile | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index cf5a427bb54d..7347277bedf3 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -192,16 +192,12 @@ config CRYPTO_MANAGER_EXTRA_TESTS config CRYPTO_NULL tristate "Null algorithms" - select CRYPTO_NULL2 + select CRYPTO_ALGAPI + select CRYPTO_SKCIPHER + select CRYPTO_HASH help These are 'Null' algorithms, used by IPsec, which do nothing. -config CRYPTO_NULL2 - tristate - select CRYPTO_ALGAPI2 - select CRYPTO_SKCIPHER2 - select CRYPTO_HASH2 - config CRYPTO_PCRYPT tristate "Parallel crypto engine" depends on SMP diff --git a/crypto/Makefile b/crypto/Makefile index 84f6911dc9ba..0f77e093512c 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -71,7 +71,7 @@ obj-$(CONFIG_CRYPTO_USER) += crypto_user.o obj-$(CONFIG_CRYPTO_CMAC) += cmac.o obj-$(CONFIG_CRYPTO_HMAC) += hmac.o obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o -obj-$(CONFIG_CRYPTO_NULL2) += crypto_null.o +obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o obj-$(CONFIG_CRYPTO_MD4) += md4.o obj-$(CONFIG_CRYPTO_MD5) += md5.o obj-$(CONFIG_CRYPTO_RMD160) += rmd160.o |