On Thu, 27 Jun 2019 at 11:10, Horia Geanta <horia.geanta@xxxxxxx> wrote:
>
> (changed subject to make patchwork happy
> was: [RFC PATCH 27/30] crypto: des - split off DES library from generic DES cipher driver)
>
> On 6/22/2019 3:32 AM, Ard Biesheuvel wrote:
> > diff --git a/drivers/crypto/caam/Kconfig b/drivers/crypto/caam/Kconfig
> > index 3720ddabb507..4a358391b6cb 100644
> > --- a/drivers/crypto/caam/Kconfig
> > +++ b/drivers/crypto/caam/Kconfig
> > @@ -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
>
> There are two other config symbols that should select CRYPTO_LIB_DES:
> CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI
> CRYPTO_DEV_FSL_DPAA2_CAAM
>
> True, this is not stricty related to refactoring in this patch set,
> but actually a fix of
> commit 1b52c40919e6 ("crypto: caam - Forbid 2-key 3DES in FIPS mode")
>
The 3des key checks are static inline functions defined in des.h, so
there is no need to depend on the library or on the generic driver
AFAICT
> I am adding a fix inline.
> Herbert, I think it would be better to apply it separately.
>
> -- >8 --
> Fix caam/qi and caam/qi2 dependency on CRYPTO_DES, introduced by
> commit strengthening 3DES key checks.
>
> Fixes: 1b52c40919e6 ("crypto: caam - Forbid 2-key 3DES in FIPS mode")
> Signed-off-by: Horia Geantă <horia.geanta@xxxxxxx>
> ---
> drivers/crypto/caam/Kconfig | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/crypto/caam/Kconfig b/drivers/crypto/caam/Kconfig
> index 3720ddabb507..524b961360d2 100644
> --- a/drivers/crypto/caam/Kconfig
> +++ b/drivers/crypto/caam/Kconfig
> @@ -111,6 +111,7 @@ config CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI
> select CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC
> select CRYPTO_AUTHENC
> select CRYPTO_BLKCIPHER
> + select CRYPTO_DES
> help
> Selecting this will use CAAM Queue Interface (QI) for sending
> & receiving crypto jobs to/from CAAM. This gives better performance
> @@ -158,6 +159,7 @@ config CRYPTO_DEV_FSL_DPAA2_CAAM
> select CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC
> select CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC
> select CRYPTO_BLKCIPHER
> + select CRYPTO_DES
> select CRYPTO_AUTHENC
> select CRYPTO_AEAD
> select CRYPTO_HASH
> --
> 2.17.1
