The unified diff between revisions [e24ccc23..] and [3c57b646..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch "netcmd.cc"
# from [207caa3c268ad7e6a93eaff3f3298aa53f45fadd]
# to [3556111073d4b6be8c066608d4f078ce9bb367a3]
#
# patch "netcmd.hh"
# from [b010800c5f7c9cb23ac8f0ac069b7a4fbdd17774]
# to [5e07ed90ed3c54fb07df647b834946d400dad377]
#
============================================================
--- netcmd.cc 207caa3c268ad7e6a93eaff3f3298aa53f45fadd
+++ netcmd.cc 3556111073d4b6be8c066608d4f078ce9bb367a3
@@ -52,7 +52,6 @@ netcmd::netcmd() : version(constants::ne
cmd_code(bye_cmd),
payload_len(0), length_len(0)
{}
-{}
size_t netcmd::encoded_size()
{
@@ -167,7 +166,8 @@ netcmd::read(string & inbuf, netsync_ses
require_bytes(inbuf, pos, payload_len, "netcmd payload");
inbuf.erase(0, pos);
pos = payload_len;
- u32 checksum = extract_datum_lsb<u32>(inbuf, pos, "netcmd checksum");
+ string cmd_digest = extract_substring(inbuf, pos, CryptoPP::SHA::DIGESTSIZE,
+ "netcmd HMAC");
inbuf.resize(payload_len);
inbuf.swap(payload);
@@ -178,8 +178,6 @@ netcmd::read(string & inbuf, netsync_ses
length_len = 0;
// they might have given us bogus data
- string cmd_digest = extract_substring(inbuf, pos, CryptoPP::SHA::DIGESTSIZE,
- "netcmd HMAC");
I(key().size() == CryptoPP::SHA::DIGESTSIZE);
I(key().size() == hmac_val().size());
byte keybuf[CryptoPP::SHA::DIGESTSIZE];
============================================================
--- netcmd.hh b010800c5f7c9cb23ac8f0ac069b7a4fbdd17774
+++ netcmd.hh 5e07ed90ed3c54fb07df647b834946d400dad377
@@ -56,7 +56,6 @@ public:
size_t length_len;
public:
netcmd();
- netcmd(u8 _version);
netcmd_code get_cmd_code() const {return cmd_code;}
u8 get_version() const {return version;}
size_t encoded_size();