Disable RINO
Comment out functions for RINO crypt and disable RINO request and response.
This commit is contained in:
parent
4203132e1a
commit
7d83a19fd4
3 changed files with 16 additions and 6 deletions
|
@ -185,7 +185,7 @@ function salmon_key($pubkey) {
|
|||
}
|
||||
|
||||
|
||||
|
||||
/** disable rino
|
||||
if(! function_exists('aes_decrypt')) {
|
||||
function aes_decrypt($val,$ky)
|
||||
{
|
||||
|
@ -210,7 +210,7 @@ function aes_encrypt($val,$ky)
|
|||
$val=str_pad($val, (16*(floor(strlen($val) / 16)+(strlen($val) % 16==0?2:1))), chr(16-(strlen($val) % 16)));
|
||||
return mcrypt_encrypt($enc, $key, $val, $mode, mcrypt_create_iv( mcrypt_get_iv_size($enc, $mode), MCRYPT_DEV_URANDOM));
|
||||
}}
|
||||
|
||||
**/
|
||||
|
||||
function pkcs5_pad ($text, $blocksize)
|
||||
{
|
||||
|
|
|
@ -1982,12 +1982,16 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
|||
if($contact['duplex'] && $contact['issued-id'])
|
||||
$idtosend = '1:' . $orig_id;
|
||||
|
||||
/**
|
||||
* disable rino.
|
||||
$rino = ((function_exists('mcrypt_encrypt')) ? 1 : 0);
|
||||
|
||||
$rino_enable = get_config('system','rino_encrypt');
|
||||
|
||||
if(! $rino_enable)
|
||||
$rino = 0;
|
||||
**/
|
||||
$rino = 0; $rino_enable = 0;
|
||||
|
||||
$ssl_val = intval(get_config('system','ssl_policy'));
|
||||
$ssl_policy = '';
|
||||
|
@ -2097,6 +2101,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
|||
if($page)
|
||||
$postvars['page'] = $page;
|
||||
|
||||
/** disable rino
|
||||
if($rino && $rino_allowed && (! $dissolve)) {
|
||||
$key = substr(random_string(),0,16);
|
||||
$data = bin2hex(aes_encrypt($postvars['data'],$key));
|
||||
|
@ -2128,6 +2133,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
|||
|
||||
$postvars['key'] = bin2hex($postvars['key']);
|
||||
}
|
||||
**/
|
||||
|
||||
logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars,true), LOGGER_DATA);
|
||||
|
||||
|
|
|
@ -130,7 +130,7 @@ function dfrn_notify_post(&$a) {
|
|||
if($importer['page-flags'] == PAGE_SOAPBOX)
|
||||
xml_status(0);
|
||||
|
||||
|
||||
/** disable rino
|
||||
if(strlen($key)) {
|
||||
$rawkey = hex2bin(trim($key));
|
||||
logger('rino: md5 raw key: ' . md5($rawkey));
|
||||
|
@ -157,7 +157,7 @@ function dfrn_notify_post(&$a) {
|
|||
$data = aes_decrypt(hex2bin($data),$final_key);
|
||||
logger('rino: decrypted data: ' . $data, LOGGER_DATA);
|
||||
}
|
||||
|
||||
**/
|
||||
|
||||
$ret = local_delivery($importer,$data);
|
||||
xml_status($ret);
|
||||
|
@ -253,12 +253,16 @@ function dfrn_notify_content(&$a) {
|
|||
$challenge = bin2hex($challenge);
|
||||
$encrypted_id = bin2hex($encrypted_id);
|
||||
|
||||
/**
|
||||
* disable rino.
|
||||
$rino = ((function_exists('mcrypt_encrypt')) ? 1 : 0);
|
||||
|
||||
$rino_enable = get_config('system','rino_encrypt');
|
||||
|
||||
if(! $rino_enable)
|
||||
$rino = 0;
|
||||
**/
|
||||
$rino = 0; $rino_enable = 0;
|
||||
|
||||
if((($r[0]['rel']) && ($r[0]['rel'] != CONTACT_IS_SHARING)) || ($r[0]['page-flags'] == PAGE_COMMUNITY)) {
|
||||
$perm = 'rw';
|
||||
|
|
Loading…
Reference in a new issue