Commit 04007b0e authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

crypto: des - split off DES library from generic DES cipher driver 



Another one for the cipher museum: split off DES core processing into
a separate module so other drivers (mostly for crypto accelerators)
can reuse the code without pulling in the generic DES cipher itself.
This will also permit the cipher interface to be made private to the
crypto API itself once we move the only user in the kernel (CIFS) to
this library interface.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6b5c4818

arch/x86/crypto/des3_ede_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
 */



#include <crypto/algapi.h>

#include <crypto/des.h>

#include <crypto/internal/des.h>

#include <crypto/internal/skcipher.h>

#include <linux/crypto.h>

#include <linux/init.h>

crypto/Kconfig

+6 −2
Original line number Diff line number Diff line
@@ -1306,9 +1306,13 @@ config CRYPTO_CAST6_AVX_X86_64 
	  This module provides the Cast6 cipher algorithm that processes

	  eight blocks parallel using the AVX instruction set.



config CRYPTO_LIB_DES

	tristate



config CRYPTO_DES

	tristate "DES and Triple DES EDE cipher algorithms"

	select CRYPTO_ALGAPI

	select CRYPTO_LIB_DES

	help

	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
@@ -1316,7 +1320,7 @@ config CRYPTO_DES_SPARC64 
	tristate "DES and Triple DES EDE cipher algorithms (SPARC64)"

	depends on SPARC64

	select CRYPTO_ALGAPI

	select CRYPTO_DES

	select CRYPTO_LIB_DES

	help

	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3),

	  optimized using SPARC64 crypto opcodes.
@@ -1325,7 +1329,7 @@ config CRYPTO_DES3_EDE_X86_64 
	tristate "Triple DES EDE cipher algorithm (x86-64)"

	depends on X86 && 64BIT

	select CRYPTO_BLKCIPHER

	select CRYPTO_DES

	select CRYPTO_LIB_DES

	help

	  Triple DES EDE (FIPS 46-3) algorithm.

crypto/des_generic.c

+43 −874

File changed.

Preview size limit exceeded, changes collapsed.

drivers/crypto/Kconfig

+14 −14
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ config CRYPTO_DES_S390 
	depends on S390

	select CRYPTO_ALGAPI

	select CRYPTO_BLKCIPHER

	select CRYPTO_DES

	select CRYPTO_LIB_DES

	help

	  This is the s390 hardware accelerated implementation of the

	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
@@ -215,7 +215,7 @@ config CRYPTO_DEV_MARVELL_CESA 
	tristate "Marvell's Cryptographic Engine driver"

	depends on PLAT_ORION || ARCH_MVEBU

	select CRYPTO_LIB_AES

	select CRYPTO_DES

	select CRYPTO_LIB_DES

	select CRYPTO_BLKCIPHER

	select CRYPTO_HASH

	select SRAM
@@ -227,7 +227,7 @@ config CRYPTO_DEV_MARVELL_CESA 


config CRYPTO_DEV_NIAGARA2

       tristate "Niagara2 Stream Processing Unit driver"

       select CRYPTO_DES

       select CRYPTO_LIB_DES

       select CRYPTO_BLKCIPHER

       select CRYPTO_HASH

       select CRYPTO_MD5
@@ -244,7 +244,7 @@ config CRYPTO_DEV_NIAGARA2 


config CRYPTO_DEV_HIFN_795X

	tristate "Driver HIFN 795x crypto accelerator chips"

	select CRYPTO_DES

	select CRYPTO_LIB_DES

	select CRYPTO_BLKCIPHER

	select HW_RANDOM if CRYPTO_DEV_HIFN_795X_RNG

	depends on PCI
@@ -300,7 +300,7 @@ config CRYPTO_DEV_TALITOS2 
config CRYPTO_DEV_IXP4XX

	tristate "Driver for IXP4xx crypto hardware acceleration"

	depends on ARCH_IXP4XX && IXP4XX_QMGR && IXP4XX_NPE

	select CRYPTO_DES

	select CRYPTO_LIB_DES

	select CRYPTO_AEAD

	select CRYPTO_AUTHENC

	select CRYPTO_BLKCIPHER
