summaryrefslogtreecommitdiff
path: root/crypto/Kconfig
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2016-03-15 16:54:45 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-03-15 16:54:45 -0700
commit0d6e29d8da85e74c1b37801469be3974fd706ba7 (patch)
tree0a5824f6fef63ea2be36406768e8cfe3e6c2457e /crypto/Kconfig
parent2db18d12ffa4131d398564bfc0fb15f26cdf52e5 (diff)
parent5da64d0814134dc3542fb314a66dcdf74e8553bd (diff)
downloadlinux-crypto-0d6e29d8da85e74c1b37801469be3974fd706ba7.tar.gz
linux-crypto-0d6e29d8da85e74c1b37801469be3974fd706ba7.zip
Merge tag 'v4.5' into next
Merge with Linux 4.5 to get PROPERTY_ENTRY_INTEGER() that is needed to fix pxa/raumfeld rotary encoder properties.
Diffstat (limited to '')
-rw-r--r--crypto/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 72408211..3be07ad1 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -472,11 +472,13 @@ config CRYPTO_CRCT10DIF_PCLMUL
config CRYPTO_GHASH
tristate "GHASH digest algorithm"
select CRYPTO_GF128MUL
+ select CRYPTO_HASH
help
GHASH is message digest algorithm for GCM (Galois/Counter Mode).
config CRYPTO_POLY1305
tristate "Poly1305 authenticator algorithm"
+ select CRYPTO_HASH
help
Poly1305 authenticator algorithm, RFC7539.