Fairly huge update that replaces the old secmem types with std::vector

using a custom allocator. Currently our allocator just does new/delete
with a memset before deletion, and the mmap and mlock allocators have
been removed.

10 files changed, 139 insertions, 139 deletions

diff --git a/checks/common.h b/checks/common.h
index 33499a99d..05a6fb974 100644
--- a/checks/common.h
+++ b/checks/common.h
@@ -55,13 +55,13 @@ class Fixed_Output_RNG : public Botan::RandomNumberGenerator
 
       void clear() throw() {}
 
-      Fixed_Output_RNG(const Botan::SecureVector<byte>& in)
+      Fixed_Output_RNG(const Botan::secure_vector<byte>& in)
          {
          buf.insert(buf.end(), in.begin(), in.end());
          }
       Fixed_Output_RNG(const std::string& in_str)
          {
-         Botan::SecureVector<byte> in = Botan::hex_decode(in_str);
+         Botan::secure_vector<byte> in = Botan::hex_decode(in_str);
          buf.insert(buf.end(), in.begin(), in.end());
          }
 
diff --git a/checks/cvc_tests.cpp b/checks/cvc_tests.cpp
index ccda22cfc..9dc56610c 100644
--- a/checks/cvc_tests.cpp
+++ b/checks/cvc_tests.cpp
@@ -40,7 +40,7 @@ namespace {
 // helper functions
 void helper_write_file(EAC_Signed_Object const& to_write, std::string const& file_path)
    {
-   SecureVector<byte> sv = to_write.BER_encode();
+   std::vector<byte> sv = to_write.BER_encode();
    std::ofstream cert_file(file_path.c_str(), std::ios::binary);
    cert_file.write((char*)&sv[0], sv.size());
    cert_file.close();
@@ -50,8 +50,8 @@ bool helper_files_equal(std::string const& file_path1, std::string const& file_p
    {
    std::ifstream cert_1_in(file_path1.c_str());
    std::ifstream cert_2_in(file_path2.c_str());
-   SecureVector<byte> sv1;
-   SecureVector<byte> sv2;
+   std::vector<byte> sv1;
+   std::vector<byte> sv2;
    if (!cert_1_in || !cert_2_in)
       {
       return false;
@@ -94,7 +94,7 @@ void test_enc_gen_selfsigned(RandomNumberGenerator& rng)
    key.set_parameter_encoding(EC_DOMPAR_ENC_IMPLICITCA);
    EAC1_1_CVC cert = CVC_EAC::create_self_signed_cert(key, opts, rng);
 
-   SecureVector<byte> der(cert.BER_encode());
+   std::vector<byte> der(cert.BER_encode());
    std::ofstream cert_file;
    cert_file.open(TEST_DATA_DIR "/my_cv_cert.ber", std::ios::binary);
    //cert_file << der; // this is bad !!!
@@ -104,15 +104,15 @@ void test_enc_gen_selfsigned(RandomNumberGenerator& rng)
    EAC1_1_CVC cert_in(TEST_DATA_DIR "/my_cv_cert.ber");
    CHECK(cert == cert_in);
    // encoding it again while it has no dp
-   SecureVector<byte> der2(cert_in.BER_encode());
+   std::vector<byte> der2(cert_in.BER_encode());
    std::ofstream cert_file2(TEST_DATA_DIR "/my_cv_cert2.ber", std::ios::binary);
    cert_file2.write((char*)&der2[0], der2.size());
    cert_file2.close();
    // read both and compare them
    std::ifstream cert_1_in(TEST_DATA_DIR "/my_cv_cert.ber");
    std::ifstream cert_2_in(TEST_DATA_DIR "/my_cv_cert2.ber");
-   SecureVector<byte> sv1;
-   SecureVector<byte> sv2;
+   std::vector<byte> sv1;
+   std::vector<byte> sv2;
    if (!cert_1_in || !cert_2_in)
       {
       CHECK_MESSAGE(false, "could not read certificate files");
@@ -203,7 +203,7 @@ void test_enc_gen_req(RandomNumberGenerator& rng)
    ECDSA_PrivateKey key(rng, dom_pars);
    key.set_parameter_encoding(EC_DOMPAR_ENC_IMPLICITCA);
    EAC1_1_Req req = CVC_EAC::create_cvc_req(key, opts.chr, opts.hash_alg, rng);
-   SecureVector<byte> der(req.BER_encode());
+   std::vector<byte> der(req.BER_encode());
    std::ofstream req_file(TEST_DATA_DIR "/my_cv_req.ber", std::ios::binary);
    req_file.write((char*)&der[0], der.size());
    req_file.close();
@@ -260,7 +260,7 @@ void test_cvc_ado_creation(RandomNumberGenerator& rng)
    req_key.set_parameter_encoding(EC_DOMPAR_ENC_IMPLICITCA);
    //EAC1_1_Req req = CVC_EAC::create_cvc_req(req_key, opts);
    EAC1_1_Req req = CVC_EAC::create_cvc_req(req_key, opts.chr, opts.hash_alg, rng);
-   SecureVector<byte> der(req.BER_encode());
+   std::vector<byte> der(req.BER_encode());
    std::ofstream req_file(TEST_DATA_DIR "/my_cv_req.ber", std::ios::binary);
    req_file.write((char*)&der[0], der.size());
    req_file.close();
@@ -276,7 +276,7 @@ void test_cvc_ado_creation(RandomNumberGenerator& rng)
    CHECK_MESSAGE(ado.check_signature(ado_key), "failure of ado verification after creation");
 
    std::ofstream ado_file(TEST_DATA_DIR "/ado", std::ios::binary);
-   SecureVector<byte> ado_der(ado.BER_encode());
+   std::vector<byte> ado_der(ado.BER_encode());
    ado_file.write((char*)&ado_der[0], ado_der.size());
    ado_file.close();
    // read it again and check the signature
@@ -332,7 +332,7 @@ void test_cvc_ado_comparison(RandomNumberGenerator& rng)
 
    CHECK_MESSAGE(ado != ado2, "ado's found to be equal where they are not");
    //     std::ofstream ado_file(TEST_DATA_DIR "/ado");
-   //     SecureVector<byte> ado_der(ado.BER_encode());
+   //     std::vector<byte> ado_der(ado.BER_encode());
    //     ado_file.write((char*)&ado_der[0], ado_der.size());
    //     ado_file.close();
    // read it again and check the signature
@@ -490,7 +490,7 @@ void test_cvc_chain(RandomNumberGenerator& rng)
    ASN1_Car car("DECVCA00001");
    EAC1_1_CVC cvca_cert = DE_EAC::create_cvca(cvca_privk, hash, car, true, true, 12, rng);
    std::ofstream cvca_file(TEST_DATA_DIR "/cvc_chain_cvca.cer", std::ios::binary);
-   SecureVector<byte> cvca_sv = cvca_cert.BER_encode();
+   std::vector<byte> cvca_sv = cvca_cert.BER_encode();
    cvca_file.write((char*)&cvca_sv[0], cvca_sv.size());
    cvca_file.close();
 
@@ -498,7 +498,7 @@ void test_cvc_chain(RandomNumberGenerator& rng)
    ASN1_Car car2("DECVCA00002");
    EAC1_1_CVC cvca_cert2 = DE_EAC::create_cvca(cvca_privk2, hash, car2, true, true, 12, rng);
    EAC1_1_CVC link12 = DE_EAC::link_cvca(cvca_cert, cvca_privk, cvca_cert2, rng);
-   SecureVector<byte> link12_sv = link12.BER_encode();
+   std::vector<byte> link12_sv = link12.BER_encode();
    std::ofstream link12_file(TEST_DATA_DIR "/cvc_chain_link12.cer", std::ios::binary);
    link12_file.write((char*)&link12_sv[0], link12_sv.size());
    link12_file.close();
@@ -514,7 +514,7 @@ void test_cvc_chain(RandomNumberGenerator& rng)
    ECDSA_PrivateKey dvca_priv_key(rng, dom_pars);
    EAC1_1_Req dvca_req = DE_EAC::create_cvc_req(dvca_priv_key, ASN1_Chr("DEDVCAEPASS"), hash, rng);
    std::ofstream dvca_file(TEST_DATA_DIR "/cvc_chain_dvca_req.cer", std::ios::binary);
-   SecureVector<byte> dvca_sv = dvca_req.BER_encode();
+   std::vector<byte> dvca_sv = dvca_req.BER_encode();
    dvca_file.write((char*)&dvca_sv[0], dvca_sv.size());
    dvca_file.close();
 
@@ -528,7 +528,7 @@ void test_cvc_chain(RandomNumberGenerator& rng)
    ECDSA_PrivateKey dvca_priv_key2(rng, dom_pars);
    EAC1_1_Req dvca_req2 = DE_EAC::create_cvc_req(dvca_priv_key2, ASN1_Chr("DEDVCAEPASS"), hash, rng);
    std::ofstream dvca_file2(TEST_DATA_DIR "/cvc_chain_dvca_req2.cer", std::ios::binary);
-   SecureVector<byte> dvca_sv2 = dvca_req2.BER_encode();
+   std::vector<byte> dvca_sv2 = dvca_req2.BER_encode();
    dvca_file2.write((char*)&dvca_sv2[0], dvca_sv2.size());
    dvca_file2.close();
    EAC1_1_ADO dvca_ado2 = CVC_EAC::create_ado_req(dvca_priv_key, dvca_req2,
diff --git a/checks/dolook.cpp b/checks/dolook.cpp
index a8e08a96b..20e260f64 100644
--- a/checks/dolook.cpp
+++ b/checks/dolook.cpp
@@ -83,14 +83,14 @@ class PBKDF_Filter : public Filter
          pbkdf = algo;
          outlen = o;
          iterations = i;
-         salt = s.bits_of();
+         salt = unlock(s.bits_of());
          }
 
       ~PBKDF_Filter() { delete pbkdf; }
    private:
       std::string passphrase;
       PBKDF* pbkdf;
-      SecureVector<byte> salt;
+      std::vector<byte> salt;
       u32bit outlen, iterations;
    };
 
@@ -126,12 +126,12 @@ class KDF_Filter : public Filter
          {
          kdf = algo;
          outlen = o;
-         salt = s.bits_of();
+         salt = unlock(s.bits_of());
          }
       ~KDF_Filter() { delete kdf; }
    private:
-      SecureVector<byte> secret;
-      SecureVector<byte> salt;
+      std::vector<byte> secret;
+      std::vector<byte> salt;
       KDF* kdf;
       u32bit outlen;
    };
diff --git a/checks/ec_tests.cpp b/checks/ec_tests.cpp
index e308a5291..39c32de37 100644
--- a/checks/ec_tests.cpp
+++ b/checks/ec_tests.cpp
@@ -76,10 +76,10 @@ void test_point_turn_on_sp_red_mul()
    std::string a_secp = "ffffffffffffffffffffffffffffffff7ffffffc";
    std::string b_secp = "1c97befc54bd7a8b65acf89f81d4d4adc565fa45";
    std::string G_secp_comp = "024a96b5688ef573284664698968c38bb913cbfc82";
-   SecureVector<byte> sv_p_secp = hex_decode(p_secp);
-   SecureVector<byte> sv_a_secp = hex_decode(a_secp);
-   SecureVector<byte> sv_b_secp = hex_decode(b_secp);
-   SecureVector<byte> sv_G_secp_comp = hex_decode(G_secp_comp);
+   secure_vector<byte> sv_p_secp = hex_decode(p_secp);
+   secure_vector<byte> sv_a_secp = hex_decode(a_secp);
+   secure_vector<byte> sv_b_secp = hex_decode(b_secp);
+   secure_vector<byte> sv_G_secp_comp = hex_decode(G_secp_comp);
    BigInt bi_p_secp = BigInt::decode(&sv_p_secp[0], sv_p_secp.size());
    BigInt bi_a_secp = BigInt::decode(&sv_a_secp[0], sv_a_secp.size());
    BigInt bi_b_secp = BigInt::decode(&sv_b_secp[0], sv_b_secp.size());
@@ -139,10 +139,10 @@ void test_coordinates()
    std::string a_secp = "ffffffffffffffffffffffffffffffff7ffffffc";
    std::string b_secp = "1c97befc54bd7a8b65acf89f81d4d4adc565fa45";
    std::string G_secp_comp = "024a96b5688ef573284664698968c38bb913cbfc82";
-   SecureVector<byte> sv_p_secp = hex_decode ( p_secp );
-   SecureVector<byte> sv_a_secp = hex_decode ( a_secp );
-   SecureVector<byte> sv_b_secp = hex_decode ( b_secp );
-   SecureVector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
+   secure_vector<byte> sv_p_secp = hex_decode ( p_secp );
+   secure_vector<byte> sv_a_secp = hex_decode ( a_secp );
+   secure_vector<byte> sv_b_secp = hex_decode ( b_secp );
+   secure_vector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
 
    BigInt bi_p_secp = BigInt::decode ( &sv_p_secp[0], sv_p_secp.size() );
    BigInt bi_a_secp = BigInt::decode ( &sv_a_secp[0], sv_a_secp.size() );
@@ -196,7 +196,7 @@ void test_point_mult ()
    const CurveGFp& curve = secp160r1.get_curve();
 
    std::string G_secp_comp = "024a96b5688ef573284664698968c38bb913cbfc82";
-   SecureVector<byte> sv_G_secp_comp = hex_decode(G_secp_comp);
+   secure_vector<byte> sv_G_secp_comp = hex_decode(G_secp_comp);
    PointGFp p_G = OS2ECP(sv_G_secp_comp, curve);
 
    BigInt d_U("0xaa374ffc3ce144e6b073307972cb6d57b2a4e982");
@@ -215,10 +215,10 @@ void test_point_negative()
    std::string a_secp = "ffffffffffffffffffffffffffffffff7ffffffc";
    std::string b_secp = "1c97befc54bd7a8b65acf89f81d4d4adc565fa45";
    std::string G_secp_comp = "024a96b5688ef573284664698968c38bb913cbfc82";
-   SecureVector<byte> sv_p_secp = hex_decode ( p_secp );
-   SecureVector<byte> sv_a_secp = hex_decode ( a_secp );
-   SecureVector<byte> sv_b_secp = hex_decode ( b_secp );
-   SecureVector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
+   secure_vector<byte> sv_p_secp = hex_decode ( p_secp );
+   secure_vector<byte> sv_a_secp = hex_decode ( a_secp );
+   secure_vector<byte> sv_b_secp = hex_decode ( b_secp );
+   secure_vector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
    BigInt bi_p_secp = BigInt::decode ( &sv_p_secp[0], sv_p_secp.size() );
    BigInt bi_a_secp = BigInt::decode ( &sv_a_secp[0], sv_a_secp.size() );
    BigInt bi_b_secp = BigInt::decode ( &sv_b_secp[0], sv_b_secp.size() );
@@ -242,7 +242,7 @@ void test_zeropoint()
 
 
    std::string G_secp_comp = "024a96b5688ef573284664698968c38bb913cbfc82";
-   SecureVector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
+   secure_vector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
    BigInt bi_p_secp("0xffffffffffffffffffffffffffffffff7fffffff");
    BigInt bi_a_secp("0xffffffffffffffffffffffffffffffff7ffffffc");
    BigInt bi_b_secp("0x1c97befc54bd7a8b65acf89f81d4d4adc565fa45");
@@ -273,7 +273,7 @@ void test_zeropoint_enc_dec()
    CHECK_MESSAGE(  p.is_zero(), "by constructor created zeropoint is no zeropoint!");
 
 
-   SecureVector<byte> sv_p = EC2OSP(p, PointGFp::UNCOMPRESSED);
+   secure_vector<byte> sv_p = EC2OSP(p, PointGFp::UNCOMPRESSED);
    PointGFp p_encdec = OS2ECP(sv_p, curve);
    CHECK_MESSAGE(  p == p_encdec, "encoded-decoded (uncompressed) point is not equal the original!");
 
@@ -291,7 +291,7 @@ void test_calc_with_zeropoint()
    std::cout << "." << std::flush;
 
    std::string G_secp_comp = "024a96b5688ef573284664698968c38bb913cbfc82";
-   SecureVector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
+   secure_vector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
    BigInt bi_p_secp("0xffffffffffffffffffffffffffffffff7fffffff");
    BigInt bi_a_secp("0xffffffffffffffffffffffffffffffff7ffffffc");
    BigInt bi_b_secp("0x1c97befc54bd7a8b65acf89f81d4d4adc565fa45");
@@ -327,10 +327,10 @@ void test_add_point()
    std::string a_secp = "ffffffffffffffffffffffffffffffff7ffffffc";
    std::string b_secp = "1c97befc54bd7a8b65acf89f81d4d4adc565fa45";
    std::string G_secp_comp = "024a96b5688ef573284664698968c38bb913cbfc82";
-   SecureVector<byte> sv_p_secp = hex_decode ( p_secp );
-   SecureVector<byte> sv_a_secp = hex_decode ( a_secp );
-   SecureVector<byte> sv_b_secp = hex_decode ( b_secp );
-   SecureVector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
+   secure_vector<byte> sv_p_secp = hex_decode ( p_secp );
+   secure_vector<byte> sv_a_secp = hex_decode ( a_secp );
+   secure_vector<byte> sv_b_secp = hex_decode ( b_secp );
+   secure_vector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
    BigInt bi_p_secp = BigInt::decode ( &sv_p_secp[0], sv_p_secp.size() );
    BigInt bi_a_secp = BigInt::decode ( &sv_a_secp[0], sv_a_secp.size() );
    BigInt bi_b_secp = BigInt::decode ( &sv_b_secp[0], sv_b_secp.size() );
@@ -363,10 +363,10 @@ void test_sub_point()
    std::string a_secp = "ffffffffffffffffffffffffffffffff7ffffffc";
    std::string b_secp = "1c97befc54bd7a8b65acf89f81d4d4adc565fa45";
    std::string G_secp_comp = "024a96b5688ef573284664698968c38bb913cbfc82";
-   SecureVector<byte> sv_p_secp = hex_decode ( p_secp );
-   SecureVector<byte> sv_a_secp = hex_decode ( a_secp );
-   SecureVector<byte> sv_b_secp = hex_decode ( b_secp );
-   SecureVector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
+   secure_vector<byte> sv_p_secp = hex_decode ( p_secp );
+   secure_vector<byte> sv_a_secp = hex_decode ( a_secp );
+   secure_vector<byte> sv_b_secp = hex_decode ( b_secp );
+   secure_vector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
    BigInt bi_p_secp = BigInt::decode ( &sv_p_secp[0], sv_p_secp.size() );
    BigInt bi_a_secp = BigInt::decode ( &sv_a_secp[0], sv_a_secp.size() );
    BigInt bi_b_secp = BigInt::decode ( &sv_b_secp[0], sv_b_secp.size() );
@@ -398,10 +398,10 @@ void test_mult_point()
    std::string a_secp = "ffffffffffffffffffffffffffffffff7ffffffc";
    std::string b_secp = "1c97befc54bd7a8b65acf89f81d4d4adc565fa45";
    std::string G_secp_comp = "024a96b5688ef573284664698968c38bb913cbfc82";
-   SecureVector<byte> sv_p_secp = hex_decode ( p_secp );
-   SecureVector<byte> sv_a_secp = hex_decode ( a_secp );
-   SecureVector<byte> sv_b_secp = hex_decode ( b_secp );
-   SecureVector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
+   secure_vector<byte> sv_p_secp = hex_decode ( p_secp );
+   secure_vector<byte> sv_a_secp = hex_decode ( a_secp );
+   secure_vector<byte> sv_b_secp = hex_decode ( b_secp );
+   secure_vector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
    BigInt bi_p_secp = BigInt::decode ( &sv_p_secp[0], sv_p_secp.size() );
    BigInt bi_a_secp = BigInt::decode ( &sv_a_secp[0], sv_a_secp.size() );
    BigInt bi_b_secp = BigInt::decode ( &sv_b_secp[0], sv_b_secp.size() );
@@ -427,10 +427,10 @@ void test_basic_operations()
    std::string a_secp = "ffffffffffffffffffffffffffffffff7ffffffc";
    std::string b_secp = "1c97befc54bd7a8b65acf89f81d4d4adc565fa45";
    std::string G_secp_comp = "024a96b5688ef573284664698968c38bb913cbfc82";
-   SecureVector<byte> sv_p_secp = hex_decode ( p_secp );
-   SecureVector<byte> sv_a_secp = hex_decode ( a_secp );
-   SecureVector<byte> sv_b_secp = hex_decode ( b_secp );
-   SecureVector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
+   secure_vector<byte> sv_p_secp = hex_decode ( p_secp );
+   secure_vector<byte> sv_a_secp = hex_decode ( a_secp );
+   secure_vector<byte> sv_b_secp = hex_decode ( b_secp );
+   secure_vector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
    BigInt bi_p_secp = BigInt::decode ( &sv_p_secp[0], sv_p_secp.size() );
    BigInt bi_a_secp = BigInt::decode ( &sv_a_secp[0], sv_a_secp.size() );
    BigInt bi_b_secp = BigInt::decode ( &sv_b_secp[0], sv_b_secp.size() );
@@ -490,10 +490,10 @@ void test_enc_dec_compressed_160()
    std::string G_secp_comp = "024A96B5688EF573284664698968C38BB913CBFC82";
    std::string G_order_secp_comp = "0100000000000000000001F4C8F927AED3CA752257";
 
-   SecureVector<byte> sv_p_secp = hex_decode ( p_secp );
-   SecureVector<byte> sv_a_secp = hex_decode ( a_secp );
-   SecureVector<byte> sv_b_secp = hex_decode ( b_secp );
-   SecureVector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
+   secure_vector<byte> sv_p_secp = hex_decode ( p_secp );
+   secure_vector<byte> sv_a_secp = hex_decode ( a_secp );
+   secure_vector<byte> sv_b_secp = hex_decode ( b_secp );
+   secure_vector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
 
    BigInt bi_p_secp = BigInt::decode ( &sv_p_secp[0], sv_p_secp.size() );
    BigInt bi_a_secp = BigInt::decode ( &sv_a_secp[0], sv_a_secp.size() );
@@ -502,7 +502,7 @@ void test_enc_dec_compressed_160()
    CurveGFp secp160r1(bi_p_secp, bi_a_secp, bi_b_secp);
 
    PointGFp p_G = OS2ECP ( sv_G_secp_comp, secp160r1 );
-   SecureVector<byte> sv_result = EC2OSP(p_G, PointGFp::COMPRESSED);
+   secure_vector<byte> sv_result = EC2OSP(p_G, PointGFp::COMPRESSED);
 
    CHECK( sv_result == sv_G_secp_comp);
    }
@@ -519,10 +519,10 @@ void test_enc_dec_compressed_256()
    std::string G_secp_comp = "036B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296";
    std::string G_order_secp_comp = "ffffffff00000000ffffffffffffffffBCE6FAADA7179E84F3B9CAC2FC632551";
 
-   SecureVector<byte> sv_p_secp = hex_decode ( p_secp );
-   SecureVector<byte> sv_a_secp = hex_decode ( a_secp );
-   SecureVector<byte> sv_b_secp = hex_decode ( b_secp );
-   SecureVector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
+   secure_vector<byte> sv_p_secp = hex_decode ( p_secp );
+   secure_vector<byte> sv_a_secp = hex_decode ( a_secp );
+   secure_vector<byte> sv_b_secp = hex_decode ( b_secp );
+   secure_vector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
 
    BigInt bi_p_secp = BigInt::decode ( &sv_p_secp[0], sv_p_secp.size() );
    BigInt bi_a_secp = BigInt::decode ( &sv_a_secp[0], sv_a_secp.size() );
@@ -531,7 +531,7 @@ void test_enc_dec_compressed_256()
    CurveGFp secp160r1(bi_p_secp, bi_a_secp, bi_b_secp);
 
    PointGFp p_G = OS2ECP ( sv_G_secp_comp, secp160r1 );
-   SecureVector<byte> sv_result = EC2OSP(p_G, PointGFp::COMPRESSED);
+   secure_vector<byte> sv_result = EC2OSP(p_G, PointGFp::COMPRESSED);
 
    CHECK( sv_result == sv_G_secp_comp);
    }
@@ -550,10 +550,10 @@ void test_enc_dec_uncompressed_112()
    std::string G_secp_uncomp = "044BA30AB5E892B4E1649DD0928643ADCD46F5882E3747DEF36E956E97";
    std::string G_order_secp_uncomp = "36DF0AAFD8B8D7597CA10520D04B";
 
-   SecureVector<byte> sv_p_secp = hex_decode ( p_secp );
-   SecureVector<byte> sv_a_secp = hex_decode ( a_secp );
-   SecureVector<byte> sv_b_secp = hex_decode ( b_secp );
-   SecureVector<byte> sv_G_secp_uncomp = hex_decode ( G_secp_uncomp );
+   secure_vector<byte> sv_p_secp = hex_decode ( p_secp );
+   secure_vector<byte> sv_a_secp = hex_decode ( a_secp );
+   secure_vector<byte> sv_b_secp = hex_decode ( b_secp );
+   secure_vector<byte> sv_G_secp_uncomp = hex_decode ( G_secp_uncomp );
 
    BigInt bi_p_secp = BigInt::decode ( &sv_p_secp[0], sv_p_secp.size() );
    BigInt bi_a_secp = BigInt::decode ( &sv_a_secp[0], sv_a_secp.size() );
@@ -562,7 +562,7 @@ void test_enc_dec_uncompressed_112()
    CurveGFp secp160r1(bi_p_secp, bi_a_secp, bi_b_secp);
 
    PointGFp p_G = OS2ECP ( sv_G_secp_uncomp, secp160r1 );
-   SecureVector<byte> sv_result = EC2OSP(p_G, PointGFp::UNCOMPRESSED);
+   secure_vector<byte> sv_result = EC2OSP(p_G, PointGFp::UNCOMPRESSED);
 
    CHECK( sv_result == sv_G_secp_uncomp);
    }
@@ -579,10 +579,10 @@ void test_enc_dec_uncompressed_521()
    std::string G_secp_uncomp = "0400C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2ffA8DE3348B3C1856A429BF97E7E31C2E5BD66011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650";
    std::string G_order_secp_uncomp = "01ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409";
 
-   SecureVector<byte> sv_p_secp = hex_decode ( p_secp );
-   SecureVector<byte> sv_a_secp = hex_decode ( a_secp );
-   SecureVector<byte> sv_b_secp = hex_decode ( b_secp );
-   SecureVector<byte> sv_G_secp_uncomp = hex_decode ( G_secp_uncomp );
+   secure_vector<byte> sv_p_secp = hex_decode ( p_secp );
+   secure_vector<byte> sv_a_secp = hex_decode ( a_secp );
+   secure_vector<byte> sv_b_secp = hex_decode ( b_secp );
+   secure_vector<byte> sv_G_secp_uncomp = hex_decode ( G_secp_uncomp );
 
    BigInt bi_p_secp = BigInt::decode ( &sv_p_secp[0], sv_p_secp.size() );
    BigInt bi_a_secp = BigInt::decode ( &sv_a_secp[0], sv_a_secp.size() );
@@ -592,7 +592,7 @@ void test_enc_dec_uncompressed_521()
 
    PointGFp p_G = OS2ECP ( sv_G_secp_uncomp, secp160r1 );
 
-   SecureVector<byte> sv_result = EC2OSP(p_G, PointGFp::UNCOMPRESSED);
+   secure_vector<byte> sv_result = EC2OSP(p_G, PointGFp::UNCOMPRESSED);
    std::string result = hex_encode(&sv_result[0], sv_result.size());
    std::string exp_result = hex_encode(&sv_G_secp_uncomp[0], sv_G_secp_uncomp.size());
 
@@ -611,10 +611,10 @@ void test_enc_dec_uncompressed_521_prime_too_large()
    std::string G_secp_uncomp = "0400C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2ffA8DE3348B3C1856A429BF97E7E31C2E5BD66011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650";
    std::string G_order_secp_uncomp = "01ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409";
 
-   SecureVector<byte> sv_p_secp = hex_decode ( p_secp );
-   SecureVector<byte> sv_a_secp = hex_decode ( a_secp );
-   SecureVector<byte> sv_b_secp = hex_decode ( b_secp );
-   SecureVector<byte> sv_G_secp_uncomp = hex_decode ( G_secp_uncomp );
+   secure_vector<byte> sv_p_secp = hex_decode ( p_secp );
+   secure_vector<byte> sv_a_secp = hex_decode ( a_secp );
+   secure_vector<byte> sv_b_secp = hex_decode ( b_secp );
+   secure_vector<byte> sv_G_secp_uncomp = hex_decode ( G_secp_uncomp );
 
    BigInt bi_p_secp = BigInt::decode ( &sv_p_secp[0], sv_p_secp.size() );
    BigInt bi_a_secp = BigInt::decode ( &sv_a_secp[0], sv_a_secp.size() );
@@ -648,7 +648,7 @@ void test_gfp_store_restore()
    PointGFp p = dom_pars.get_base_point();
 
    //store point (to std::string)
-   SecureVector<byte> sv_mes = EC2OSP(p, PointGFp::COMPRESSED);
+   secure_vector<byte> sv_mes = EC2OSP(p, PointGFp::COMPRESSED);
    PointGFp new_p = OS2ECP(sv_mes, dom_pars.get_curve());
 
    CHECK_MESSAGE( p == new_p, "original and restored point are different!");
@@ -662,7 +662,7 @@ void test_cdc_curve_33()
 
    std::string G_secp_uncomp = "04081523d03d4f12cd02879dea4bf6a4f3a7df26ed888f10c5b2235a1274c386a2f218300dee6ed217841164533bcdc903f07a096f9fbf4ee95bac098a111f296f5830fe5c35b3e344d5df3a2256985f64fbe6d0edcc4c61d18bef681dd399df3d0194c5a4315e012e0245ecea56365baa9e8be1f7";
 
-   SecureVector<byte> sv_G_uncomp = hex_decode ( G_secp_uncomp );
+   secure_vector<byte> sv_G_uncomp = hex_decode ( G_secp_uncomp );
 
    BigInt bi_p_secp = BigInt("2117607112719756483104013348936480976596328609518055062007450442679169492999007105354629105748524349829824407773719892437896937279095106809");
    BigInt bi_a_secp("0xa377dede6b523333d36c78e9b0eaa3bf48ce93041f6d4fc34014d08f6833807498deedd4290101c5866e8dfb589485d13357b9e78c2d7fbe9fe");
@@ -689,7 +689,7 @@ void test_more_zeropoint()
    // by Falko
 
    std::string G = "024a96b5688ef573284664698968c38bb913cbfc82";
-   SecureVector<byte> sv_G_secp_comp = hex_decode ( G );
+   secure_vector<byte> sv_G_secp_comp = hex_decode ( G );
    BigInt bi_p("0xffffffffffffffffffffffffffffffff7fffffff");
    BigInt bi_a("0xffffffffffffffffffffffffffffffff7ffffffc");
    BigInt bi_b("0x1c97befc54bd7a8b65acf89f81d4d4adc565fa45");
diff --git a/checks/ecdh.cpp b/checks/ecdh.cpp
index c641796d6..841bce55b 100644
--- a/checks/ecdh.cpp
+++ b/checks/ecdh.cpp
@@ -96,8 +96,8 @@ void test_ecdh_der_derivation(RandomNumberGenerator& rng)
       ECDH_PrivateKey private_a(rng, dom_pars);
       ECDH_PrivateKey private_b(rng, dom_pars);
 
-      MemoryVector<byte> key_a = private_a.public_value();
-      MemoryVector<byte> key_b = private_b.public_value();
+      std::vector<byte> key_a = private_a.public_value();
+      std::vector<byte> key_b = private_b.public_value();
 
       PK_Key_Agreement ka(private_a, "KDF2(SHA-1)");
       PK_Key_Agreement kb(private_b, "KDF2(SHA-1)");
diff --git a/checks/ecdsa.cpp b/checks/ecdsa.cpp
index 3110bf0fe..554f72dd7 100644
--- a/checks/ecdsa.cpp
+++ b/checks/ecdsa.cpp
@@ -32,7 +32,7 @@ using namespace Botan;
 
 namespace {
 
-std::string to_hex(const SecureVector<byte>& bin)
+std::string to_hex(const std::vector<byte>& bin)
    {
    return hex_encode(&bin[0], bin.size());
    }
@@ -54,7 +54,7 @@ void test_hash_larger_than_n(RandomNumberGenerator& rng)
 
    ECDSA_PrivateKey priv_key(rng, dom_pars);
 
-   SecureVector<byte> message(20);
+   std::vector<byte> message(20);
    for(size_t i = 0; i != message.size(); ++i)
       message[i] = i;
 
@@ -64,14 +64,14 @@ void test_hash_larger_than_n(RandomNumberGenerator& rng)
    PK_Signer pk_signer_224(priv_key, "EMSA1_BSI(SHA-224)");
 
    // Verify we can sign and verify with SHA-160
-   SecureVector<byte> signature_160 = pk_signer_160.sign_message(message, rng);
+   std::vector<byte> signature_160 = pk_signer_160.sign_message(message, rng);
 
    CHECK(pk_verifier_160.verify_message(message, signature_160));
 
    bool signature_failed = false;
    try
       {
-      SecureVector<byte> signature_224 = pk_signer_224.sign_message(message, rng);
+      std::vector<byte> signature_224 = pk_signer_224.sign_message(message, rng);
       }
    catch(Encoding_Error)
       {
@@ -84,7 +84,7 @@ void test_hash_larger_than_n(RandomNumberGenerator& rng)
 
    // sign it with the normal EMSA1
    PK_Signer pk_signer(priv_key, "EMSA1(SHA-224)");
-   SecureVector<byte> signature = pk_signer.sign_message(message, rng);
+   std::vector<byte> signature = pk_signer.sign_message(message, rng);
 
    PK_Verifier pk_verifier(priv_key, "EMSA1_BSI(SHA-224)");
 
@@ -142,8 +142,8 @@ void test_sign_then_ver(RandomNumberGenerator& rng)
 
    PK_Signer signer(ecdsa, "EMSA1(SHA-1)");
 
-   SecureVector<byte> msg = hex_decode("12345678901234567890abcdef12");
-   SecureVector<byte> sig = signer.sign_message(msg, rng);
+   secure_vector<byte> msg = hex_decode("12345678901234567890abcdef12");
+   std::vector<byte> sig = signer.sign_message(msg, rng);
 
    PK_Verifier verifier(ecdsa, "EMSA1(SHA-1)");
 
@@ -174,7 +174,7 @@ bool test_ec_sign(RandomNumberGenerator& rng)
 
       for(size_t i = 0; i != 256; ++i)
          signer.update(static_cast<byte>(i));
-      SecureVector<byte> sig = signer.signature(rng);
+      std::vector<byte> sig = signer.signature(rng);
 
       for(u32bit i = 0; i != 256; ++i)
          verifier.update(static_cast<byte>(i));
@@ -267,11 +267,11 @@ void test_create_and_verify(RandomNumberGenerator& rng)
    std::string G_secp_comp = "04081523d03d4f12cd02879dea4bf6a4f3a7df26ed888f10c5b2235a1274c386a2f218300dee6ed217841164533bcdc903f07a096f9fbf4ee95bac098a111f296f5830fe5c35b3e344d5df3a2256985f64fbe6d0edcc4c61d18bef681dd399df3d0194c5a4315e012e0245ecea56365baa9e8be1f7";
    std::string order_g = "0e1a16196e6000000000bc7f1618d867b15bb86474418f";
 
-   //	::SecureVector<byte> sv_p_secp = hex_decode ( p_secp );
-   SecureVector<byte> sv_a_secp = hex_decode ( a_secp );
-   SecureVector<byte> sv_b_secp = hex_decode ( b_secp );
-   SecureVector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
-   SecureVector<byte> sv_order_g = hex_decode ( order_g );
+   //	::std::vector<byte> sv_p_secp = hex_decode ( p_secp );
+   secure_vector<byte> sv_a_secp = hex_decode ( a_secp );
+   secure_vector<byte> sv_b_secp = hex_decode ( b_secp );
+   secure_vector<byte> sv_G_secp_comp = hex_decode ( G_secp_comp );
+   secure_vector<byte> sv_order_g = hex_decode ( order_g );
 
    //	BigInt bi_p_secp = BigInt::decode ( &sv_p_secp[0], sv_p_secp.size() );
    BigInt bi_p_secp("2117607112719756483104013348936480976596328609518055062007450442679169492999007105354629105748524349829824407773719892437896937279095106809");
@@ -343,8 +343,8 @@ void test_curve_registry(RandomNumberGenerator& rng)
          PK_Signer signer(ecdsa, "EMSA1(SHA-1)");
          PK_Verifier verifier(ecdsa, "EMSA1(SHA-1)");
 
-         SecureVector<byte> msg = hex_decode("12345678901234567890abcdef12");
-         SecureVector<byte> sig = signer.sign_message(msg, rng);
+         secure_vector<byte> msg = hex_decode("12345678901234567890abcdef12");
+         std::vector<byte> sig = signer.sign_message(msg, rng);
 
          if(!verifier.verify_message(msg, sig))
             std::cout << "Failed testing ECDSA sig for curve " << oids[i] << "\n";
@@ -361,7 +361,7 @@ void test_read_pkcs8(RandomNumberGenerator& rng)
    {
    std::cout << "." << std::flush;
 
-   SecureVector<byte> msg = hex_decode("12345678901234567890abcdef12");
+   secure_vector<byte> msg = hex_decode("12345678901234567890abcdef12");
 
    try
       {
@@ -371,7 +371,7 @@ void test_read_pkcs8(RandomNumberGenerator& rng)
 
       PK_Signer signer(*ecdsa, "EMSA1(SHA-1)");
 
-      SecureVector<byte> sig = signer.sign_message(msg, rng);
+      std::vector<byte> sig = signer.sign_message(msg, rng);
 
       PK_Verifier verifier(*ecdsa, "EMSA1(SHA-1)");
 
@@ -393,7 +393,7 @@ void test_read_pkcs8(RandomNumberGenerator& rng)
       PK_Signer signer(*ecdsa_nodp, "EMSA1(SHA-1)");
       PK_Verifier verifier(*ecdsa_nodp, "EMSA1(SHA-1)");
 
-      SecureVector<byte> signature_nodp = signer.sign_message(msg, rng);
+      std::vector<byte> signature_nodp = signer.sign_message(msg, rng);
 
       CHECK_MESSAGE(verifier.verify_message(msg, signature_nodp),
                     "generated signature could not be verified positively (no_dom)");
diff --git a/checks/pk.cpp b/checks/pk.cpp
index e06efb3ea..261c5f78c 100644
--- a/checks/pk.cpp
+++ b/checks/pk.cpp
@@ -85,8 +85,8 @@ BigInt to_bigint(std::string input)
                          input.length(), BigInt::Hexadecimal);
    }
 
-void dump_data(const SecureVector<byte>& out,
-               const SecureVector<byte>& expected)
+void dump_data(const std::vector<byte>& out,
+               const std::vector<byte>& expected)
    {
    Pipe pipe(new Hex_Encoder);
 
@@ -142,11 +142,11 @@ void validate_save_and_load(const Private_Key* priv_key,
    }
 
 void validate_decryption(PK_Decryptor& d, const std::string& algo,
-                         const SecureVector<byte> ctext,
-                         const SecureVector<byte> ptext,
+                         const std::vector<byte> ctext,
+                         const std::vector<byte> ptext,
                          bool& failure)
    {
-   SecureVector<byte> decrypted = d.decrypt(ctext);
+   std::vector<byte> decrypted = unlock(d.decrypt(ctext));
    if(decrypted != ptext)
       {
       std::cout << "FAILED (decrypt): " << algo << std::endl;
@@ -160,11 +160,11 @@ void validate_encryption(PK_Encryptor& e, PK_Decryptor& d,
                          const std::string& random, const std::string& exp,
                          bool& failure)
    {
-   SecureVector<byte> message = hex_decode(input);
-   SecureVector<byte> expected = hex_decode(exp);
+   std::vector<byte> message = unlock(hex_decode(input));
+   std::vector<byte> expected = unlock(hex_decode(exp));
    Fixed_Output_RNG rng(hex_decode(random));
 
-   SecureVector<byte> out = e.encrypt(message, rng);
+   std::vector<byte> out = e.encrypt(message, rng);
    if(out != expected)
       {
       std::cout << "FAILED (encrypt): " << algo << std::endl;
@@ -180,11 +180,11 @@ void validate_signature(PK_Verifier& v, PK_Signer& s, const std::string& algo,
                         RandomNumberGenerator& rng,
                         const std::string& exp, bool& failure)
    {
-   SecureVector<byte> message = hex_decode(input);
+   std::vector<byte> message = unlock(hex_decode(input));
 
-   SecureVector<byte> expected = hex_decode(exp);
+   std::vector<byte> expected = unlock(hex_decode(exp));
 
-   SecureVector<byte> sig = s.sign_message(message, rng);
+   std::vector<byte> sig = s.sign_message(message, rng);
 
    if(sig != expected)
       {
@@ -220,18 +220,18 @@ void validate_signature(PK_Verifier& v, PK_Signer& s, const std::string& algo,
    }
 
 void validate_kas(PK_Key_Agreement& kas, const std::string& algo,
-                  const SecureVector<byte>& pubkey, const std::string& output,
+                  const std::vector<byte>& pubkey, const std::string& output,
                   u32bit keylen, bool& failure)
    {
-   SecureVector<byte> expected = hex_decode(output);
+   secure_vector<byte> expected = hex_decode(output);
 
-   SecureVector<byte> got = kas.derive_key(keylen,
-                                           pubkey).bits_of();
+   secure_vector<byte> got = kas.derive_key(keylen,
+                                            pubkey).bits_of();
 
    if(got != expected)
       {
       std::cout << "FAILED: " << algo << std::endl;
-      dump_data(got, expected);
+      dump_data(unlock(got), unlock(expected));
       failure = true;
       }
    }
@@ -325,8 +325,8 @@ u32bit validate_elg_enc(const std::string& algo,
       validate_encryption(e, d, algo, str[4], str[5], str[6], failure);
       }
    else
-      validate_decryption(d, algo, hex_decode(str[5]),
-                          hex_decode(str[4]), failure);
+      validate_decryption(d, algo, unlock(hex_decode(str[5])),
+                          unlock(hex_decode(str[4])), failure);
    return (failure ? 1 : 0);
 #endif
 
@@ -373,8 +373,8 @@ u32bit validate_rsa_ver(const std::string& algo,
 
    PK_Verifier v(key, emsa);
 
-   SecureVector<byte> msg = hex_decode(str[2]);
-   SecureVector<byte> sig = hex_decode(str[3]);
+   std::vector<byte> msg = unlock(hex_decode(str[2]));
+   std::vector<byte> sig = unlock(hex_decode(str[3]));
 
    bool passed = true;
    passed = v.verify_message(msg, sig);
@@ -405,8 +405,8 @@ u32bit validate_rsa_ver_x509(const std::string& algo,
 
    PK_Verifier v(*rsakey, emsa);
 
-   SecureVector<byte> msg = hex_decode(str[1]);
-   SecureVector<byte> sig = hex_decode(str[2]);
+   std::vector<byte> msg = unlock(hex_decode(str[1]));
+   std::vector<byte> sig = unlock(hex_decode(str[2]));
 
    bool passed = v.verify_message(msg, sig);
    return (passed ? 0 : 1);
@@ -429,8 +429,8 @@ u32bit validate_rw_ver(const std::string& algo,
 
    PK_Verifier v(key, emsa);
 
-   SecureVector<byte> msg = hex_decode(str[2]);
-   SecureVector<byte> sig = hex_decode(str[3]);
+   std::vector<byte> msg = unlock(hex_decode(str[2]));
+   std::vector<byte> sig = unlock(hex_decode(str[3]));
 
    bool passed = true;
    passed = v.verify_message(msg, sig);
@@ -538,7 +538,7 @@ u32bit validate_gost_ver(const std::string& algo,
 
    EC_Group group(OIDS::lookup(str[0]));
 
-   PointGFp public_point = OS2ECP(hex_decode(str[1]), group.get_curve());
+   PointGFp public_point = OS2ECP(unlock(hex_decode(str[1])), group.get_curve());
 
    GOST_3410_PublicKey gost(group, public_point);
 
@@ -546,8 +546,8 @@ u32bit validate_gost_ver(const std::string& algo,
 
    PK_Verifier v(gost, emsa);
 
-   SecureVector<byte> msg = hex_decode(str[2]);
-   SecureVector<byte> sig = hex_decode(str[3]);
+   std::vector<byte> msg = unlock(hex_decode(str[2]));
+   std::vector<byte> sig = unlock(hex_decode(str[3]));
 
    bool passed = v.verify_message(msg, sig);
    return (passed ? 0 : 1);
@@ -578,8 +578,8 @@ u32bit validate_dsa_ver(const std::string& algo,
 
    PK_Verifier v(*dsakey, emsa);
 
-   SecureVector<byte> msg = hex_decode(str[1]);
-   SecureVector<byte> sig = hex_decode(str[2]);
+   std::vector<byte> msg = unlock(hex_decode(str[1]));
+   std::vector<byte> sig = unlock(hex_decode(str[2]));
 
    v.set_input_format(DER_SEQUENCE);
    bool passed = v.verify_message(msg, sig);
diff --git a/checks/pk_bench.cpp b/checks/pk_bench.cpp
index ab4702dba..8241ee5d1 100644
--- a/checks/pk_bench.cpp
+++ b/checks/pk_bench.cpp
@@ -104,7 +104,7 @@ void benchmark_enc_dec(PK_Encryptor& enc, PK_Decryptor& dec,
                        RandomNumberGenerator& rng,
                        u32bit runs, double seconds)
    {
-   SecureVector<byte> plaintext, ciphertext;
+   std::vector<byte> plaintext, ciphertext;
 
    for(u32bit i = 0; i != runs; ++i)
       {
@@ -127,7 +127,7 @@ void benchmark_enc_dec(PK_Encryptor& enc, PK_Decryptor& dec,
       if(dec_timer.seconds() < seconds)
          {
          dec_timer.start();
-         SecureVector<byte> plaintext_out = dec.decrypt(ciphertext);
+         std::vector<byte> plaintext_out = unlock(dec.decrypt(ciphertext));
          dec_timer.stop();
 
          if(plaintext_out != plaintext)
@@ -143,7 +143,7 @@ void benchmark_sig_ver(PK_Verifier& ver, PK_Signer& sig,
                        RandomNumberGenerator& rng,
                        u32bit runs, double seconds)
    {
-   SecureVector<byte> message, signature, sig_random;
+   std::vector<byte> message, signature, sig_random;
 
    for(u32bit i = 0; i != runs; ++i)
       {
@@ -171,7 +171,7 @@ void benchmark_sig_ver(PK_Verifier& ver, PK_Signer& sig,
 
          if((i % 100) == 0)
             {
-            sig_random = rng.random_vec(signature.size());
+            sig_random = unlock(rng.random_vec(signature.size()));
 
             verify_timer.start();
             const bool verified_bad = ver.verify_message(message, sig_random);
diff --git a/checks/validate.cpp b/checks/validate.cpp
index 2bb099030..c6a4a29d0 100644
--- a/checks/validate.cpp
+++ b/checks/validate.cpp
@@ -119,7 +119,7 @@ bool keywrap_test(const char* key_str,
 
       Algorithm_Factory& af = global_state().algorithm_factory();
 
-      SecureVector<byte> enc = rfc3394_keywrap(key.bits_of(), kek, af);
+      secure_vector<byte> enc = rfc3394_keywrap(key.bits_of(), kek, af);
 
       if(enc != expected.bits_of())
          {
@@ -128,7 +128,7 @@ bool keywrap_test(const char* key_str,
          ok = false;
          }
 
-      SecureVector<byte> dec = rfc3394_keyunwrap(expected.bits_of(), kek, af);
+      secure_vector<byte> dec = rfc3394_keyunwrap(expected.bits_of(), kek, af);
 
       if(dec != key.bits_of())
          {
@@ -490,7 +490,7 @@ bool failed_test(const std::string& algo,
       pipe.append(test);
       pipe.append(new Botan::Hex_Encoder);
 
-      Botan::SecureVector<byte> data = Botan::hex_decode(in);
+      secure_vector<byte> data = Botan::hex_decode(in);
       const byte* data_ptr = &data[0];
 
       // this can help catch errors with buffering, etc
@@ -538,7 +538,7 @@ bool failed_test(const std::string& algo,
       size_t offset = random_word(rng, pipe.remaining() - 1);
       size_t length = random_word(rng, pipe.remaining() - offset);
 
-      Botan::SecureVector<byte> peekbuf(length);
+      std::vector<byte> peekbuf(length);
       pipe.peek(&peekbuf[0], peekbuf.size(), offset);
 
       output = pipe.read_all_as_string();
diff --git a/checks/x509.cpp b/checks/x509.cpp
index 8c6cd8187..c3bf2353e 100644
--- a/checks/x509.cpp
+++ b/checks/x509.cpp
@@ -49,7 +49,7 @@ u64bit key_id(const Public_Key* key)
    pipe.write(key->x509_subject_public_key());
    pipe.end_msg();
 
-   SecureVector<byte> output = pipe.read_all();
+   secure_vector<byte> output = pipe.read_all();
 
    if(output.size() != 8)
       throw Internal_Error("Public_Key::key_id: Incorrect output size");