---

yaml --- r: 75963 b: refs/heads/master c: 653ebd9 h: refs/heads/master i: 75961: c9660c2 75959: 5c33e6e v: v3
git-mirror · Jan 10, 2008 · a5350a7 · a5350a7
1 parent 83689d0
commit a5350a7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2589469d7bc69bdfad4e05d88a0d2748f92ef0f3
+refs/heads/master: 653ebd9c8510a7d647ed23e66e1338f848ebdbab
diff --git a/trunk/crypto/Kconfig b/trunk/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
@@ -217,7 +213,7 @@ config CRYPTO_GCM
 
 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/trunk/crypto/Makefile b/trunk/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/trunk/drivers/crypto/Kconfig b/trunk/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.