tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

crypto: skcipher - rename the crypto_blkcipher module and kconfig option

Now that the blkcipher algorithm type has been removed in favor of
skcipher, rename the crypto_blkcipher kernel module to crypto_skcipher,
and rename the config options accordingly:

CONFIG_CRYPTO_BLKCIPHER => CONFIG_CRYPTO_SKCIPHER
CONFIG_CRYPTO_BLKCIPHER2 => CONFIG_CRYPTO_SKCIPHER2

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Eric Biggers and committed by
Herbert Xu b95bba5d c65058b7

+94 -94
+3 -3
arch/arm/crypto/Kconfig
··· 81 81 config CRYPTO_AES_ARM_BS 82 82 tristate "Bit sliced AES using NEON instructions" 83 83 depends on KERNEL_MODE_NEON 84 - select CRYPTO_BLKCIPHER 84 + select CRYPTO_SKCIPHER 85 85 select CRYPTO_LIB_AES 86 86 select CRYPTO_SIMD 87 87 help ··· 97 97 config CRYPTO_AES_ARM_CE 98 98 tristate "Accelerated AES using ARMv8 Crypto Extensions" 99 99 depends on KERNEL_MODE_NEON && (CC_IS_CLANG || GCC_VERSION >= 40800) 100 - select CRYPTO_BLKCIPHER 100 + select CRYPTO_SKCIPHER 101 101 select CRYPTO_SIMD 102 102 help 103 103 Use an implementation of AES in CBC, CTR and XTS modes that uses ··· 130 130 config CRYPTO_CHACHA20_NEON 131 131 tristate "NEON accelerated ChaCha stream cipher algorithms" 132 132 depends on KERNEL_MODE_NEON 133 - select CRYPTO_BLKCIPHER 133 + select CRYPTO_SKCIPHER 134 134 select CRYPTO_CHACHA20 135 135 136 136 config CRYPTO_NHPOLY1305_NEON
+4 -4
arch/arm64/crypto/Kconfig
··· 86 86 config CRYPTO_AES_ARM64_CE_BLK 87 87 tristate "AES in ECB/CBC/CTR/XTS modes using ARMv8 Crypto Extensions" 88 88 depends on KERNEL_MODE_NEON 89 - select CRYPTO_BLKCIPHER 89 + select CRYPTO_SKCIPHER 90 90 select CRYPTO_AES_ARM64_CE 91 91 select CRYPTO_AES_ARM64 92 92 select CRYPTO_SIMD ··· 94 94 config CRYPTO_AES_ARM64_NEON_BLK 95 95 tristate "AES in ECB/CBC/CTR/XTS modes using NEON instructions" 96 96 depends on KERNEL_MODE_NEON 97 - select CRYPTO_BLKCIPHER 97 + select CRYPTO_SKCIPHER 98 98 select CRYPTO_AES_ARM64 99 99 select CRYPTO_LIB_AES 100 100 select CRYPTO_SIMD ··· 102 102 config CRYPTO_CHACHA20_NEON 103 103 tristate "ChaCha20, XChaCha20, and XChaCha12 stream ciphers using NEON instructions" 104 104 depends on KERNEL_MODE_NEON 105 - select CRYPTO_BLKCIPHER 105 + select CRYPTO_SKCIPHER 106 106 select CRYPTO_CHACHA20 107 107 108 108 config CRYPTO_NHPOLY1305_NEON ··· 113 113 config CRYPTO_AES_ARM64_BS 114 114 tristate "AES in ECB/CBC/CTR/XTS modes using bit-sliced NEON algorithm" 115 115 depends on KERNEL_MODE_NEON 116 - select CRYPTO_BLKCIPHER 116 + select CRYPTO_SKCIPHER 117 117 select CRYPTO_AES_ARM64_NEON_BLK 118 118 select CRYPTO_AES_ARM64 119 119 select CRYPTO_LIB_AES
+42 -42
crypto/Kconfig
··· 52 52 select CRYPTO_NULL2 53 53 select CRYPTO_RNG2 54 54 55 - config CRYPTO_BLKCIPHER 55 + config CRYPTO_SKCIPHER 56 56 tristate 57 - select CRYPTO_BLKCIPHER2 57 + select CRYPTO_SKCIPHER2 58 58 select CRYPTO_ALGAPI 59 59 60 - config CRYPTO_BLKCIPHER2 60 + config CRYPTO_SKCIPHER2 61 61 tristate 62 62 select CRYPTO_ALGAPI2 63 63 select CRYPTO_RNG2 ··· 123 123 def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y) 124 124 select CRYPTO_AEAD2 125 125 select CRYPTO_HASH2 126 - select CRYPTO_BLKCIPHER2 126 + select CRYPTO_SKCIPHER2 127 127 select CRYPTO_AKCIPHER2 128 128 select CRYPTO_KPP2 129 129 select CRYPTO_ACOMP2 ··· 169 169 config CRYPTO_NULL2 170 170 tristate 171 171 select CRYPTO_ALGAPI2 172 - select CRYPTO_BLKCIPHER2 172 + select CRYPTO_SKCIPHER2 173 173 select CRYPTO_HASH2 174 174 175 175 config CRYPTO_PCRYPT ··· 184 184 185 185 config CRYPTO_CRYPTD 186 186 tristate "Software async crypto daemon" 187 - select CRYPTO_BLKCIPHER 187 + select CRYPTO_SKCIPHER 188 188 select CRYPTO_HASH 189 189 select CRYPTO_MANAGER 190 190 help ··· 195 195 config CRYPTO_AUTHENC 196 196 tristate "Authenc support" 197 197 select CRYPTO_AEAD 198 - select CRYPTO_BLKCIPHER 198 + select CRYPTO_SKCIPHER 199 199 select CRYPTO_MANAGER 200 200 select CRYPTO_HASH 201 201 select CRYPTO_NULL ··· 217 217 config CRYPTO_GLUE_HELPER_X86 218 218 tristate 219 219 depends on X86 220 - select CRYPTO_BLKCIPHER 220 + select CRYPTO_SKCIPHER 221 221 222 222 config CRYPTO_ENGINE 223 223 tristate ··· 323 323 config CRYPTO_SEQIV 324 324 tristate "Sequence Number IV Generator" 325 325 select CRYPTO_AEAD 326 - select CRYPTO_BLKCIPHER 326 + select CRYPTO_SKCIPHER 327 327 select CRYPTO_NULL 328 328 select CRYPTO_RNG_DEFAULT 329 329 select CRYPTO_MANAGER ··· 346 346 347 347 config CRYPTO_CBC 348 348 tristate "CBC support" 349 - select CRYPTO_BLKCIPHER 349 + select CRYPTO_SKCIPHER 350 350 select CRYPTO_MANAGER 351 351 help 352 352 CBC: Cipher Block Chaining mode ··· 354 354 355 355 config CRYPTO_CFB 356 356 tristate "CFB support" 357 - select CRYPTO_BLKCIPHER 357 + select CRYPTO_SKCIPHER 358 358 select CRYPTO_MANAGER 359 359 help 360 360 CFB: Cipher FeedBack mode ··· 362 362 363 363 config CRYPTO_CTR 364 364 tristate "CTR support" 365 - select CRYPTO_BLKCIPHER 365 + select CRYPTO_SKCIPHER 366 366 select CRYPTO_SEQIV 367 367 select CRYPTO_MANAGER 368 368 help ··· 371 371 372 372 config CRYPTO_CTS 373 373 tristate "CTS support" 374 - select CRYPTO_BLKCIPHER 374 + select CRYPTO_SKCIPHER 375 375 select CRYPTO_MANAGER 376 376 help 377 377 CTS: Cipher Text Stealing ··· 386 386 387 387 config CRYPTO_ECB 388 388 tristate "ECB support" 389 - select CRYPTO_BLKCIPHER 389 + select CRYPTO_SKCIPHER 390 390 select CRYPTO_MANAGER 391 391 help 392 392 ECB: Electronic CodeBook mode ··· 395 395 396 396 config CRYPTO_LRW 397 397 tristate "LRW support" 398 - select CRYPTO_BLKCIPHER 398 + select CRYPTO_SKCIPHER 399 399 select CRYPTO_MANAGER 400 400 select CRYPTO_GF128MUL 401 401 help ··· 407 407 408 408 config CRYPTO_OFB 409 409 tristate "OFB support" 410 - select CRYPTO_BLKCIPHER 410 + select CRYPTO_SKCIPHER 411 411 select CRYPTO_MANAGER 412 412 help 413 413 OFB: the Output Feedback mode makes a block cipher into a synchronous ··· 419 419 420 420 config CRYPTO_PCBC 421 421 tristate "PCBC support" 422 - select CRYPTO_BLKCIPHER 422 + select CRYPTO_SKCIPHER 423 423 select CRYPTO_MANAGER 424 424 help 425 425 PCBC: Propagating Cipher Block Chaining mode ··· 427 427 428 428 config CRYPTO_XTS 429 429 tristate "XTS support" 430 - select CRYPTO_BLKCIPHER 430 + select CRYPTO_SKCIPHER 431 431 select CRYPTO_MANAGER 432 432 select CRYPTO_ECB 433 433 help ··· 437 437 438 438 config CRYPTO_KEYWRAP 439 439 tristate "Key wrapping support" 440 - select CRYPTO_BLKCIPHER 440 + select CRYPTO_SKCIPHER 441 441 select CRYPTO_MANAGER 442 442 help 443 443 Support for key wrapping (NIST SP800-38F / RFC3394) without ··· 1085 1085 select CRYPTO_AEAD 1086 1086 select CRYPTO_LIB_AES 1087 1087 select CRYPTO_ALGAPI 1088 - select CRYPTO_BLKCIPHER 1088 + select CRYPTO_SKCIPHER 1089 1089 select CRYPTO_GLUE_HELPER_X86 if 64BIT 1090 1090 select CRYPTO_SIMD 1091 1091 help ··· 1115 1115 config CRYPTO_AES_SPARC64 1116 1116 tristate "AES cipher algorithms (SPARC64)" 1117 1117 depends on SPARC64 1118 - select CRYPTO_BLKCIPHER 1118 + select CRYPTO_SKCIPHER 1119 1119 help 1120 1120 Use SPARC64 crypto opcodes for AES algorithm. 1121 1121 ··· 1142 1142 config CRYPTO_AES_PPC_SPE 1143 1143 tristate "AES cipher algorithms (PPC SPE)" 1144 1144 depends on PPC && SPE 1145 - select CRYPTO_BLKCIPHER 1145 + select CRYPTO_SKCIPHER 1146 1146 help 1147 1147 AES cipher algorithms (FIPS-197). Additionally the acceleration 1148 1148 for popular block cipher modes ECB, CBC, CTR and XTS is supported. ··· 1172 1172 1173 1173 config CRYPTO_ARC4 1174 1174 tristate "ARC4 cipher algorithm" 1175 - select CRYPTO_BLKCIPHER 1175 + select CRYPTO_SKCIPHER 1176 1176 select CRYPTO_LIB_ARC4 1177 1177 help 1178 1178 ARC4 cipher algorithm. ··· 1208 1208 config CRYPTO_BLOWFISH_X86_64 1209 1209 tristate "Blowfish cipher algorithm (x86_64)" 1210 1210 depends on X86 && 64BIT 1211 - select CRYPTO_BLKCIPHER 1211 + select CRYPTO_SKCIPHER 1212 1212 select CRYPTO_BLOWFISH_COMMON 1213 1213 help 1214 1214 Blowfish cipher algorithm (x86_64), by Bruce Schneier. ··· 1239 1239 tristate "Camellia cipher algorithm (x86_64)" 1240 1240 depends on X86 && 64BIT 1241 1241 depends on CRYPTO 1242 - select CRYPTO_BLKCIPHER 1242 + select CRYPTO_SKCIPHER 1243 1243 select CRYPTO_GLUE_HELPER_X86 1244 1244 help 1245 1245 Camellia cipher algorithm module (x86_64). ··· 1256 1256 tristate "Camellia cipher algorithm (x86_64/AES-NI/AVX)" 1257 1257 depends on X86 && 64BIT 1258 1258 depends on CRYPTO 1259 - select CRYPTO_BLKCIPHER 1259 + select CRYPTO_SKCIPHER 1260 1260 select CRYPTO_CAMELLIA_X86_64 1261 1261 select CRYPTO_GLUE_HELPER_X86 1262 1262 select CRYPTO_SIMD ··· 1293 1293 depends on SPARC64 1294 1294 depends on CRYPTO 1295 1295 select CRYPTO_ALGAPI 1296 - select CRYPTO_BLKCIPHER 1296 + select CRYPTO_SKCIPHER 1297 1297 help 1298 1298 Camellia cipher algorithm module (SPARC64). 1299 1299 ··· 1322 1322 config CRYPTO_CAST5_AVX_X86_64 1323 1323 tristate "CAST5 (CAST-128) cipher algorithm (x86_64/AVX)" 1324 1324 depends on X86 && 64BIT 1325 - select CRYPTO_BLKCIPHER 1325 + select CRYPTO_SKCIPHER 1326 1326 select CRYPTO_CAST5 1327 1327 select CRYPTO_CAST_COMMON 1328 1328 select CRYPTO_SIMD ··· 1344 1344 config CRYPTO_CAST6_AVX_X86_64 1345 1345 tristate "CAST6 (CAST-256) cipher algorithm (x86_64/AVX)" 1346 1346 depends on X86 && 64BIT 1347 - select CRYPTO_BLKCIPHER 1347 + select CRYPTO_SKCIPHER 1348 1348 select CRYPTO_CAST6 1349 1349 select CRYPTO_CAST_COMMON 1350 1350 select CRYPTO_GLUE_HELPER_X86 ··· 1372 1372 depends on SPARC64 1373 1373 select CRYPTO_ALGAPI 1374 1374 select CRYPTO_LIB_DES 1375 - select CRYPTO_BLKCIPHER 1375 + select CRYPTO_SKCIPHER 1376 1376 help 1377 1377 DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3), 1378 1378 optimized using SPARC64 crypto opcodes. ··· 1380 1380 config CRYPTO_DES3_EDE_X86_64 1381 1381 tristate "Triple DES EDE cipher algorithm (x86-64)" 1382 1382 depends on X86 && 64BIT 1383 - select CRYPTO_BLKCIPHER 1383 + select CRYPTO_SKCIPHER 1384 1384 select CRYPTO_LIB_DES 1385 1385 help 1386 1386 Triple DES EDE (FIPS 46-3) algorithm. ··· 1393 1393 config CRYPTO_FCRYPT 1394 1394 tristate "FCrypt cipher algorithm" 1395 1395 select CRYPTO_ALGAPI 1396 - select CRYPTO_BLKCIPHER 1396 + select CRYPTO_SKCIPHER 1397 1397 help 1398 1398 FCrypt algorithm used by RxRPC. 1399 1399 ··· 1412 1412 1413 1413 config CRYPTO_SALSA20 1414 1414 tristate "Salsa20 stream cipher algorithm" 1415 - select CRYPTO_BLKCIPHER 1415 + select CRYPTO_SKCIPHER 1416 1416 help 1417 1417 Salsa20 stream cipher algorithm. 1418 1418 ··· 1424 1424 1425 1425 config CRYPTO_CHACHA20 1426 1426 tristate "ChaCha stream cipher algorithms" 1427 - select CRYPTO_BLKCIPHER 1427 + select CRYPTO_SKCIPHER 1428 1428 help 1429 1429 The ChaCha20, XChaCha20, and XChaCha12 stream cipher algorithms. 1430 1430 ··· 1446 1446 config CRYPTO_CHACHA20_X86_64 1447 1447 tristate "ChaCha stream cipher algorithms (x86_64/SSSE3/AVX2/AVX-512VL)" 1448 1448 depends on X86 && 64BIT 1449 - select CRYPTO_BLKCIPHER 1449 + select CRYPTO_SKCIPHER 1450 1450 select CRYPTO_CHACHA20 1451 1451 help 1452 1452 SSSE3, AVX2, and AVX-512VL optimized implementations of the ChaCha20, ··· 1482 1482 config CRYPTO_SERPENT_SSE2_X86_64 1483 1483 tristate "Serpent cipher algorithm (x86_64/SSE2)" 1484 1484 depends on X86 && 64BIT 1485 - select CRYPTO_BLKCIPHER 1485 + select CRYPTO_SKCIPHER 1486 1486 select CRYPTO_GLUE_HELPER_X86 1487 1487 select CRYPTO_SERPENT 1488 1488 select CRYPTO_SIMD ··· 1501 1501 config CRYPTO_SERPENT_SSE2_586 1502 1502 tristate "Serpent cipher algorithm (i586/SSE2)" 1503 1503 depends on X86 && !64BIT 1504 - select CRYPTO_BLKCIPHER 1504 + select CRYPTO_SKCIPHER 1505 1505 select CRYPTO_GLUE_HELPER_X86 1506 1506 select CRYPTO_SERPENT 1507 1507 select CRYPTO_SIMD ··· 1520 1520 config CRYPTO_SERPENT_AVX_X86_64 1521 1521 tristate "Serpent cipher algorithm (x86_64/AVX)" 1522 1522 depends on X86 && 64BIT 1523 - select CRYPTO_BLKCIPHER 1523 + select CRYPTO_SKCIPHER 1524 1524 select CRYPTO_GLUE_HELPER_X86 1525 1525 select CRYPTO_SERPENT 1526 1526 select CRYPTO_SIMD ··· 1651 1651 config CRYPTO_TWOFISH_X86_64_3WAY 1652 1652 tristate "Twofish cipher algorithm (x86_64, 3-way parallel)" 1653 1653 depends on X86 && 64BIT 1654 - select CRYPTO_BLKCIPHER 1654 + select CRYPTO_SKCIPHER 1655 1655 select CRYPTO_TWOFISH_COMMON 1656 1656 select CRYPTO_TWOFISH_X86_64 1657 1657 select CRYPTO_GLUE_HELPER_X86 ··· 1672 1672 config CRYPTO_TWOFISH_AVX_X86_64 1673 1673 tristate "Twofish cipher algorithm (x86_64/AVX)" 1674 1674 depends on X86 && 64BIT 1675 - select CRYPTO_BLKCIPHER 1675 + select CRYPTO_SKCIPHER 1676 1676 select CRYPTO_GLUE_HELPER_X86 1677 1677 select CRYPTO_SIMD 1678 1678 select CRYPTO_TWOFISH_COMMON ··· 1823 1823 config CRYPTO_USER_API_SKCIPHER 1824 1824 tristate "User-space interface for symmetric key cipher algorithms" 1825 1825 depends on NET 1826 - select CRYPTO_BLKCIPHER 1826 + select CRYPTO_SKCIPHER 1827 1827 select CRYPTO_USER_API 1828 1828 help 1829 1829 This option enables the user-spaces interface for symmetric ··· 1842 1842 tristate "User-space interface for AEAD cipher algorithms" 1843 1843 depends on NET 1844 1844 select CRYPTO_AEAD 1845 - select CRYPTO_BLKCIPHER 1845 + select CRYPTO_SKCIPHER 1846 1846 select CRYPTO_NULL 1847 1847 select CRYPTO_USER_API 1848 1848 help
+3 -3
crypto/Makefile
··· 15 15 16 16 obj-$(CONFIG_CRYPTO_AEAD2) += aead.o 17 17 18 - crypto_blkcipher-y := ablkcipher.o 19 - crypto_blkcipher-y += skcipher.o 20 - obj-$(CONFIG_CRYPTO_BLKCIPHER2) += crypto_blkcipher.o 18 + crypto_skcipher-y := ablkcipher.o 19 + crypto_skcipher-y += skcipher.o 20 + obj-$(CONFIG_CRYPTO_SKCIPHER2) += crypto_skcipher.o 21 21 obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o 22 22 obj-$(CONFIG_CRYPTO_ECHAINIV) += echainiv.o 23 23
+25 -25
drivers/crypto/Kconfig
··· 28 28 config CRYPTO_DEV_PADLOCK_AES 29 29 tristate "PadLock driver for AES algorithm" 30 30 depends on CRYPTO_DEV_PADLOCK 31 - select CRYPTO_BLKCIPHER 31 + select CRYPTO_SKCIPHER 32 32 select CRYPTO_LIB_AES 33 33 help 34 34 Use VIA PadLock for AES algorithm. ··· 56 56 tristate "Support for the Geode LX AES engine" 57 57 depends on X86_32 && PCI 58 58 select CRYPTO_ALGAPI 59 - select CRYPTO_BLKCIPHER 59 + select CRYPTO_SKCIPHER 60 60 help 61 61 Say 'Y' here to use the AMD Geode LX processor on-board AES 62 62 engine for the CryptoAPI AES algorithm. ··· 109 109 depends on ZCRYPT 110 110 depends on PKEY 111 111 select CRYPTO_ALGAPI 112 - select CRYPTO_BLKCIPHER 112 + select CRYPTO_SKCIPHER 113 113 help 114 114 This is the s390 hardware accelerated implementation of the 115 115 AES cipher algorithms for use with protected key. ··· 171 171 tristate "DES and Triple DES cipher algorithms" 172 172 depends on S390 173 173 select CRYPTO_ALGAPI 174 - select CRYPTO_BLKCIPHER 174 + select CRYPTO_SKCIPHER 175 175 select CRYPTO_LIB_DES 176 176 help 177 177 This is the s390 hardware accelerated implementation of the ··· 184 184 tristate "AES cipher algorithms" 185 185 depends on S390 186 186 select CRYPTO_ALGAPI 187 - select CRYPTO_BLKCIPHER 187 + select CRYPTO_SKCIPHER 188 188 help 189 189 This is the s390 hardware accelerated implementation of the 190 190 AES cipher algorithms (FIPS-197). ··· 238 238 depends on PLAT_ORION || ARCH_MVEBU 239 239 select CRYPTO_LIB_AES 240 240 select CRYPTO_LIB_DES 241 - select CRYPTO_BLKCIPHER 241 + select CRYPTO_SKCIPHER 242 242 select CRYPTO_HASH 243 243 select SRAM 244 244 help ··· 250 250 config CRYPTO_DEV_NIAGARA2 251 251 tristate "Niagara2 Stream Processing Unit driver" 252 252 select CRYPTO_LIB_DES 253 - select CRYPTO_BLKCIPHER 253 + select CRYPTO_SKCIPHER 254 254 select CRYPTO_HASH 255 255 select CRYPTO_MD5 256 256 select CRYPTO_SHA1 ··· 267 267 config CRYPTO_DEV_HIFN_795X 268 268 tristate "Driver HIFN 795x crypto accelerator chips" 269 269 select CRYPTO_LIB_DES 270 - select CRYPTO_BLKCIPHER 270 + select CRYPTO_SKCIPHER 271 271 select HW_RANDOM if CRYPTO_DEV_HIFN_795X_RNG 272 272 depends on PCI 273 273 depends on !ARCH_DMA_ADDR_T_64BIT ··· 287 287 tristate "Talitos Freescale Security Engine (SEC)" 288 288 select CRYPTO_AEAD 289 289 select CRYPTO_AUTHENC 290 - select CRYPTO_BLKCIPHER 290 + select CRYPTO_SKCIPHER 291 291 select CRYPTO_HASH 292 292 select HW_RANDOM 293 293 depends on FSL_SOC ··· 325 325 select CRYPTO_LIB_DES 326 326 select CRYPTO_AEAD 327 327 select CRYPTO_AUTHENC 328 - select CRYPTO_BLKCIPHER 328 + select CRYPTO_SKCIPHER 329 329 help 330 330 Driver for the IXP4xx NPE crypto engine. 331 331 ··· 338 338 select CRYPTO_CCM 339 339 select CRYPTO_CTR 340 340 select CRYPTO_GCM 341 - select CRYPTO_BLKCIPHER 341 + select CRYPTO_SKCIPHER 342 342 help 343 343 This option allows you to have support for AMCC crypto acceleration. 344 344 ··· 375 375 tristate "Support for OMAP AES hw engine" 376 376 depends on ARCH_OMAP2 || ARCH_OMAP3 || ARCH_OMAP2PLUS 377 377 select CRYPTO_AES 378 - select CRYPTO_BLKCIPHER 378 + select CRYPTO_SKCIPHER 379 379 select CRYPTO_ENGINE 380 380 select CRYPTO_CBC 381 381 select CRYPTO_ECB ··· 389 389 tristate "Support for OMAP DES/3DES hw engine" 390 390 depends on ARCH_OMAP2PLUS 391 391 select CRYPTO_LIB_DES 392 - select CRYPTO_BLKCIPHER 392 + select CRYPTO_SKCIPHER 393 393 select CRYPTO_ENGINE 394 394 help 395 395 OMAP processors have DES/3DES module accelerator. Select this if you ··· 405 405 select CRYPTO_AEAD 406 406 select CRYPTO_AES 407 407 select CRYPTO_AUTHENC 408 - select CRYPTO_BLKCIPHER 408 + select CRYPTO_SKCIPHER 409 409 select CRYPTO_LIB_DES 410 410 select CRYPTO_CBC 411 411 select CRYPTO_ECB ··· 420 420 config CRYPTO_DEV_SAHARA 421 421 tristate "Support for SAHARA crypto accelerator" 422 422 depends on ARCH_MXC && OF 423 - select CRYPTO_BLKCIPHER 423 + select CRYPTO_SKCIPHER 424 424 select CRYPTO_AES 425 425 select CRYPTO_ECB 426 426 help ··· 447 447 depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST 448 448 depends on HAS_IOMEM 449 449 select CRYPTO_AES 450 - select CRYPTO_BLKCIPHER 450 + select CRYPTO_SKCIPHER 451 451 help 452 452 This option allows you to have support for S5P crypto acceleration. 453 453 Select this to offload Samsung S5PV210 or S5PC110, Exynos from AES ··· 507 507 depends on ARCH_AT91 || COMPILE_TEST 508 508 select CRYPTO_AES 509 509 select CRYPTO_AEAD 510 - select CRYPTO_BLKCIPHER 510 + select CRYPTO_SKCIPHER 511 511 help 512 512 Some Atmel processors have AES hw accelerator. 513 513 Select this if you want to use the Atmel module for ··· 520 520 tristate "Support for Atmel DES/TDES hw accelerator" 521 521 depends on ARCH_AT91 || COMPILE_TEST 522 522 select CRYPTO_LIB_DES 523 - select CRYPTO_BLKCIPHER 523 + select CRYPTO_SKCIPHER 524 524 help 525 525 Some Atmel processors have DES/TDES hw accelerator. 526 526 Select this if you want to use the Atmel module for ··· 592 592 select CRYPTO_CBC 593 593 select CRYPTO_ECB 594 594 select CRYPTO_AES 595 - select CRYPTO_BLKCIPHER 595 + select CRYPTO_SKCIPHER 596 596 select CRYPTO_HASH 597 597 help 598 598 The Freescale i.MX23/i.MX28 has SHA1/SHA256 and AES128 CBC/ECB ··· 622 622 select CRYPTO_CBC 623 623 select CRYPTO_XTS 624 624 select CRYPTO_CTR 625 - select CRYPTO_BLKCIPHER 625 + select CRYPTO_SKCIPHER 626 626 help 627 627 This driver supports Qualcomm crypto engine accelerator 628 628 hardware. To compile this driver as a module, choose M here. The ··· 668 668 select CRYPTO_SHA1 669 669 select CRYPTO_SHA256 670 670 select CRYPTO_HASH 671 - select CRYPTO_BLKCIPHER 671 + select CRYPTO_SKCIPHER 672 672 673 673 help 674 674 This driver interfaces with the hardware crypto accelerator. ··· 679 679 depends on (ARM && ARCH_MEDIATEK) || COMPILE_TEST 680 680 select CRYPTO_AES 681 681 select CRYPTO_AEAD 682 - select CRYPTO_BLKCIPHER 682 + select CRYPTO_SKCIPHER 683 683 select CRYPTO_CTR 684 684 select CRYPTO_SHA1 685 685 select CRYPTO_SHA256 ··· 717 717 depends on OF || PCI || COMPILE_TEST 718 718 select CRYPTO_LIB_AES 719 719 select CRYPTO_AUTHENC 720 - select CRYPTO_BLKCIPHER 720 + select CRYPTO_SKCIPHER 721 721 select CRYPTO_LIB_DES 722 722 select CRYPTO_HASH 723 723 select CRYPTO_HMAC ··· 741 741 select CRYPTO_AEAD 742 742 select CRYPTO_AES 743 743 select CRYPTO_ALGAPI 744 - select CRYPTO_BLKCIPHER 744 + select CRYPTO_SKCIPHER 745 745 select CRYPTO_CTR 746 746 select CRYPTO_HASH 747 747 select CRYPTO_SHA1 ··· 758 758 depends on CRYPTO && CRYPTO_HW && OF && HAS_DMA 759 759 default n 760 760 select CRYPTO_HASH 761 - select CRYPTO_BLKCIPHER 761 + select CRYPTO_SKCIPHER 762 762 select CRYPTO_LIB_DES 763 763 select CRYPTO_AEAD 764 764 select CRYPTO_AUTHENC
+3 -3
drivers/crypto/allwinner/Kconfig
··· 14 14 select CRYPTO_SHA1 15 15 select CRYPTO_AES 16 16 select CRYPTO_LIB_DES 17 - select CRYPTO_BLKCIPHER 17 + select CRYPTO_SKCIPHER 18 18 help 19 19 Some Allwinner SoC have a crypto accelerator named 20 20 Security System. Select this if you want to use it. ··· 34 34 35 35 config CRYPTO_DEV_SUN8I_CE 36 36 tristate "Support for Allwinner Crypto Engine cryptographic offloader" 37 - select CRYPTO_BLKCIPHER 37 + select CRYPTO_SKCIPHER 38 38 select CRYPTO_ENGINE 39 39 select CRYPTO_ECB 40 40 select CRYPTO_CBC ··· 61 61 62 62 config CRYPTO_DEV_SUN8I_SS 63 63 tristate "Support for Allwinner Security System cryptographic offloader" 64 - select CRYPTO_BLKCIPHER 64 + select CRYPTO_SKCIPHER 65 65 select CRYPTO_ENGINE 66 66 select CRYPTO_ECB 67 67 select CRYPTO_CBC
+1 -1
drivers/crypto/amlogic/Kconfig
··· 1 1 config CRYPTO_DEV_AMLOGIC_GXL 2 2 tristate "Support for amlogic cryptographic offloader" 3 3 default y if ARCH_MESON 4 - select CRYPTO_BLKCIPHER 4 + select CRYPTO_SKCIPHER 5 5 select CRYPTO_ENGINE 6 6 select CRYPTO_ECB 7 7 select CRYPTO_CBC
+3 -3
drivers/crypto/caam/Kconfig
··· 97 97 select CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC 98 98 select CRYPTO_AEAD 99 99 select CRYPTO_AUTHENC 100 - select CRYPTO_BLKCIPHER 100 + select CRYPTO_SKCIPHER 101 101 select CRYPTO_LIB_DES 102 102 help 103 103 Selecting this will offload crypto for users of the ··· 110 110 default y 111 111 select CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC 112 112 select CRYPTO_AUTHENC 113 - select CRYPTO_BLKCIPHER 113 + select CRYPTO_SKCIPHER 114 114 select CRYPTO_DES 115 115 help 116 116 Selecting this will use CAAM Queue Interface (QI) for sending ··· 158 158 select CRYPTO_DEV_FSL_CAAM_COMMON 159 159 select CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC 160 160 select CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC 161 - select CRYPTO_BLKCIPHER 161 + select CRYPTO_SKCIPHER 162 162 select CRYPTO_AUTHENC 163 163 select CRYPTO_AEAD 164 164 select CRYPTO_HASH
+1 -1
drivers/crypto/cavium/nitrox/Kconfig
··· 4 4 # 5 5 config CRYPTO_DEV_NITROX 6 6 tristate 7 - select CRYPTO_BLKCIPHER 7 + select CRYPTO_SKCIPHER 8 8 select CRYPTO_AES 9 9 select CRYPTO_LIB_DES 10 10 select FW_LOADER
+1 -1
drivers/crypto/ccp/Kconfig
··· 27 27 depends on CRYPTO_DEV_CCP_DD 28 28 depends on CRYPTO_DEV_SP_CCP 29 29 select CRYPTO_HASH 30 - select CRYPTO_BLKCIPHER 30 + select CRYPTO_SKCIPHER 31 31 select CRYPTO_AUTHENC 32 32 select CRYPTO_RSA 33 33 select CRYPTO_LIB_AES
+1 -1
drivers/crypto/hisilicon/Kconfig
··· 2 2 3 3 config CRYPTO_DEV_HISI_SEC 4 4 tristate "Support for Hisilicon SEC crypto block cipher accelerator" 5 - select CRYPTO_BLKCIPHER 5 + select CRYPTO_SKCIPHER 6 6 select CRYPTO_ALGAPI 7 7 select CRYPTO_LIB_DES 8 8 select SG_SPLIT
+1 -1
drivers/crypto/qat/Kconfig
··· 3 3 tristate 4 4 select CRYPTO_AEAD 5 5 select CRYPTO_AUTHENC 6 - select CRYPTO_BLKCIPHER 6 + select CRYPTO_SKCIPHER 7 7 select CRYPTO_AKCIPHER 8 8 select CRYPTO_DH 9 9 select CRYPTO_HMAC
+1 -1
drivers/crypto/ux500/Kconfig
··· 8 8 tristate "UX500 crypto driver for CRYP block" 9 9 depends on CRYPTO_DEV_UX500 10 10 select CRYPTO_ALGAPI 11 - select CRYPTO_BLKCIPHER 11 + select CRYPTO_SKCIPHER 12 12 select CRYPTO_LIB_DES 13 13 help 14 14 This selects the crypto driver for the UX500_CRYP hardware. It supports
+1 -1
drivers/crypto/virtio/Kconfig
··· 3 3 tristate "VirtIO crypto driver" 4 4 depends on VIRTIO 5 5 select CRYPTO_AEAD 6 - select CRYPTO_BLKCIPHER 6 + select CRYPTO_SKCIPHER 7 7 select CRYPTO_ENGINE 8 8 default m 9 9 help
+1 -1
drivers/net/wireless/cisco/Kconfig
··· 17 17 depends on CFG80211 && ISA_DMA_API && (PCI || BROKEN) 18 18 select WIRELESS_EXT 19 19 select CRYPTO 20 - select CRYPTO_BLKCIPHER 20 + select CRYPTO_SKCIPHER 21 21 select WEXT_SPY 22 22 select WEXT_PRIV 23 23 ---help---
+1 -1
net/bluetooth/Kconfig
··· 9 9 depends on RFKILL || !RFKILL 10 10 select CRC16 11 11 select CRYPTO 12 - select CRYPTO_BLKCIPHER 12 + select CRYPTO_SKCIPHER 13 13 select CRYPTO_LIB_AES 14 14 imply CRYPTO_AES 15 15 select CRYPTO_CMAC
+1 -1
net/rxrpc/Kconfig
··· 49 49 depends on AF_RXRPC 50 50 select CRYPTO 51 51 select CRYPTO_MANAGER 52 - select CRYPTO_BLKCIPHER 52 + select CRYPTO_SKCIPHER 53 53 select CRYPTO_PCBC 54 54 select CRYPTO_FCRYPT 55 55 help
+1 -1
net/xfrm/Kconfig
··· 16 16 select XFRM 17 17 select CRYPTO 18 18 select CRYPTO_HASH 19 - select CRYPTO_BLKCIPHER 19 + select CRYPTO_SKCIPHER 20 20 21 21 if INET 22 22 config XFRM_USER