--- a/components/openssl/openssl-1.0.0/engines/pkcs11/hw_pk11.c	Fri Feb 10 07:47:10 2012 -0800
+++ b/components/openssl/openssl-1.0.0/engines/pkcs11/hw_pk11.c	Fri Feb 10 10:10:07 2012 -0800
@@ -3915,17 +3915,11 @@
 		uint_t ui = 0;
 
 		(void) getisax(&ui, 1);
-		/*
-		 * Note that we do not have AES optimization using AES-NI
-		 * instructions in pkcs11_softtoken on 32-bit systems.
-		 */
-#if defined(__amd64)
+
+#if defined(__amd64) || defined(__i386)
 		present = (ui & AV_386_AES) > 0;
 #elif defined(__sparc)
 		present = (ui & AV_SPARC_AES) > 0;
-#else
-		/* x86 32-bit */
-		present = 0;
 #endif
 		}