projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull bugzilla-7880 into release branch
[powerpc.git]
/
crypto
/
Kconfig
diff --git
a/crypto/Kconfig
b/crypto/Kconfig
index
620e14c
..
3d1a1e2
100644
(file)
--- a/
crypto/Kconfig
+++ b/
crypto/Kconfig
@@
-1,10
+1,18
@@
#
#
-#
Cryptographic API Configuration
+#
Generic algorithms support
#
#
+config XOR_BLOCKS
+ tristate
-menu "Cryptographic options"
+#
+# async_tx api: hardware offloaded memory transfer/transform support
+#
+source "crypto/async_tx/Kconfig"
-config CRYPTO
+#
+# Cryptographic API Configuration
+#
+menuconfig CRYPTO
bool "Cryptographic API"
help
This option provides the core Cryptographic API.
bool "Cryptographic API"
help
This option provides the core Cryptographic API.
@@
-271,7
+279,7
@@
config CRYPTO_SERPENT
Keys are allowed to be from 0 to 256 bits in length, in steps
of 8 bits. Also includes the 'Tnepres' algorithm, a reversed
Keys are allowed to be from 0 to 256 bits in length, in steps
of 8 bits. Also includes the 'Tnepres' algorithm, a reversed
- variant of Serpent for compatibility with old kerneli code.
+ variant of Serpent for compatibility with old kerneli
.org
code.
See also:
<http://www.cl.cam.ac.uk/~rja14/serpent.html>
See also:
<http://www.cl.cam.ac.uk/~rja14/serpent.html>
@@
-463,5
+471,3
@@
config CRYPTO_TEST
source "drivers/crypto/Kconfig"
endif # if CRYPTO
source "drivers/crypto/Kconfig"
endif # if CRYPTO
-
-endmenu