| .. | .. |
|---|
| 58 | 58 | depends on KERNEL_MODE_NEON |
|---|
| 59 | 59 | select CRYPTO_HASH |
|---|
| 60 | 60 | select CRYPTO_GF128MUL |
|---|
| 61 | | - select CRYPTO_AES |
|---|
| 62 | | - select CRYPTO_AES_ARM64 |
|---|
| 61 | + select CRYPTO_LIB_AES |
|---|
| 62 | + select CRYPTO_AEAD |
|---|
| 63 | 63 | |
|---|
| 64 | 64 | config CRYPTO_CRCT10DIF_ARM64_CE |
|---|
| 65 | 65 | tristate "CRCT10DIF digest algorithm using PMULL instructions" |
|---|
| 66 | 66 | depends on KERNEL_MODE_NEON && CRC_T10DIF |
|---|
| 67 | | - select CRYPTO_HASH |
|---|
| 68 | | - |
|---|
| 69 | | -config CRYPTO_CRC32_ARM64_CE |
|---|
| 70 | | - tristate "CRC32 and CRC32C digest algorithms using ARMv8 extensions" |
|---|
| 71 | | - depends on CRC32 |
|---|
| 72 | 67 | select CRYPTO_HASH |
|---|
| 73 | 68 | |
|---|
| 74 | 69 | config CRYPTO_AES_ARM64 |
|---|
| .. | .. |
|---|
| 79 | 74 | tristate "AES core cipher using ARMv8 Crypto Extensions" |
|---|
| 80 | 75 | depends on ARM64 && KERNEL_MODE_NEON |
|---|
| 81 | 76 | select CRYPTO_ALGAPI |
|---|
| 82 | | - select CRYPTO_AES_ARM64 |
|---|
| 77 | + select CRYPTO_LIB_AES |
|---|
| 83 | 78 | |
|---|
| 84 | 79 | config CRYPTO_AES_ARM64_CE_CCM |
|---|
| 85 | 80 | tristate "AES in CCM mode using ARMv8 Crypto Extensions" |
|---|
| 86 | 81 | depends on ARM64 && KERNEL_MODE_NEON |
|---|
| 87 | 82 | select CRYPTO_ALGAPI |
|---|
| 88 | 83 | select CRYPTO_AES_ARM64_CE |
|---|
| 89 | | - select CRYPTO_AES_ARM64 |
|---|
| 90 | 84 | select CRYPTO_AEAD |
|---|
| 85 | + select CRYPTO_LIB_AES |
|---|
| 91 | 86 | |
|---|
| 92 | 87 | config CRYPTO_AES_ARM64_CE_BLK |
|---|
| 93 | 88 | tristate "AES in ECB/CBC/CTR/XTS modes using ARMv8 Crypto Extensions" |
|---|
| 94 | 89 | depends on KERNEL_MODE_NEON |
|---|
| 95 | | - select CRYPTO_BLKCIPHER |
|---|
| 90 | + select CRYPTO_SKCIPHER |
|---|
| 96 | 91 | select CRYPTO_AES_ARM64_CE |
|---|
| 97 | | - select CRYPTO_AES_ARM64 |
|---|
| 98 | | - select CRYPTO_SIMD |
|---|
| 99 | 92 | |
|---|
| 100 | 93 | config CRYPTO_AES_ARM64_NEON_BLK |
|---|
| 101 | 94 | tristate "AES in ECB/CBC/CTR/XTS modes using NEON instructions" |
|---|
| 102 | 95 | depends on KERNEL_MODE_NEON |
|---|
| 103 | | - select CRYPTO_BLKCIPHER |
|---|
| 104 | | - select CRYPTO_AES_ARM64 |
|---|
| 105 | | - select CRYPTO_AES |
|---|
| 106 | | - select CRYPTO_SIMD |
|---|
| 96 | + select CRYPTO_SKCIPHER |
|---|
| 97 | + select CRYPTO_LIB_AES |
|---|
| 107 | 98 | |
|---|
| 108 | 99 | config CRYPTO_CHACHA20_NEON |
|---|
| 109 | 100 | tristate "ChaCha20, XChaCha20, and XChaCha12 stream ciphers using NEON instructions" |
|---|
| 110 | 101 | depends on KERNEL_MODE_NEON |
|---|
| 111 | | - select CRYPTO_BLKCIPHER |
|---|
| 102 | + select CRYPTO_SKCIPHER |
|---|
| 112 | 103 | select CRYPTO_LIB_CHACHA_GENERIC |
|---|
| 113 | 104 | select CRYPTO_ARCH_HAVE_LIB_CHACHA |
|---|
| 114 | 105 | |
|---|
| .. | .. |
|---|
| 118 | 109 | select CRYPTO_HASH |
|---|
| 119 | 110 | select CRYPTO_ARCH_HAVE_LIB_POLY1305 |
|---|
| 120 | 111 | |
|---|
| 112 | +config CRYPTO_NHPOLY1305_NEON |
|---|
| 113 | + tristate "NHPoly1305 hash function using NEON instructions (for Adiantum)" |
|---|
| 114 | + depends on KERNEL_MODE_NEON |
|---|
| 115 | + select CRYPTO_NHPOLY1305 |
|---|
| 116 | + |
|---|
| 121 | 117 | config CRYPTO_AES_ARM64_BS |
|---|
| 122 | 118 | tristate "AES in ECB/CBC/CTR/XTS modes using bit-sliced NEON algorithm" |
|---|
| 123 | 119 | depends on KERNEL_MODE_NEON |
|---|
| 124 | | - select CRYPTO_BLKCIPHER |
|---|
| 120 | + select CRYPTO_SKCIPHER |
|---|
| 125 | 121 | select CRYPTO_AES_ARM64_NEON_BLK |
|---|
| 126 | | - select CRYPTO_AES_ARM64 |
|---|
| 127 | | - select CRYPTO_SIMD |
|---|
| 122 | + select CRYPTO_LIB_AES |
|---|
| 128 | 123 | |
|---|
| 129 | 124 | endif |
|---|