Additional final annotations

2 files changed, 4 insertions, 4 deletions

diff --git a/src/lib/block/aes/aes.cpp b/src/lib/block/aes/aes.cpp
index 268e0804d..6afa5133a 100644
--- a/src/lib/block/aes/aes.cpp
+++ b/src/lib/block/aes/aes.cpp
@@ -119,7 +119,7 @@ inline uint32_t SE_word(uint32_t x)
 
 const uint32_t* AES_TE()
    {
-   class TE_Table
+   class TE_Table final
       {
       public:
          TE_Table()
@@ -137,7 +137,7 @@ const uint32_t* AES_TE()
             return reinterpret_cast<const uint32_t*>(data);
             }
       private:
-         std::aligned_storage<sizeof(uint32_t), 1024>::type data[256];
+         std::aligned_storage<256*sizeof(uint32_t), 64>::type data[256];
       };
 
    static TE_Table table;
@@ -146,7 +146,7 @@ const uint32_t* AES_TE()
 
 const uint32_t* AES_TD()
    {
-   class TD_Table
+   class TD_Table final
       {
       public:
          TD_Table()
diff --git a/src/lib/block/cast/cast128.cpp b/src/lib/block/cast/cast128.cpp
index d54d0614e..5ad732eb3 100644
--- a/src/lib/block/cast/cast128.cpp
+++ b/src/lib/block/cast/cast128.cpp
@@ -320,7 +320,7 @@ void CAST_128::cast_ks(secure_vector<uint32_t>& K,
       0xA466BB1E, 0xF8DA0A82, 0x04F19130, 0xBA6E4EC0, 0x99265164, 0x1EE7230D,
       0x50B2AD80, 0xEAEE6801, 0x8DB2A283, 0xEA8BF59E };
 
-   class ByteReader
+   class ByteReader final
       {
       public:
          uint8_t operator()(size_t i) const