2 files changed, 5 insertions, 5 deletions
diff --git a/src/block/rc6/rc6.cpp b/src/block/rc6/rc6.cpp
index 53ca5a7a2..5a6c1091d 100644
--- a/src/block/rc6/rc6.cpp
+++ b/src/block/rc6/rc6.cpp
@@ -113,6 +113,8 @@ void RC6::decrypt_n(const byte in[], byte out[], size_t blocks) const
 */
 void RC6::key_schedule(const byte key[], size_t length)
    {
+   S.resize(44);
+
    const size_t WORD_KEYLENGTH = (((length - 1) / 4) + 1);
    const size_t MIX_ROUNDS     = 3 * std::max(WORD_KEYLENGTH, S.size());
 
@@ -120,7 +122,7 @@ void RC6::key_schedule(const byte key[], size_t length)
    for(size_t i = 1; i != S.size(); ++i)
       S[i] = S[i-1] + 0x9E3779B9;
 
-   SecureVector<u32bit> K(8);
+   secure_vector<u32bit> K(8);
 
    for(s32bit i = length-1; i >= 0; --i)
       K[i/4] = (K[i/4] << 8) + key[i];
diff --git a/src/block/rc6/rc6.h b/src/block/rc6/rc6.h
index af7b62316..e30a267e6 100644
--- a/src/block/rc6/rc6.h
+++ b/src/block/rc6/rc6.h
@@ -21,15 +21,13 @@ class BOTAN_DLL RC6 : public Block_Cipher_Fixed_Params<16, 1, 32>
       void encrypt_n(const byte in[], byte out[], size_t blocks) const;
       void decrypt_n(const byte in[], byte out[], size_t blocks) const;
 
-      void clear() { zeroise(S); }
+      void clear() { S.clear(); }
       std::string name() const { return "RC6"; }
       BlockCipher* clone() const { return new RC6; }
-
-      RC6() : S(44) {}
    private:
       void key_schedule(const byte[], size_t);
 
-      SecureVector<u32bit> S;
+      secure_vector<u32bit> S;
    };
 
 }