This is a test repository.
Revision | 33c148a4ae7dc3cd440f6c0d746ac7f0ff320682 (tree) |
---|---|
Time | 2020-12-28 02:14:32 |
Author | Linus Torvalds <torvalds@linu...> |
Commiter | Linus Torvalds |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
@@ -1,12 +1,13 @@ | ||
1 | 1 | config CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 |
2 | 2 | tristate "Support for Intel Keem Bay OCS AES/SM4 HW acceleration" |
3 | - depends on OF || COMPILE_TEST | |
3 | + depends on HAS_IOMEM | |
4 | + depends on ARCH_KEEMBAY || COMPILE_TEST | |
4 | 5 | select CRYPTO_SKCIPHER |
5 | 6 | select CRYPTO_AEAD |
6 | 7 | select CRYPTO_ENGINE |
7 | 8 | help |
8 | 9 | Support for Intel Keem Bay Offload and Crypto Subsystem (OCS) AES and |
9 | - SM4 cihper hardware acceleration for use with Crypto API. | |
10 | + SM4 cipher hardware acceleration for use with Crypto API. | |
10 | 11 | |
11 | 12 | Provides HW acceleration for the following transformations: |
12 | 13 | cbc(aes), ctr(aes), ccm(aes), gcm(aes), cbc(sm4), ctr(sm4), ccm(sm4) |
@@ -11,6 +11,7 @@ config CRYPTO_DEV_QAT | ||
11 | 11 | select CRYPTO_SHA1 |
12 | 12 | select CRYPTO_SHA256 |
13 | 13 | select CRYPTO_SHA512 |
14 | + select CRYPTO_AES | |
14 | 15 | select FW_LOADER |
15 | 16 | |
16 | 17 | config CRYPTO_DEV_QAT_DH895xCC |