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

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

2 files changed, 5 insertions, 5 deletions

diff --git a/src/block/seed/seed.cpp b/src/block/seed/seed.cpp
index 408220013..fb8708214 100644
--- a/src/block/seed/seed.cpp
+++ b/src/block/seed/seed.cpp
@@ -111,13 +111,15 @@ void SEED::key_schedule(const byte key[], size_t)
       0x779B99E3, 0xEF3733C6, 0xDE6E678D, 0xBCDCCF1B
    };
 
-   SecureVector<u32bit> WK(4);
+   secure_vector<u32bit> WK(4);
 
    for(size_t i = 0; i != 4; ++i)
       WK[i] = load_be<u32bit>(key, i);
 
    G_FUNC G;
 
+   K.resize(32);
+
    for(size_t i = 0; i != 16; i += 2)
       {
       K[2*i  ] = G(WK[0] + WK[2] - RC[i]);
diff --git a/src/block/seed/seed.h b/src/block/seed/seed.h
index 979312930..95dab758d 100644
--- a/src/block/seed/seed.h
+++ b/src/block/seed/seed.h
@@ -21,11 +21,9 @@ class BOTAN_DLL SEED : public Block_Cipher_Fixed_Params<16, 16>
       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(K); }
+      void clear() { K.clear(); }
       std::string name() const { return "SEED"; }
       BlockCipher* clone() const { return new SEED; }
-
-      SEED() : K(32) {}
    private:
       void key_schedule(const byte[], size_t);
 
@@ -37,7 +35,7 @@ class BOTAN_DLL SEED : public Block_Cipher_Fixed_Params<16, 16>
             static const u32bit S0[256], S1[256], S2[256], S3[256];
          };
 
-      SecureVector<u32bit> K;
+      secure_vector<u32bit> K;
    };
 
 }