# 
# patch "ChangeLog"
#  from [12d4c2d6c79e592dd5cf5451ae2e94b0cc16bdc8]
#    to [6ee383adec65fed9cc5cd995423161569742af8b]
# 
# patch "netcmd.cc"
#  from [382d4509ec3334facb63b5bbacc05a66f1f174ea]
#    to [b18f03651d0f0256957f47afcc96f5a121598d96]
# 
===============================================
--- ChangeLog	12d4c2d6c79e592dd5cf5451ae2e94b0cc16bdc8
+++ ChangeLog	6ee383adec65fed9cc5cd995423161569742af8b
@@ -1,3 +1,7 @@
+2005-07-19  Nathaniel Smith  <address@hidden>
+
+	* netcmd.cc (read): Make the bad HMAC error message clearer.
+
 2005-07-18  Nathaniel Smith  <address@hidden>
 
 	* keys.cc (get_passphrase): Do still error out if they keep typing
===============================================
--- netcmd.cc	382d4509ec3334facb63b5bbacc05a66f1f174ea
+++ netcmd.cc	b18f03651d0f0256957f47afcc96f5a121598d96
@@ -150,7 +150,9 @@
                                         "netcmd HMAC");
   inbuf.erase(0, pos);
   if (cmd_digest != digest)
-    throw bad_decode(F("bad HMAC %s vs. %s") % encode_hexenc(cmd_digest)
+    throw bad_decode(F("bad HMAC checksum (got %s, wanted %s)\n"
+                       "this suggests data was corrupted in transit\n")
+                     % encode_hexenc(cmd_digest)
                      % encode_hexenc(digest));
   payload.erase(0, payload_pos);