aboutsummaryrefslogtreecommitdiffstats
path: root/src/ssl/hello.cpp
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-09-15 13:44:42 +0000
committerlloyd <[email protected]>2010-09-15 13:44:42 +0000
commit180c5358cb31e9c003cada3705bb30cf01732878 (patch)
tree951038dfaf2c33bcee5e27c4b1d2980eb35494a3 /src/ssl/hello.cpp
parenta9d0f37596e5413cae45f32740738c5c68abcce1 (diff)
Update all uses of MemoryRegion::append to use either push_back or operator+=
Diffstat (limited to 'src/ssl/hello.cpp')
-rw-r--r--src/ssl/hello.cpp42
1 files changed, 22 insertions, 20 deletions
diff --git a/src/ssl/hello.cpp b/src/ssl/hello.cpp
index 9ee3f87b9..887d13f1f 100644
--- a/src/ssl/hello.cpp
+++ b/src/ssl/hello.cpp
@@ -25,7 +25,7 @@ void HandshakeMessage::send(Record_Writer& writer, HandshakeHash& hash) const
send_buf[2] = get_byte(2, buf_size);
send_buf[3] = get_byte(3, buf_size);
- send_buf.append(buf);
+ send_buf += buf;
hash.update(send_buf);
@@ -82,25 +82,26 @@ SecureVector<byte> Client_Hello::serialize() const
{
SecureVector<byte> buf;
- buf.append(static_cast<byte>(c_version >> 8));
- buf.append(static_cast<byte>(c_version ));
- buf.append(c_random);
- buf.append(static_cast<byte>(sess_id.size()));
- buf.append(sess_id);
+ buf.push_back(static_cast<byte>(c_version >> 8));
+ buf.push_back(static_cast<byte>(c_version ));
+ buf += c_random;
+
+ buf.push_back(static_cast<byte>(sess_id.size()));
+ buf += sess_id;
u16bit suites_size = 2*suites.size();
- buf.append(get_byte(0, suites_size));
- buf.append(get_byte(1, suites_size));
+ buf.push_back(get_byte(0, suites_size));
+ buf.push_back(get_byte(1, suites_size));
for(u32bit i = 0; i != suites.size(); i++)
{
- buf.append(get_byte(0, suites[i]));
- buf.append(get_byte(1, suites[i]));
+ buf.push_back(get_byte(0, suites[i]));
+ buf.push_back(get_byte(1, suites[i]));
}
- buf.append(static_cast<byte>(comp_algos.size()));
+ buf.push_back(static_cast<byte>(comp_algos.size()));
for(u32bit i = 0; i != comp_algos.size(); i++)
- buf.append(comp_algos[i]);
+ buf.push_back(comp_algos[i]);
return buf;
}
@@ -260,16 +261,17 @@ SecureVector<byte> Server_Hello::serialize() const
{
SecureVector<byte> buf;
- buf.append(static_cast<byte>(s_version >> 8));
- buf.append(static_cast<byte>(s_version ));
- buf.append(s_random);
- buf.append(static_cast<byte>(sess_id.size()));
- buf.append(sess_id);
+ buf.push_back(static_cast<byte>(s_version >> 8));
+ buf.push_back(static_cast<byte>(s_version ));
+ buf += s_random;
+
+ buf.push_back(static_cast<byte>(sess_id.size()));
+ buf += sess_id;
- buf.append(get_byte(0, suite));
- buf.append(get_byte(1, suite));
+ buf.push_back(get_byte(0, suite));
+ buf.push_back(get_byte(1, suite));
- buf.append(comp_algo);
+ buf.push_back(comp_algo);
return buf;
}