# # # patch "ChangeLog" # from [3e698f8533b8e44bdb0453e5da271860cda2b493] # to [10d95b34f96381a7bde30f2f45c93ef9f09d1317] # # patch "netcmd.cc" # from [4d336ded22754be0808eeac36f581bce8099f84b] # to [8fa03553a30d87ff442de0d38e0e3042211c6f08] # ============================================================ --- ChangeLog 3e698f8533b8e44bdb0453e5da271860cda2b493 +++ ChangeLog 10d95b34f96381a7bde30f2f45c93ef9f09d1317 @@ -1,5 +1,9 @@ 2006-05-28 Graydon Hoare + * netcmd.cc: Fix build breakage in unit tests. + +2006-05-28 Graydon Hoare + * app_state.cc (search_root): Initialize to current_root_path(). * paths.{cc,hh} (current_root_path): New function. * win32/get_system_flavour.cc (processor_types): Fix typo. ============================================================ --- netcmd.cc 4d336ded22754be0808eeac36f581bce8099f84b +++ netcmd.cc 8fa03553a30d87ff442de0d38e0e3042211c6f08 @@ -559,39 +559,39 @@ string buf; netsync_session_key key(constants::netsync_key_initializer); { - chained_hmac mac(key); + chained_hmac mac(key, true); // mutates mac out_cmd.write(buf, mac); BOOST_CHECK_THROW(in_cmd.read_string(buf, mac), bad_decode); } { - chained_hmac mac(key); + chained_hmac mac(key, true); out_cmd.write(buf, mac); } buf[0] ^= 0xff; { - chained_hmac mac(key); + chained_hmac mac(key, true); BOOST_CHECK_THROW(in_cmd.read_string(buf, mac), bad_decode); } { - chained_hmac mac(key); + chained_hmac mac(key, true); out_cmd.write(buf, mac); } buf[buf.size() - 1] ^= 0xff; { - chained_hmac mac(key); + chained_hmac mac(key, true); BOOST_CHECK_THROW(in_cmd.read_string(buf, mac), bad_decode); } { - chained_hmac mac(key); + chained_hmac mac(key, true); out_cmd.write(buf, mac); } buf += '\0'; { - chained_hmac mac(key); + chained_hmac mac(key, true); BOOST_CHECK_THROW(in_cmd.read_string(buf, mac), bad_decode); } } @@ -601,11 +601,11 @@ { netsync_session_key key(constants::netsync_key_initializer); { - chained_hmac mac(key); + chained_hmac mac(key, true); out_cmd.write(buf, mac); } { - chained_hmac mac(key); + chained_hmac mac(key, true); BOOST_CHECK(in_cmd.read_string(buf, mac)); } BOOST_CHECK(in_cmd == out_cmd);