? modules/acquia/acquia_connector/.svn
? modules/acquia/acquia_connector/acquia_agent/.svn
? modules/acquia/acquia_connector/acquia_agent/tests
? modules/acquia/acquia_connector/acquia_spi/.svn
? modules/acquia/acquia_connector/acquia_spi/tests
Index: modules/acquia/acquia_connector/acquia_agent/acquia_agent.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/acquia_connector/acquia_agent/acquia_agent.module,v
retrieving revision 1.4
diff -u -r1.4 acquia_agent.module
--- modules/acquia/acquia_connector/acquia_agent/acquia_agent.module	28 Jan 2009 22:21:33 -0000	1.4
+++ modules/acquia/acquia_connector/acquia_agent/acquia_agent.module	9 Feb 2009 06:11:21 -0000
@@ -366,6 +366,9 @@
   }
   $acquia_network_address .= '/xmlrpc.php';
   $host = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : '';
+  
+  $params['rpc_version']  = ACQUIA_RPC_VERSION;
+  
   $data = array(
     'authenticator' => _acquia_agent_authenticator($params, $identifier, $key),
     'host' => $host,
@@ -490,4 +493,3 @@
   // Include version number information.
   include_once 'acquia_agent_drupal_version.inc';
 }
-
Index: modules/acquia/acquia_connector/acquia_agent/acquia_agent_drupal_version.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/acquia_connector/acquia_agent/acquia_agent_drupal_version.inc,v
retrieving revision 1.1
diff -u -r1.1 acquia_agent_drupal_version.inc
--- modules/acquia/acquia_connector/acquia_agent/acquia_agent_drupal_version.inc	30 Dec 2008 16:51:45 -0000	1.1
+++ modules/acquia/acquia_connector/acquia_agent/acquia_agent_drupal_version.inc	9 Feb 2009 06:11:21 -0000
@@ -22,3 +22,4 @@
 define('ACQUIA_DRUPAL_SERIES'  , 'ACQ_series_ACQ');
 define('ACQUIA_DRUPAL_BRANCH'  , 'ACQ_branch_ACQ');
 define('ACQUIA_DRUPAL_REVISION', 'ACQ_rev_ACQ');
+define('ACQUIA_RPC_VERSION', 2);
Index: modules/acquia/acquia_connector/acquia_agent/acquia_agent_streams.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/acquia_connector/acquia_agent/acquia_agent_streams.inc,v
retrieving revision 1.2
diff -u -r1.2 acquia_agent_streams.inc
--- modules/acquia/acquia_connector/acquia_agent/acquia_agent_streams.inc	20 Jan 2009 18:24:28 -0000	1.2
+++ modules/acquia/acquia_connector/acquia_agent/acquia_agent_streams.inc	9 Feb 2009 06:11:21 -0000
@@ -313,10 +313,7 @@
  * With addition of xmlrpc params.
  */
 function _acquia_agent_hmac($key, $time, $nonce, $params) {
-  return base64_encode(
-    pack("H*", sha1((str_pad($key, 64, chr(0x00)) ^ (str_repeat(chr(0x5c), 64))) .
-    pack("H*", sha1((str_pad($key, 64, chr(0x00)) ^ (str_repeat(chr(0x36), 64))) .
-    $time .':'. $nonce .':'. $key .':'. serialize($params)))))
-  );
-}
-
+  $encoded_params = json_encode($params);
+  $string = $time .':'. $nonce .':'. $encoded_params;
+  return sha1((str_pad($key, 64, chr(0x00)) ^ (str_repeat(chr(0x5c), 64))) . pack("H*", sha1((str_pad($key, 64, chr(0x00)) ^ (str_repeat(chr(0x36), 64))) . $string)));
+}
\ No newline at end of file