Commit:     653ebd9c8510a7d647ed23e66e1338f848ebdbab
Parent:     2589469d7bc69bdfad4e05d88a0d2748f92ef0f3
Author:     Herbert Xu <[EMAIL PROTECTED]>
AuthorDate: Tue Nov 27 19:48:27 2007 +0800
Committer:  Herbert Xu <[EMAIL PROTECTED]>
CommitDate: Fri Jan 11 08:16:41 2008 +1100

    [CRYPTO] blkcipher: Merge ablkcipher and blkcipher into one option/module
    With the impending addition of the givcipher type, both blkcipher and
    ablkcipher algorithms will use it to create givcipher objects.  As such
    it no longer makes sense to split the system between ablkcipher and
    blkcipher.  In particular, both ablkcipher.c and blkcipher.c would need
    to use the givcipher type which has to reside in ablkcipher.c since it
    shares much code with it.
    This patch merges the two Kconfig options as well as the modules into one.
    Signed-off-by: Herbert Xu <[EMAIL PROTECTED]>
 crypto/Kconfig         |    6 +-----
 crypto/Makefile        |    6 ++++--
 drivers/crypto/Kconfig |    2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 1eb4bcd..c4b6c91 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -24,10 +24,6 @@ config CRYPTO_ALGAPI
          This option provides the API for cryptographic algorithms.
-       tristate
-       select CRYPTO_BLKCIPHER
        select CRYPTO_ALGAPI
@@ -217,7 +213,7 @@ config CRYPTO_GCM
        tristate "Software async crypto daemon"
-       select CRYPTO_ABLKCIPHER
+       select CRYPTO_BLKCIPHER
        select CRYPTO_MANAGER
          This is a generic software asynchronous crypto daemon that
diff --git a/crypto/Makefile b/crypto/Makefile
index 83532ac..2a1883f 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -8,9 +8,11 @@ crypto_algapi-$(CONFIG_PROC_FS) += proc.o
 crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y)
 obj-$(CONFIG_CRYPTO_ALGAPI) += crypto_algapi.o
-obj-$(CONFIG_CRYPTO_ABLKCIPHER) += ablkcipher.o
 obj-$(CONFIG_CRYPTO_AEAD) += aead.o
-obj-$(CONFIG_CRYPTO_BLKCIPHER) += blkcipher.o
+crypto_blkcipher-objs := ablkcipher.o
+crypto_blkcipher-objs += blkcipher.o
+obj-$(CONFIG_CRYPTO_BLKCIPHER) += crypto_blkcipher.o
 crypto_hash-objs := hash.o
 obj-$(CONFIG_CRYPTO_HASH) += crypto_hash.o
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index d848e1b..d8c7040 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -87,7 +87,7 @@ config CRYPTO_DEV_HIFN_795X
        tristate "Driver HIFN 795x crypto accelerator chips"
        select CRYPTO_DES
        select CRYPTO_ALGAPI
-       select CRYPTO_ABLKCIPHER
+       select CRYPTO_BLKCIPHER
        depends on PCI
          This option allows you to have support for HIFN 795x crypto adapters.
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to