propagate from branch 'net.randombit.botan.x509-path-validation' (head 63b5a20eab129ca13287fda33d2d02eec329708f)

            to branch 'net.randombit.botan' (head 8b8150f09c55184f028f2929c4e7f7cd0d46d96e)

1 files changed, 3 insertions, 1 deletions

diff --git a/src/block/mars/mars.cpp b/src/block/mars/mars.cpp
index 171ce2945..5badc40cc 100644
--- a/src/block/mars/mars.cpp
+++ b/src/block/mars/mars.cpp
@@ -320,12 +320,14 @@ void MARS::decrypt_n(const byte in[], byte out[], size_t blocks) const
 */
 void MARS::key_schedule(const byte key[], size_t length)
    {
-   SecureVector<u32bit> T(15);
+   secure_vector<u32bit> T(15);
    for(size_t i = 0; i != length / 4; ++i)
       T[i] = load_le<u32bit>(key, i);
 
    T[length / 4] = static_cast<u32bit>(length) / 4;
 
+   EK.resize(40);
+
    for(u32bit i = 0; i != 4; ++i)
       {
       T[ 0] ^= rotate_left(T[ 8] ^ T[13], 3) ^ (i     );