Commit a6b6e616 authored Jan 11, 2017 by Linus Torvalds

crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes a regression in aesni that renders it useless if it's
  built-in with a modular pcbc configuration"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: aesni - Fix failure when built-in with modular pcbc

parents 807b93e9 07825f0a

arch/x86/crypto/aesni-intel_glue.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1020,7 +1020,8 @@ struct {
		const char *basename;
		struct simd_skcipher_alg *simd;
		} aesni_simd_skciphers2[] = {
		#if IS_ENABLED(CONFIG_CRYPTO_PCBC)
		#if (defined(MODULE) && IS_ENABLED(CONFIG_CRYPTO_PCBC)) \|\| \
		IS_BUILTIN(CONFIG_CRYPTO_PCBC)
		{
		.algname = "pcbc(aes)",
		.drvname = "pcbc-aes-aesni",

Admin message