propagate from branch 'net.randombit.botan.1_8' (head ef51dd2869ed38dae3aeb1c3b931ca9d595580e1)

            to branch 'net.randombit.botan' (head fc1942640045423f411fd865cbd584090b28d7eb)

1 files changed, 5 insertions, 3 deletions

diff --git a/src/block/aes/aes.h b/src/block/aes/aes.h
index 05e2e3123..768bb09e7 100644
--- a/src/block/aes/aes.h
+++ b/src/block/aes/aes.h
@@ -1,6 +1,6 @@
 /**
 * AES
-* (C) 1999-2007 Jack Lloyd
+* (C) 1999-2009 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
@@ -18,14 +18,16 @@ namespace Botan {
 class BOTAN_DLL AES : public BlockCipher
    {
    public:
+      void encrypt_n(const byte in[], byte out[], u32bit blocks) const;
+      void decrypt_n(const byte in[], byte out[], u32bit blocks) const;
+
       void clear() throw();
       std::string name() const { return "AES"; }
       BlockCipher* clone() const { return new AES; }
+
       AES() : BlockCipher(16, 16, 32, 8) { ROUNDS = 14; }
       AES(u32bit);
    private:
-      void enc(const byte[], byte[]) const;
-      void dec(const byte[], byte[]) const;
       void key_schedule(const byte[], u32bit);
       static u32bit S(u32bit);