diff options
| author | lloyd <[email protected]> | 2012-05-18 20:32:36 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-05-18 20:32:36 +0000 |
| commit | c691561f3198f481c13457433efbccc1c9fcd898 (patch) | |
| tree | a45ea2c5a30e0cb009fbcb68a61ef39332ff790c /src/tls/cert_ver.cpp | |
| parent | d76700f01c7ecac5633edf75f8d7408b46c5dbac (diff) | |
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.
Diffstat (limited to 'src/tls/cert_ver.cpp')
| -rw-r--r-- | src/tls/cert_ver.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tls/cert_ver.cpp b/src/tls/cert_ver.cpp index 0a377b35f..e6d90b060 100644 --- a/src/tls/cert_ver.cpp +++ b/src/tls/cert_ver.cpp @@ -33,7 +33,7 @@ Certificate_Verify::Certificate_Verify(Record_Writer& writer, if(state->version() == Protocol_Version::SSL_V3) { - SecureVector<byte> md5_sha = state->hash.final_ssl3( + secure_vector<byte> md5_sha = state->hash.final_ssl3( state->keys.master_secret()); if(priv_key->algo_name() == "DSA") @@ -52,7 +52,7 @@ Certificate_Verify::Certificate_Verify(Record_Writer& writer, /* * Deserialize a Certificate Verify message */ -Certificate_Verify::Certificate_Verify(const MemoryRegion<byte>& buf, +Certificate_Verify::Certificate_Verify(const std::vector<byte>& buf, Protocol_Version version) { TLS_Data_Reader reader(buf); @@ -69,9 +69,9 @@ Certificate_Verify::Certificate_Verify(const MemoryRegion<byte>& buf, /* * Serialize a Certificate Verify message */ -MemoryVector<byte> Certificate_Verify::serialize() const +std::vector<byte> Certificate_Verify::serialize() const { - MemoryVector<byte> buf; + std::vector<byte> buf; if(hash_algo != "" && sig_algo != "") { @@ -102,7 +102,7 @@ bool Certificate_Verify::verify(const X509_Certificate& cert, if(state->version() == Protocol_Version::SSL_V3) { - SecureVector<byte> md5_sha = state->hash.final_ssl3( + secure_vector<byte> md5_sha = state->hash.final_ssl3( state->keys.master_secret()); return verifier.verify_message(&md5_sha[16], md5_sha.size()-16, |