diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-11-29 12:47:41 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-11-29 12:47:41 +1100 |
| commit | a43a1243adfa8cc682fd4dacab89910865c28031 (patch) | |
| tree | 7aef00d973ddaeace8916dca0d2a5b5b33cd28de /crypto/Kconfig | |
| parent | f960b5ebd9ed09bc12e10c712bce82ab58ef0435 (diff) | |
| parent | 65cb3654889e0b748abc7756260ca267705aee14 (diff) | |
| download | linux-crypto-a43a1243adfa8cc682fd4dacab89910865c28031.tar.gz linux-crypto-a43a1243adfa8cc682fd4dacab89910865c28031.zip | |
Merge tag 'v4.15-rc1' into next-seccomp
Linux 4.15-rc1
Diffstat (limited to 'crypto/Kconfig')
| -rw-r--r-- | crypto/Kconfig | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index caa770e5..f7911963 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Generic algorithms support # @@ -859,6 +860,17 @@ config CRYPTO_SHA3 References: http://keccak.noekeon.org/ +config CRYPTO_SM3 + tristate "SM3 digest algorithm" + select CRYPTO_HASH + help + SM3 secure hash function as defined by OSCCA GM/T 0004-2012 SM3). + It is part of the Chinese Commercial Cryptography suite. + + References: + http://www.oscca.gov.cn/UpFile/20101222141857786.pdf + https://datatracker.ietf.org/doc/html/draft-shen-sm3-hash + config CRYPTO_TGR192 tristate "Tiger digest algorithms" select CRYPTO_HASH @@ -1753,6 +1765,8 @@ config CRYPTO_USER_API_AEAD tristate "User-space interface for AEAD cipher algorithms" depends on NET select CRYPTO_AEAD + select CRYPTO_BLKCIPHER + select CRYPTO_NULL select CRYPTO_USER_API help This option enables the user-spaces interface for AEAD |