The unified diff between revisions [92f17752..] and [51b865be..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'src/aes.cpp'

#
#
# patch "src/aes.cpp"
#  from [c4c27a2a8b6a73bb871cd476ec7e2b0ddb04423a]
#    to [ee57662b8c25279ccec727e53defdbeec940d5ae]
#
============================================================
--- src/aes.cpp	c4c27a2a8b6a73bb871cd476ec7e2b0ddb04423a
+++ src/aes.cpp	ee57662b8c25279ccec727e53defdbeec940d5ae
@@ -1,9 +1,10 @@
 /*************************************************
 * AES Source File                                *
-* (C) 1999-2006 The Botan Project                *
+* (C) 1999-2007 Jack Lloyd                       *
 *************************************************/

 #include <botan/aes.h>
+#include <botan/loadstor.h>
 #include <botan/bit_ops.h>

 namespace Botan {
@@ -134,7 +135,8 @@ void AES::key(const byte key[], u32bit l

    const u32bit X = length / 4;
    for(u32bit j = 0; j != X; ++j)
-      XEK[j] = make_u32bit(key[4*j], key[4*j+1], key[4*j+2], key[4*j+3]);
+      XEK[j] = load_be<u32bit>(key, j);
+
    for(u32bit j = X; j < 4*(ROUNDS+1); j += X)
       {
       XEK[j] = XEK[j-X] ^ S(rotate_left(XEK[j-1], 8)) ^ RC[(j-X)/X];