diff options
author | dipsol <dipsol@ampache> | 2008-12-11 16:53:14 +0000 |
---|---|---|
committer | dipsol <dipsol@ampache> | 2008-12-11 16:53:14 +0000 |
commit | f3bb93b2bf3b532afb7adfe8c73308d26c5e165c (patch) | |
tree | 512b2e99a5aee6efc737c13fa9265037775b4458 /lib/class/xmlrpcclient.class.php | |
parent | 93f3c4e9291dd3dac95721c922c02b3cf29c340a (diff) | |
download | ampache-f3bb93b2bf3b532afb7adfe8c73308d26c5e165c.tar.gz ampache-f3bb93b2bf3b532afb7adfe8c73308d26c5e165c.tar.bz2 ampache-f3bb93b2bf3b532afb7adfe8c73308d26c5e165c.zip |
XML-RPC uses now a sha256 digest
Diffstat (limited to 'lib/class/xmlrpcclient.class.php')
-rw-r--r-- | lib/class/xmlrpcclient.class.php | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/lib/class/xmlrpcclient.class.php b/lib/class/xmlrpcclient.class.php index 9ae66c4c..568fb265 100644 --- a/lib/class/xmlrpcclient.class.php +++ b/lib/class/xmlrpcclient.class.php @@ -45,31 +45,31 @@ class xmlRpcClient { // Generate the client $client = self::create_client($target_url); - // 6 that's right, the secret level because if you do have debug on most likely you're - // going to just crash your browser... sorry folks - if (Config::get('debug') AND Config::get('debug_level') == '6') { $client->setDebug(1); } + // 6 that's right, the secret level because if you do have debug on most likely you're + // going to just crash your browser... sorry folks + if (Config::get('debug') AND Config::get('debug_level') == '6') { $client->setDebug(1); } // Build our key - $timestamp = time(); - $handshake_key = md5($timestamp . $key); + $timestamp = time(); + $handshake_key = hash('sha256',$timestamp . hash('sha256',$key)); - $encoded_key = new XML_RPC_Value($handshake_key,'string'); - $timestamp = new XML_RPC_Value($timestamp,'int'); - $xmlrpc_message = new XML_RPC_Message('xmlrpcserver.handshake',array($encoded_key,$timestamp)); + $encoded_key = new XML_RPC_Value($handshake_key,'string'); + $timestamp = new XML_RPC_Value($timestamp,'int'); + $xmlrpc_message = new XML_RPC_Message('xmlrpcserver.handshake',array($encoded_key,$timestamp)); - // Send it off - $response = $client->send($xmlrpc_message,10); + // Send it off + $response = $client->send($xmlrpc_message,10); - if ($response->faultCode()) { - $error_msg = _('Error connecting to') . " " . $server . " " . _("Code") . ": " . $response->faultCode() . " " . _("Reason") . ": " . $response->faultString(); - debug_event('XMLCLIENT',$error_msg,'1'); - Error::add('general',$error_msg); - return; - } + if ($response->faultCode()) { + $error_msg = _('Error connecting to') . " " . $client->server . " " . _("Code") . ": " . $response->faultCode() . " " . _("Reason") . ": " . $response->faultString(); + debug_event('XMLCLIENT',$error_msg,'1'); + Error::add('general',$error_msg); + return; + } - $token = XML_RPC_Decode($response->value()); + $token = XML_RPC_Decode($response->value()); - debug_event('XML-RPC',$token . ' returned from ' . $server,'3'); + debug_event('XML-RPC',$token . ' returned from ' . $client->server,'3'); return $token; @@ -84,24 +84,24 @@ class xmlRpcClient { $client = self::create_client($target_url); - // 6 that's right, the secret level because if you do have debug on most likely you're - // going to just crash your browser... sorry folks - if (Config::get('debug') AND Config::get('debug_level') == '6') { $client->setDebug(1); } + // 6 that's right, the secret level because if you do have debug on most likely you're + // going to just crash your browser... sorry folks + if (Config::get('debug') AND Config::get('debug_level') == '6') { $client->setDebug(1); } $encoded_key = new XML_RPC_Value($token,'string'); $xmlrpc_message = new XML_RPC_Message('xmlrpcserver.create_stream_session',array($encoded_key)); - + $response = $client->send($xmlrpc_message,4); - if ($response->faultCode() ) { - $error_msg = _("Error connecting to") . " " . $server . " " . _("Code") . ": " . $response->faultCode() . " " . - debug_event('XMLCLIENT',$error_msg,'1'); - return false; - } + if ($response->faultCode() ) { + $error_msg = _("Error connecting to") . " " . $client->server . " " . _("Code") . ": " . $response->faultCode() . " " . + debug_event('XMLCLIENT',$error_msg,'1'); + return false; + } $sid = XML_RPC_Decode($response->value()); - debug_event('XML-RPC', $sid . ' stream session ID returned from ' . $server,'3'); + debug_event('XML-RPC', $sid . ' stream session ID returned from ' . $client->server,'3'); return $sid; |