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

redundant dev line from an earlier modification causes issue #404

Browse Source
This commit is contained in:
redmatrix 2016-05-30 13:25:58 -07:00
parent f2ebe41a50
commit f35609d26c
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/crypto.php
View File

@ -49,26 +49,12 @@ function AES256CBC_encrypt($data,$key,$iv) {
return openssl_encrypt($data,'aes-256-cbc',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0")); return openssl_encrypt($data,'aes-256-cbc',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
/* deprecated in php 7.1
return mcrypt_encrypt(
MCRYPT_RIJNDAEL_128,
str_pad($key,32,"\0"),
pkcs5_pad($data,16),
MCRYPT_MODE_CBC,
str_pad($iv,16,"\0"));
*/
} }
function AES256CBC_decrypt($data,$key,$iv) { function AES256CBC_decrypt($data,$key,$iv) {
return openssl_decrypt($data,'aes-256-cbc',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0")); return openssl_decrypt($data,'aes-256-cbc',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
/* deprecated in php 7.1
return pkcs5_unpad(mcrypt_decrypt(
MCRYPT_RIJNDAEL_128,
str_pad($key,32,"\0"),
$data,
MCRYPT_MODE_CBC,
str_pad($iv,16,"\0")));
*/
} }
function crypto_encapsulate($data,$pubkey,$alg='aes256cbc') { function crypto_encapsulate($data,$pubkey,$alg='aes256cbc') {

8
include/zot.php
View File

@ -352,8 +352,6 @@ function zot_refresh($them, $channel = null, $force = false) {
} }
$token = random_string();
$rhs = '/.well-known/zot-info'; $rhs = '/.well-known/zot-info';
$result = z_post_url($url . $rhs,$postvars); $result = z_post_url($url . $rhs,$postvars);
@ -1048,8 +1046,9 @@ function zot_process_response($hub, $arr, $outq) {
/** /**
* @brief * @brief
* *
* We received a notification packet (in mod/post.php) that a message is waiting for us, and we've verified the sender. * We received a notification packet (in mod_post) that a message is waiting for us, and we've verified the sender.
* Now send back a pickup message, using our message tracking ID ($arr['secret']), which we will sign with our site private key. * Now send back a pickup message, using our message tracking ID ($arr['secret']), which we will sign with our site
* private key.
* The entire pickup message is encrypted with the remote site's public key. * The entire pickup message is encrypted with the remote site's public key.
* If everything checks out on the remote end, we will receive back a packet containing one or more messages, * If everything checks out on the remote end, we will receive back a packet containing one or more messages,
* which will be processed and delivered before this function ultimately returns. * which will be processed and delivered before this function ultimately returns.
@ -1123,6 +1122,7 @@ function zot_fetch($arr) {
* * [1] => \e string $delivery_status * * [1] => \e string $delivery_status
* * [2] => \e string $address * * [2] => \e string $address
*/ */
function zot_import($arr, $sender_url) { function zot_import($arr, $sender_url) {
$data = json_decode($arr['body'], true); $data = json_decode($arr['body'], true);