From d22bc10cd4f67924acd82bcd46a31e3de3b20ce3 Mon Sep 17 00:00:00 2001
From: René Korthaus <r.korthaus@sirrix.com>
Date: Wed, 23 Dec 2015 11:52:19 +0100
Subject: Mass-prefix member vars with m_

---
 src/lib/block/aes/aes.cpp | 42 +++++++++++++++++++++---------------------
 src/lib/block/aes/aes.h   | 12 ++++++------
 2 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'src/lib/block/aes')

diff --git a/src/lib/block/aes/aes.cpp b/src/lib/block/aes/aes.cpp
index 0da4ff0a0..6cca701af 100644
--- a/src/lib/block/aes/aes.cpp
+++ b/src/lib/block/aes/aes.cpp
@@ -414,71 +414,71 @@ void aes_key_schedule(const byte key[], size_t length,
 
 void AES_128::encrypt_n(const byte in[], byte out[], size_t blocks) const
    {
-   aes_encrypt_n(in, out, blocks, EK, ME);
+   aes_encrypt_n(in, out, blocks, m_EK, m_ME);
    }
 
 void AES_128::decrypt_n(const byte in[], byte out[], size_t blocks) const
    {
-   aes_decrypt_n(in, out, blocks, DK, MD);
+   aes_decrypt_n(in, out, blocks, m_DK, m_MD);
    }
 
 void AES_128::key_schedule(const byte key[], size_t length)
    {
-   aes_key_schedule(key, length, EK, DK, ME, MD);
+   aes_key_schedule(key, length, m_EK, m_DK, m_ME, m_MD);
    }
 
 void AES_128::clear()
    {
-   zap(EK);
-   zap(DK);
-   zap(ME);
-   zap(MD);
+   zap(m_EK);
+   zap(m_DK);
+   zap(m_ME);
+   zap(m_MD);
    }
 
 void AES_192::encrypt_n(const byte in[], byte out[], size_t blocks) const
    {
-   aes_encrypt_n(in, out, blocks, EK, ME);
+   aes_encrypt_n(in, out, blocks, m_EK, m_ME);
    }
 
 void AES_192::decrypt_n(const byte in[], byte out[], size_t blocks) const
    {
-   aes_decrypt_n(in, out, blocks, DK, MD);
+   aes_decrypt_n(in, out, blocks, m_DK, m_MD);
    }
 
 void AES_192::key_schedule(const byte key[], size_t length)
    {
-   aes_key_schedule(key, length, EK, DK, ME, MD);
+   aes_key_schedule(key, length, m_EK, m_DK, m_ME, m_MD);
    }
 
 void AES_192::clear()
    {
-   zap(EK);
-   zap(DK);
-   zap(ME);
-   zap(MD);
+   zap(m_EK);
+   zap(m_DK);
+   zap(m_ME);
+   zap(m_MD);
    }
 
 void AES_256::encrypt_n(const byte in[], byte out[], size_t blocks) const
    {
-   aes_encrypt_n(in, out, blocks, EK, ME);
+   aes_encrypt_n(in, out, blocks, m_EK, m_ME);
    }
 
 void AES_256::decrypt_n(const byte in[], byte out[], size_t blocks) const
    {
-   aes_decrypt_n(in, out, blocks, DK, MD);
+   aes_decrypt_n(in, out, blocks, m_DK, m_MD);
    }
 
 void AES_256::key_schedule(const byte key[], size_t length)
    {
-   aes_key_schedule(key, length, EK, DK, ME, MD);
+   aes_key_schedule(key, length, m_EK, m_DK, m_ME, m_MD);
    }
 
 void AES_256::clear()
    {
-   zap(EK);
-   zap(DK);
-   zap(ME);
-   zap(MD);
+   zap(m_EK);
+   zap(m_DK);
+   zap(m_ME);
+   zap(m_MD);
    }
 
 }
diff --git a/src/lib/block/aes/aes.h b/src/lib/block/aes/aes.h
index f8b8d2938..82de4e63f 100644
--- a/src/lib/block/aes/aes.h
+++ b/src/lib/block/aes/aes.h
@@ -28,8 +28,8 @@ class BOTAN_DLL AES_128 : public Block_Cipher_Fixed_Params<16, 16>
    private:
       void key_schedule(const byte key[], size_t length) override;
 
-      secure_vector<u32bit> EK, DK;
-      secure_vector<byte> ME, MD;
+      secure_vector<u32bit> m_EK, m_DK;
+      secure_vector<byte> m_ME, m_MD;
    };
 
 /**
@@ -48,8 +48,8 @@ class BOTAN_DLL AES_192 : public Block_Cipher_Fixed_Params<16, 24>
    private:
       void key_schedule(const byte key[], size_t length) override;
 
-      secure_vector<u32bit> EK, DK;
-      secure_vector<byte> ME, MD;
+      secure_vector<u32bit> m_EK, m_DK;
+      secure_vector<byte> m_ME, m_MD;
    };
 
 /**
@@ -68,8 +68,8 @@ class BOTAN_DLL AES_256 : public Block_Cipher_Fixed_Params<16, 32>
    private:
       void key_schedule(const byte key[], size_t length) override;
 
-      secure_vector<u32bit> EK, DK;
-      secure_vector<byte> ME, MD;
+      secure_vector<u32bit> m_EK, m_DK;
+      secure_vector<byte> m_ME, m_MD;
    };
 
 }
-- 
cgit v1.2.3