The unified diff between revisions [869f0c37..] and [e24ccc23..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'netcmd.hh'

#
#
# patch "netcmd.hh"
#  from [901532e162e97d3df8f89ccc1198203eef8ed8fe]
#    to [b010800c5f7c9cb23ac8f0ac069b7a4fbdd17774]
#
============================================================
--- netcmd.hh	901532e162e97d3df8f89ccc1198203eef8ed8fe
+++ netcmd.hh	b010800c5f7c9cb23ac8f0ac069b7a4fbdd17774
@@ -65,8 +65,11 @@ public:


   // basic cmd i/o (including checksums)
-  void write(std::string & out) const;
-  bool read(std::string & inbuf);
+  void write(std::string & out,
+             netsync_session_key const & key,
+             netsync_hmac_value & hmac_val) const;
+  bool read(std::string & inbuf,
+            netsync_session_key const & key, netsync_hmac_value & hmac_val);

   // i/o functions for each type of command payload
   void read_error_cmd(std::string & errmsg) const;
@@ -82,28 +85,28 @@ public:
                        rsa_pub_key const & server_key,
                        id const & nonce);

-  void read_anonymous_cmd(protocol_role & role,
+  void read_anonymous_cmd(protocol_role & role,
                           std::string & pattern,
-                          id & nonce2) const;
+                          rsa_oaep_sha_data & hmac_key_encrypted) const;
   void write_anonymous_cmd(protocol_role role,
                            std::string const & pattern,
-                           id const & nonce2);
+                           rsa_oaep_sha_data const & hmac_key_encrypted);

   void read_auth_cmd(protocol_role & role,
                      std::string & pattern,
                      id & client,
                      id & nonce1,
-                     id & nonce2,
+                     rsa_oaep_sha_data & hmac_key_encrypted,
                      std::string & signature) const;
   void write_auth_cmd(protocol_role role,
                       std::string const & pattern,
                       id const & client,
                       id const & nonce1,
-                      id const & nonce2,
+                      rsa_oaep_sha_data const & hmac_key_encrypted,
                       std::string const & signature);

-  void read_confirm_cmd(std::string & signature) const;
-  void write_confirm_cmd(std::string const & signature);
+  void read_confirm_cmd() const;
+  void write_confirm_cmd();

   void read_refine_cmd(merkle_node & node) const;
   void write_refine_cmd(merkle_node const & node);