From fb2a0e40d3d51a5af0cd8ab9f0e8d20c31c7d4cb Mon Sep 17 00:00:00 2001 From: Cameron Ball Date: Thu, 10 Mar 2016 14:39:46 +0800 Subject: [PATCH] Disable mnet xmlrpc encryption --- mnet/remote_client.php | 4 ++-- mnet/xmlrpc/serverlib.php | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mnet/remote_client.php b/mnet/remote_client.php index c3aa4e9..93dd883 100644 --- a/mnet/remote_client.php +++ b/mnet/remote_client.php @@ -16,8 +16,8 @@ class mnet_remote_client extends mnet_peer { var $object_to_call = false; var $static_location = false; var $request_was_encrypted = false; - var $request_was_signed = false; - var $signatureok = false; // True if we have successfully verified that the request was signed by an established peer + var $request_was_signed = true; + var $signatureok = true; // True if we have successfully verified that the request was signed by an established peer var $pushkey = false; // True if we need to tell the remote peer about our current public key var $useprivatekey = ''; // The private key we should use to sign pushkey response diff --git a/mnet/xmlrpc/serverlib.php b/mnet/xmlrpc/serverlib.php index 7575272..25a628a 100644 --- a/mnet/xmlrpc/serverlib.php +++ b/mnet/xmlrpc/serverlib.php @@ -221,13 +221,13 @@ function mnet_server_fault_xml($code, $text, $privatekey = null) { */ function mnet_server_prepare_response($response, $privatekey = null) { $remoteclient = get_mnet_remote_client(); - if ($remoteclient->request_was_signed) { - $response = mnet_sign_message($response, $privatekey); - } - - if ($remoteclient->request_was_encrypted) { - $response = mnet_encrypt_message($response, $remoteclient->public_key); - } +// if ($remoteclient->request_was_signed) { +// $response = mnet_sign_message($response, $privatekey); +// } +// +// if ($remoteclient->request_was_encrypted) { +// $response = mnet_encrypt_message($response, $remoteclient->public_key); +// } return $response; } -- 1.9.1