projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
[linux-2.6-block.git]
/
crypto
/
Kconfig
diff --git
a/crypto/Kconfig
b/crypto/Kconfig
index 20360e040425fad97bb4fd1e1647b71065b01e33..b75264b09a46bb6e7f84bf83966e98f2c5c27d11 100644
(file)
--- a/
crypto/Kconfig
+++ b/
crypto/Kconfig
@@
-131,7
+131,7
@@
config CRYPTO_DH
config CRYPTO_ECDH
tristate "ECDH algorithm"
config CRYPTO_ECDH
tristate "ECDH algorithm"
- select CRY
TP
O_KPP
+ select CRY
PT
O_KPP
select CRYPTO_RNG_DEFAULT
help
Generic implementation of the ECDH algorithm
select CRYPTO_RNG_DEFAULT
help
Generic implementation of the ECDH algorithm
@@
-1340,6
+1340,7
@@
config CRYPTO_SALSA20_586
tristate "Salsa20 stream cipher algorithm (i586)"
depends on (X86 || UML_X86) && !64BIT
select CRYPTO_BLKCIPHER
tristate "Salsa20 stream cipher algorithm (i586)"
depends on (X86 || UML_X86) && !64BIT
select CRYPTO_BLKCIPHER
+ select CRYPTO_SALSA20
help
Salsa20 stream cipher algorithm.
help
Salsa20 stream cipher algorithm.
@@
-1353,6
+1354,7
@@
config CRYPTO_SALSA20_X86_64
tristate "Salsa20 stream cipher algorithm (x86_64)"
depends on (X86 || UML_X86) && 64BIT
select CRYPTO_BLKCIPHER
tristate "Salsa20 stream cipher algorithm (x86_64)"
depends on (X86 || UML_X86) && 64BIT
select CRYPTO_BLKCIPHER
+ select CRYPTO_SALSA20
help
Salsa20 stream cipher algorithm.
help
Salsa20 stream cipher algorithm.