Changeset 291 for trunk

Timestamp:

Aug 23, 2010, 7:47:43 PM (14 years ago)

Author:

katerina

Message:

Fix for ticket #219 (miscompiled on SLES 11)

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/rijndael-alg-fst.c (modified) (5 diffs)

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.7.2)
+AM_INIT_AUTOMAKE(samhain, 2.7.2a)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST

trunk/docs/Changelog

@@ +1 @@
+2.7.2a:
+        * rewrote rijndaelKeySched() in a more conservative way to fix
+          compile problem on SLES 11.
+
 2.7.2:
         * sh_utils.c: fixed an endianess issue that prevented cross-verification

trunk/src/rijndael-alg-fst.c

@@ -15 +15 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #ifdef SH_ENCRYPT
@@ -29 +30 @@
         word8 tk[MAXKC][4];
         int KC = ROUNDS - 6;
+        word32 tmp;
 
         for (j = KC-1; j >= 0; j--) {
-                *((word32*)tk[j]) = *((word32*)k[j]);
+          memmove( &(tk[j]), &(k[j]), sizeof(word32));
         }
         r = 0;
         t = 0;
+
         /* copy values into round key array */
         for (j = 0; (j < KC) && (r < ROUNDS + 1); ) {
                 for (; (j < KC) && (t < 4); j++, t++) {
-                        *((word32*)W[r][t]) = *((word32*)tk[j]);
-                }
+                  memmove( &(W[r][t]), &(tk[j]), sizeof(word32));
+                }
                 if (t == 4) {
                         r++;
@@ -56 +59 @@
                 if (KC != 8) {
                         for (j = 1; j < KC; j++) {
-                                *((word32*)tk[j]) ^= *((word32*)tk[j-1]);
+                          tmp = *((word32*)tk[j-1]);
+                          *((word32*)tk[j]) ^= tmp;
                         }
                 } else {
                         for (j = 1; j < KC/2; j++) {
-                                *((word32*)tk[j]) ^= *((word32*)tk[j-1]);
+                          tmp = *((word32*)tk[j-1]);
+                          *((word32*)tk[j]) ^= tmp;
                         }
                         tk[KC/2][0] ^= S[tk[KC/2 - 1][0]];
@@ -67 +72 @@
                         tk[KC/2][3] ^= S[tk[KC/2 - 1][3]];
                         for (j = KC/2 + 1; j < KC; j++) {
-                                *((word32*)tk[j]) ^= *((word32*)tk[j-1]);
+                                tmp = *((word32*)tk[j-1]);
+                                *((word32*)tk[j]) ^= tmp;
                         }
                 }
@@ -73 +79 @@
                 for (j = 0; (j < KC) && (r < ROUNDS + 1); ) {
                         for (; (j < KC) && (t < 4); j++, t++) {
-                                *((word32*)W[r][t]) = *((word32*)tk[j]);
+                          memmove( &(W[r][t]), &(tk[j]), sizeof(word32));
                         }
                         if (t == 4) {