Changeset 1201 for trunk/library/aes.c

Timestamp:

02/12/12 18:31:04 (3 months ago)

Author:

paul

Message:

• AES code only check for Padlock once

File:

• trunk/library/aes.c (modified) (6 diffs)

trunk/library/aes.c

@@ -58 +58 @@
     (b)[(i) + 3] = (unsigned char) ( (n) >> 24 );       \
 }
+#endif
+
+#if defined(POLARSSL_PADLOCK_C)
+static int aes_padlock_ace = -1;
 #endif
 
@@ -450 +454 @@
         aes_gen_tables();
         aes_init_done = 1;
+
     }
 #endif
@@ -461 +466 @@
     }
 
-#if defined(PADLOCK_ALIGN16)
-    ctx->rk = RK = PADLOCK_ALIGN16( ctx->buf );
-#else
+#if defined(POLARSSL_PADLOCK_C) && defined(PADLOCK_ALIGN16)
+    if( aes_padlock_ace == -1 )
+        aes_padlock_ace = padlock_supports( PADLOCK_ACE );
+
+    if( aes_padlock_ace )
+        ctx->rk = RK = PADLOCK_ALIGN16( ctx->buf );
+    else
+#endif
     ctx->rk = RK = ctx->buf;
-#endif
 
     for( i = 0; i < (keysize >> 5); i++ )
@@ -561 +570 @@
     }
 
-#if defined(PADLOCK_ALIGN16)
-    ctx->rk = RK = PADLOCK_ALIGN16( ctx->buf );
-#else
+#if defined(POLARSSL_PADLOCK_C) && defined(PADLOCK_ALIGN16)
+    if( aes_padlock_ace == -1 )
+        aes_padlock_ace = padlock_supports( PADLOCK_ACE );
+
+    if( aes_padlock_ace )
+        ctx->rk = RK = PADLOCK_ALIGN16( ctx->buf );
+    else
+#endif
     ctx->rk = RK = ctx->buf;
-#endif
 
     ret = aes_setkey_enc( &cty, key, keysize );
@@ -657 +670 @@
 
 #if defined(POLARSSL_PADLOCK_C) && defined(POLARSSL_HAVE_X86)
-    if( padlock_supports( PADLOCK_ACE ) )
+    if( aes_padlock_ace )
     {
         if( padlock_xcryptecb( ctx, mode, input, output ) == 0 )
@@ -769 +782 @@
 
 #if defined(POLARSSL_PADLOCK_C) && defined(POLARSSL_HAVE_X86)
-    if( padlock_supports( PADLOCK_ACE ) )
+    if( aes_padlock_ace )
     {
         if( padlock_xcryptcbc( ctx, mode, length, iv, input, output ) == 0 )