]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
crypto: aesni - fix failing setkey for rfc4106-gcm-aesni
authorTadeusz Struk <tadeusz.struk@intel.com>
Sat, 27 Jun 2015 06:56:38 +0000 (15:56 +0900)
committerChuck Anderson <chuck.anderson@oracle.com>
Sun, 26 Feb 2017 05:34:39 +0000 (21:34 -0800)
Orabug: 25243093

rfc4106(gcm(aes)) uses ctr(aes) to generate hash key. ctr(aes) needs
chainiv, but the chainiv gets initialized after aesni_intel when both
are statically linked so the setkey fails.
This patch forces aesni_intel to be initialized after chainiv.

Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
Tested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit 0fbafd06bdde938884f7326548d3df812b267c3c)
Signed-off-by: Ethan Zhao <ethan.zhao@oracle.com>
arch/x86/crypto/aesni-intel_glue.c

index 2ade24000246060da00e5af10b217dbc39791acb..17c73018933490c5d4080ffe606fda76476f19f5 100644 (file)
@@ -1627,7 +1627,7 @@ static void __exit aesni_exit(void)
        crypto_fpu_exit();
 }
 
-module_init(aesni_init);
+late_initcall(aesni_init);
 module_exit(aesni_exit);
 
 MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, Intel AES-NI instructions optimized");