Big, invasive but mostly automated change, with a further attempt at

harmonising MemoryRegion with std::vector:

The MemoryRegion::clear() function would zeroise the buffer, but keep
the memory allocated and the size unchanged. This is very different
from STL's clear(), which is basically the equivalent to what is
called destroy() in MemoryRegion. So to be able to replace MemoryRegion
with a std::vector, we have to rename destroy() to clear() and we have
to expose the current functionality of clear() in some other way, since
vector doesn't support this operation. Do so by adding a global function
named zeroise() which takes a MemoryRegion which is zeroed. Remove clear()
to ensure all callers are updated.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/mac/cmac/cmac.cpp b/src/mac/cmac/cmac.cpp
index 05c5f4a88..38b62c6cb 100644
--- a/src/mac/cmac/cmac.cpp
+++ b/src/mac/cmac/cmac.cpp
@@ -81,8 +81,8 @@ void CMAC::final_result(byte mac[])
    for(u32bit j = 0; j != OUTPUT_LENGTH; ++j)
       mac[j] = state[j];
 
-   state.clear();
-   buffer.clear();
+   zeroise(state);
+   zeroise(buffer);
    position = 0;
    }
 
@@ -104,10 +104,10 @@ void CMAC::key_schedule(const byte key[], u32bit length)
 void CMAC::clear()
    {
    e->clear();
-   state.clear();
-   buffer.clear();
-   B.clear();
-   P.clear();
+   zeroise(state);
+   zeroise(buffer);
+   zeroise(B);
+   zeroise(P);
    position = 0;
    }