[uml-user] Kernel config CRYPTO_AES vs CRYPTO_AES_586.

[Oleg G. <ol...@in...>]

Hello!

I've encountered a glitch preventing CryptoAPI AES module from building when 
compiling UML version 2.6.12. Also, bs1 patch and patch fixing errno problem 
mentioned earlier was applied, but they are irrelevant to the problem I 
describe now.

New configuration option CRYPTO_AES_586 first appeared in 2.6.12 kernel. This 
option can be activated when architecture is 32-bit X86 and it results in 
building X86-opitmised code for AES encryption. On the other hand, old 
CRYPTO_AES option is disabled when architectire is 32-bit X86. The code for 
X86-optimised AES module is located in "arch/i386/crypto" subdirectory and, 
hence, is built only if the value of the ARCH variable is equal to "i386".

But for unknown reason, CRYPTO_AES_586 option is enabled also if building UML 
for X86 architecture, and CRYPTO_AES option is unavailable in this case. 
There is no way to enable CRYPTO_AES option, but CRYPTO_AES_586 option does 
nothing, because there is no module for CRYPTO_AES_586 in "arch/um" 
subdirectory, only in "arch/i386", which is irrelevant for ARCH=um.

The patch is trivial.

[-- Begin of Patch --]
--- linux-2.6.12/crypto/Kconfig.orig	2005-06-17 22:48:29.000000000 +0300
+++ linux-2.6.12/crypto/Kconfig	2005-07-07 17:56:18.000000000 +0300
@@ -146,7 +146,7 @@
 
 config CRYPTO_AES
 	tristate "AES cipher algorithms"
-	depends on CRYPTO && !((X86 || UML_X86) && !64BIT)
+	depends on CRYPTO && !(X86 && !64BIT)
 	help
 	  AES cipher algorithms (FIPS-197). AES uses the Rijndael 
 	  algorithm.
@@ -166,7 +166,7 @@
 
 config CRYPTO_AES_586
 	tristate "AES cipher algorithms (i586)"
-	depends on CRYPTO && ((X86 || UML_X86) && !64BIT)
+	depends on CRYPTO && (X86 && !64BIT)
 	help
 	  AES cipher algorithms (FIPS-197). AES uses the Rijndael 
 	  algorithm.
[-- End of Patch --]

-- Oleg Girko, http://www.infoserver.ru/~ol/