@@ -366,7 +366,7 @@ config CRYPTO_DEV_OMAP_AES 
config CRYPTO_DEV_OMAP_DES

	tristate "Support for OMAP DES/3DES hw engine"

	depends on ARCH_OMAP2PLUS

	select CRYPTO_DES

	select CRYPTO_LIB_DES

	select CRYPTO_BLKCIPHER

	select CRYPTO_ENGINE

	help
@@ -384,7 +384,7 @@ config CRYPTO_DEV_PICOXCELL 
	select CRYPTO_AES

	select CRYPTO_AUTHENC

	select CRYPTO_BLKCIPHER

	select CRYPTO_DES

	select CRYPTO_LIB_DES

	select CRYPTO_CBC

	select CRYPTO_ECB

	select CRYPTO_SEQIV
@@ -497,7 +497,7 @@ config CRYPTO_DEV_ATMEL_AES 
config CRYPTO_DEV_ATMEL_TDES

	tristate "Support for Atmel DES/TDES hw accelerator"

	depends on ARCH_AT91 || COMPILE_TEST

	select CRYPTO_DES

	select CRYPTO_LIB_DES

	select CRYPTO_BLKCIPHER

	help

	  Some Atmel processors have DES/TDES hw accelerator.
@@ -595,7 +595,7 @@ config CRYPTO_DEV_QCE 
	depends on ARCH_QCOM || COMPILE_TEST

	depends on HAS_IOMEM

	select CRYPTO_AES

	select CRYPTO_DES

	select CRYPTO_LIB_DES

	select CRYPTO_ECB

	select CRYPTO_CBC

	select CRYPTO_XTS
@@ -643,7 +643,7 @@ config CRYPTO_DEV_SUN4I_SS 
	select CRYPTO_MD5

	select CRYPTO_SHA1

	select CRYPTO_AES

	select CRYPTO_DES

	select CRYPTO_LIB_DES

	select CRYPTO_BLKCIPHER

	help

	  Some Allwinner SoC have a crypto accelerator named
@@ -666,7 +666,7 @@ config CRYPTO_DEV_ROCKCHIP 
	tristate "Rockchip's Cryptographic Engine driver"

	depends on OF && ARCH_ROCKCHIP

	select CRYPTO_AES

	select CRYPTO_DES

	select CRYPTO_LIB_DES

	select CRYPTO_MD5

	select CRYPTO_SHA1

	select CRYPTO_SHA256
@@ -703,7 +703,7 @@ config CRYPTO_DEV_BCM_SPU 
	depends on MAILBOX

	default m

	select CRYPTO_AUTHENC

	select CRYPTO_DES

	select CRYPTO_LIB_DES

	select CRYPTO_MD5

	select CRYPTO_SHA1

	select CRYPTO_SHA256
@@ -722,7 +722,7 @@ config CRYPTO_DEV_SAFEXCEL 
	select CRYPTO_LIB_AES

	select CRYPTO_AUTHENC

	select CRYPTO_BLKCIPHER

	select CRYPTO_DES

	select CRYPTO_LIB_DES

	select CRYPTO_HASH

	select CRYPTO_HMAC

	select CRYPTO_MD5
@@ -760,7 +760,7 @@ config CRYPTO_DEV_CCREE 
	default n

	select CRYPTO_HASH

	select CRYPTO_BLKCIPHER

	select CRYPTO_DES

	select CRYPTO_LIB_DES

	select CRYPTO_AEAD

	select CRYPTO_AUTHENC

	select CRYPTO_SHA1

drivers/crypto/caam/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ config CRYPTO_DEV_FSL_CAAM_CRYPTO_API 
	select CRYPTO_AEAD

	select CRYPTO_AUTHENC

	select CRYPTO_BLKCIPHER

	select CRYPTO_DES

	select CRYPTO_LIB_DES

	help

	  Selecting this will offload crypto for users of the

	  scatterlist crypto API (such as the linux native IPSec

CRA Git | Maintained and supported by SUSTech CRA and CCSE