summaryrefslogtreecommitdiff
path: root/drivers/tee
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-02-24 22:40:23 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-02-24 22:40:23 +0300
commit7031ecffab86199c2c688f7a723d03dfa6910fa6 (patch)
tree9e96a5ed577131f1e8814a8b12593d9c7b01ca74 /drivers/tee
parentbc570c14b260946a66e13882eace862dc6eb16f8 (diff)
parentc9cc0517bba9f0213f1e55172feceb99e5512daf (diff)
downloadlinux-7031ecffab86199c2c688f7a723d03dfa6910fa6.tar.xz
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu: "This fixes a Kconfig-related build error and an integer overflow in chacha20poly1305" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: chacha20poly1305 - prevent integer overflow on large input tee: amdtee: amdtee depends on CRYPTO_DEV_CCP_DD
Diffstat (limited to 'drivers/tee')
-rw-r--r--drivers/tee/amdtee/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tee/amdtee/Kconfig b/drivers/tee/amdtee/Kconfig
index 4e32b6413b41..191f9715fa9a 100644
--- a/drivers/tee/amdtee/Kconfig
+++ b/drivers/tee/amdtee/Kconfig
@@ -3,6 +3,6 @@
config AMDTEE
tristate "AMD-TEE"
default m
- depends on CRYPTO_DEV_SP_PSP
+ depends on CRYPTO_DEV_SP_PSP && CRYPTO_DEV_CCP_DD
help
This implements AMD's Trusted Execution Environment (TEE) driver.