[CRYPTO] blkcipher: Merge ablkcipher and blkcipher into one option/module
Now that we have 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 8d6cac9..0528702 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -24,10 +24,6 @@ config CRYPTO_ALGAPI
help
This option provides the API for cryptographic algorithms.
-config CRYPTO_ABLKCIPHER
- tristate
- select CRYPTO_BLKCIPHER
-
config CRYPTO_AEAD
tristate
select CRYPTO_ALGAPI
@@ -208,7 +204,7 @@ config CRYPTO_CTR
config CRYPTO_CRYPTD
tristate "Software async crypto daemon"
- select CRYPTO_ABLKCIPHER
+ select CRYPTO_BLKCIPHER
select CRYPTO_MANAGER
help
This is a generic software asynchronous crypto daemon that
diff --git a/crypto/Makefile b/crypto/Makefile
index 9daf1b3..b8b3296 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
help
This option allows you to have support for HIFN 795x crypto adapters.
Hi Herbert.
On Thu, Nov 22, 2007 at 04:48:41PM +0800, Herbert Xu ([email protected]) wrote:
> [CRYPTO] blkcipher: Merge ablkcipher and blkcipher into one option/module
>
> Now that we have 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.
This breaks cryptodev tree, since some devices other than cryptd selects
CRYPTO_ABLKCIPHER.
--
Evgeniy Polyakov
On Thu, Nov 22, 2007 at 02:18:07PM +0300, Evgeniy Polyakov wrote:
>
> On Thu, Nov 22, 2007 at 04:48:41PM +0800, Herbert Xu ([email protected]) wrote:
> > [CRYPTO] blkcipher: Merge ablkcipher and blkcipher into one option/module
> >
> > Now that we have 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.
>
> This breaks cryptodev tree, since some devices other than cryptd selects
> CRYPTO_ABLKCIPHER.
Are you sure? The bottom hunk of that patch fixes this, no?
Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
On Thu, Nov 22, 2007 at 07:28:15PM +0800, Herbert Xu ([email protected]) wrote:
> On Thu, Nov 22, 2007 at 02:18:07PM +0300, Evgeniy Polyakov wrote:
> >
> > On Thu, Nov 22, 2007 at 04:48:41PM +0800, Herbert Xu ([email protected]) wrote:
> > > [CRYPTO] blkcipher: Merge ablkcipher and blkcipher into one option/module
> > >
> > > Now that we have 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.
> >
> > This breaks cryptodev tree, since some devices other than cryptd selects
> > CRYPTO_ABLKCIPHER.
>
> Are you sure? The bottom hunk of that patch fixes this, no?
It looks I missed something :)
--
Evgeniy Polyakov