harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch everything over to crypto_encapsulate()

Browse Source
This commit is contained in:
friendica 2014-08-23 02:45:21 -07:00
parent 9196c9eef0
commit 5d2dc4e8fd
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/items.php
View File

@ -318,9 +318,9 @@ function post_activity_item($arr) {
$key = get_config('system','pubkey'); $key = get_config('system','pubkey');
$arr['item_flags'] = $arr['item_flags'] | ITEM_OBSCURED; $arr['item_flags'] = $arr['item_flags'] | ITEM_OBSCURED;
if($arr['title']) if($arr['title'])
$arr['title'] = json_encode(aes_encapsulate($arr['title'],$key)); $arr['title'] = json_encode(crypto_encapsulate($arr['title'],$key));
if($arr['body']) if($arr['body'])
$arr['body'] = json_encode(aes_encapsulate($arr['body'],$key)); $arr['body'] = json_encode(crypto_encapsulate($arr['body'],$key));
} }
$arr['mid'] = ((x($arr,'mid')) ? $arr['mid'] : item_message_id()); $arr['mid'] = ((x($arr,'mid')) ? $arr['mid'] : item_message_id());
@ -2713,9 +2713,9 @@ function start_delivery_chain($channel,$item,$item_id,$parent) {
$key = get_config('system','pubkey'); $key = get_config('system','pubkey');
$flag_bits = $flag_bits|ITEM_OBSCURED; $flag_bits = $flag_bits|ITEM_OBSCURED;
if($title) if($title)
$title = json_encode(aes_encapsulate($title,$key)); $title = json_encode(crypto_encapsulate($title,$key));
if($body) if($body)
$body = json_encode(aes_encapsulate($body,$key)); $body = json_encode(crypto_encapsulate($body,$key));
} }
} }
else { else {

4
mod/item.php
View File

@ -768,9 +768,9 @@ function item_post(&$a) {
$key = get_config('system','pubkey'); $key = get_config('system','pubkey');
$datarray['item_flags'] = $datarray['item_flags'] | ITEM_OBSCURED; $datarray['item_flags'] = $datarray['item_flags'] | ITEM_OBSCURED;
if($datarray['title']) if($datarray['title'])
$datarray['title'] = json_encode(aes_encapsulate($datarray['title'],$key)); $datarray['title'] = json_encode(crypto_encapsulate($datarray['title'],$key));
if($datarray['body']) if($datarray['body'])
$datarray['body'] = json_encode(aes_encapsulate($datarray['body'],$key)); $datarray['body'] = json_encode(crypto_encapsulate($datarray['body'],$key));
} }
if($orig_post) { if($orig_post) {

2
mod/zfinger.php
View File

@ -203,7 +203,7 @@ function zfinger_init(&$a) {
$permissions['connected'] = true; $permissions['connected'] = true;
} }
$ret['permissions'] = (($ztarget && $zkey) ? aes_encapsulate(json_encode($permissions),$zkey) : $permissions); $ret['permissions'] = (($ztarget && $zkey) ? crypto_encapsulate(json_encode($permissions),$zkey) : $permissions);
if($permissions['view_profile']) if($permissions['view_profile'])
$ret['profile'] = $profile; $ret['profile'] = $profile;

2
version.inc
View File

@ -1 +1 @@
2014-08-22.775 2014-08-23.776