projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
crypto: wp512 - Switch to shash
[cascardo/linux.git]
/
crypto
/
Kconfig
diff --git
a/crypto/Kconfig
b/crypto/Kconfig
index
39dbd8e
..
bc29216
100644
(file)
--- a/
crypto/Kconfig
+++ b/
crypto/Kconfig
@@
-31,35
+31,63
@@
config CRYPTO_FIPS
config CRYPTO_ALGAPI
tristate
config CRYPTO_ALGAPI
tristate
+ select CRYPTO_ALGAPI2
help
This option provides the API for cryptographic algorithms.
help
This option provides the API for cryptographic algorithms.
+config CRYPTO_ALGAPI2
+ tristate
+
config CRYPTO_AEAD
tristate
config CRYPTO_AEAD
tristate
+ select CRYPTO_AEAD2
select CRYPTO_ALGAPI
select CRYPTO_ALGAPI
+config CRYPTO_AEAD2
+ tristate
+ select CRYPTO_ALGAPI2
+
config CRYPTO_BLKCIPHER
tristate
config CRYPTO_BLKCIPHER
tristate
+ select CRYPTO_BLKCIPHER2
select CRYPTO_ALGAPI
select CRYPTO_ALGAPI
- select CRYPTO_RNG
+
+config CRYPTO_BLKCIPHER2
+ tristate
+ select CRYPTO_ALGAPI2
+ select CRYPTO_RNG2
config CRYPTO_HASH
tristate
config CRYPTO_HASH
tristate
+ select CRYPTO_HASH2
select CRYPTO_ALGAPI
select CRYPTO_ALGAPI
+config CRYPTO_HASH2
+ tristate
+ select CRYPTO_ALGAPI2
+
config CRYPTO_RNG
tristate
config CRYPTO_RNG
tristate
+ select CRYPTO_RNG2
select CRYPTO_ALGAPI
select CRYPTO_ALGAPI
+config CRYPTO_RNG2
+ tristate
+ select CRYPTO_ALGAPI2
+
config CRYPTO_MANAGER
tristate "Cryptographic algorithm manager"
config CRYPTO_MANAGER
tristate "Cryptographic algorithm manager"
- select CRYPTO_AEAD
- select CRYPTO_HASH
- select CRYPTO_BLKCIPHER
+ select CRYPTO_MANAGER2
help
Create default cryptographic template instantiations such as
cbc(aes).
help
Create default cryptographic template instantiations such as
cbc(aes).
+config CRYPTO_MANAGER2
+ def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
+ select CRYPTO_AEAD2
+ select CRYPTO_HASH2
+ select CRYPTO_BLKCIPHER2
+
config CRYPTO_GF128MUL
tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
depends on EXPERIMENTAL
config CRYPTO_GF128MUL
tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
depends on EXPERIMENTAL
@@
-74,6
+102,7
@@
config CRYPTO_NULL
tristate "Null algorithms"
select CRYPTO_ALGAPI
select CRYPTO_BLKCIPHER
tristate "Null algorithms"
select CRYPTO_ALGAPI
select CRYPTO_BLKCIPHER
+ select CRYPTO_HASH
help
These are 'Null' algorithms, used by IPsec, which do nothing.
help
These are 'Null' algorithms, used by IPsec, which do nothing.
@@
-228,12
+257,10
@@
comment "Digest"
config CRYPTO_CRC32C
tristate "CRC32c CRC algorithm"
select CRYPTO_HASH
config CRYPTO_CRC32C
tristate "CRC32c CRC algorithm"
select CRYPTO_HASH
- select LIBCRC32C
help
Castagnoli, et al Cyclic Redundancy-Check Algorithm. Used
by iSCSI for header and data digests and by others.
help
Castagnoli, et al Cyclic Redundancy-Check Algorithm. Used
by iSCSI for header and data digests and by others.
- See Castagnoli93. This implementation uses lib/libcrc32c.
- Module will be crc32c.
+ See Castagnoli93. Module will be crc32c.
config CRYPTO_CRC32C_INTEL
tristate "CRC32c INTEL hardware acceleration"
config CRYPTO_CRC32C_INTEL
tristate "CRC32c INTEL hardware acceleration"
@@
-249,13
+276,13
@@
config CRYPTO_CRC32C_INTEL
config CRYPTO_MD4
tristate "MD4 digest algorithm"
config CRYPTO_MD4
tristate "MD4 digest algorithm"
- select CRYPTO_
ALGAPI
+ select CRYPTO_
HASH
help
MD4 message digest algorithm (RFC1320).
config CRYPTO_MD5
tristate "MD5 digest algorithm"
help
MD4 message digest algorithm (RFC1320).
config CRYPTO_MD5
tristate "MD5 digest algorithm"
- select CRYPTO_
ALGAPI
+ select CRYPTO_
HASH
help
MD5 message digest algorithm (RFC1321).
help
MD5 message digest algorithm (RFC1321).
@@
-270,7
+297,7
@@
config CRYPTO_MICHAEL_MIC
config CRYPTO_RMD128
tristate "RIPEMD-128 digest algorithm"
config CRYPTO_RMD128
tristate "RIPEMD-128 digest algorithm"
- select CRYPTO_
ALGAPI
+ select CRYPTO_
HASH
help
RIPEMD-128 (ISO/IEC 10118-3:2004).
help
RIPEMD-128 (ISO/IEC 10118-3:2004).
@@
-283,7
+310,7
@@
config CRYPTO_RMD128
config CRYPTO_RMD160
tristate "RIPEMD-160 digest algorithm"
config CRYPTO_RMD160
tristate "RIPEMD-160 digest algorithm"
- select CRYPTO_
ALGAPI
+ select CRYPTO_
HASH
help
RIPEMD-160 (ISO/IEC 10118-3:2004).
help
RIPEMD-160 (ISO/IEC 10118-3:2004).
@@
-300,7
+327,7
@@
config CRYPTO_RMD160
config CRYPTO_RMD256
tristate "RIPEMD-256 digest algorithm"
config CRYPTO_RMD256
tristate "RIPEMD-256 digest algorithm"
- select CRYPTO_
ALGAPI
+ select CRYPTO_
HASH
help
RIPEMD-256 is an optional extension of RIPEMD-128 with a
256 bit hash. It is intended for applications that require
help
RIPEMD-256 is an optional extension of RIPEMD-128 with a
256 bit hash. It is intended for applications that require
@@
-312,7
+339,7
@@
config CRYPTO_RMD256
config CRYPTO_RMD320
tristate "RIPEMD-320 digest algorithm"
config CRYPTO_RMD320
tristate "RIPEMD-320 digest algorithm"
- select CRYPTO_
ALGAPI
+ select CRYPTO_
HASH
help
RIPEMD-320 is an optional extension of RIPEMD-160 with a
320 bit hash. It is intended for applications that require
help
RIPEMD-320 is an optional extension of RIPEMD-160 with a
320 bit hash. It is intended for applications that require
@@
-324,13
+351,13
@@
config CRYPTO_RMD320
config CRYPTO_SHA1
tristate "SHA1 digest algorithm"
config CRYPTO_SHA1
tristate "SHA1 digest algorithm"
- select CRYPTO_
ALGAPI
+ select CRYPTO_
HASH
help
SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
config CRYPTO_SHA256
tristate "SHA224 and SHA256 digest algorithm"
help
SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
config CRYPTO_SHA256
tristate "SHA224 and SHA256 digest algorithm"
- select CRYPTO_
ALGAPI
+ select CRYPTO_
HASH
help
SHA256 secure hash standard (DFIPS 180-2).
help
SHA256 secure hash standard (DFIPS 180-2).
@@
-354,7
+381,7
@@
config CRYPTO_SHA512
config CRYPTO_TGR192
tristate "Tiger digest algorithms"
config CRYPTO_TGR192
tristate "Tiger digest algorithms"
- select CRYPTO_
ALGAPI
+ select CRYPTO_
HASH
help
Tiger hash algorithm 192, 160 and 128-bit hashes
help
Tiger hash algorithm 192, 160 and 128-bit hashes
@@
-367,7
+394,7
@@
config CRYPTO_TGR192
config CRYPTO_WP512
tristate "Whirlpool digest algorithms"
config CRYPTO_WP512
tristate "Whirlpool digest algorithms"
- select CRYPTO_
ALGAPI
+ select CRYPTO_
HASH
help
Whirlpool hash algorithm 512, 384 and 256-bit hashes
help
Whirlpool hash algorithm 512, 384 and 256-bit hashes