jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Now it's openssl - and no copy&paste failure anymore

Browse source
This commit is contained in:
Michael 2017-03-31 06:22:43 +00:00
parent 973fcd3624
commit 1560534621
1 changed files with 2 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
include/diaspora.php
View file

@ -172,23 +172,6 @@ class Diaspora {
*/ */
private static function aes_encrypt($key, $iv, $data) { private static function aes_encrypt($key, $iv, $data) {
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"));
$aes = new Crypt_AES();
$block_length = 128;
$aes->setKey($key);
$aes->setIV($iv);
$aes->disablePadding();
$aes->setBlockLength($block_length);
$extra = strlen($data) % $block_length;
if ($extra) {
$data .= str_repeat("\0", $block_length - $extra);
}
return $aes->encrypt($data);
} }
/** /**
@ -202,17 +185,6 @@ class Diaspora {
*/ */
private static function aes_decrypt($key, $iv, $encrypted) { private static function aes_decrypt($key, $iv, $encrypted) {
return openssl_decrypt($encrypted,'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA,str_pad($iv, 16, "\0")); return openssl_decrypt($encrypted,'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA,str_pad($iv, 16, "\0"));
$aes = new Crypt_AES();
$block_length = 128;
$aes->setKey($key);
$aes->setIV($iv);
$aes->disablePadding();
$aes->setBlockLength($block_length);
return $aes->decrypt($encrypted);
} }
/** /**
@ -256,9 +228,6 @@ class Diaspora {
$decrypted = self::aes_decrypt($outer_key, $outer_iv, $ciphertext); $decrypted = self::aes_decrypt($outer_key, $outer_iv, $ciphertext);
$decrypted = pkcs5_unpad($decrypted);
logger('decrypted: '.$decrypted, LOGGER_DEBUG); logger('decrypted: '.$decrypted, LOGGER_DEBUG);
$idom = parse_xml_string($decrypted,false); $idom = parse_xml_string($decrypted,false);
@ -317,7 +286,6 @@ class Diaspora {
$inner_encrypted = base64_decode($data); $inner_encrypted = base64_decode($data);
$inner_decrypted = self::aes_decrypt($inner_aes_key, $inner_iv, $inner_encrypted); $inner_decrypted = self::aes_decrypt($inner_aes_key, $inner_iv, $inner_encrypted);
$inner_decrypted = pkcs5_unpad($inner_decrypted);
} }
if (!$author_link) { if (!$author_link) {
@ -2685,8 +2653,7 @@ class Diaspora {
$handle = self::my_handle($user); $handle = self::my_handle($user);
$padded_data = pkcs5_pad($msg,16); $inner_encrypted = self::aes_encrypt($inner_aes_key, $inner_iv, $msg);
$inner_encrypted = self::aes_decrypt($inner_aes_key, $inner_iv, $padded_data);
$b64_data = base64_encode($inner_encrypted); $b64_data = base64_encode($inner_encrypted);
@ -2708,9 +2675,8 @@ class Diaspora {
"author_id" => $handle)); "author_id" => $handle));
$decrypted_header = xml::from_array($xmldata, $xml, true); $decrypted_header = xml::from_array($xmldata, $xml, true);
$decrypted_header = pkcs5_pad($decrypted_header,16);
$ciphertext = self::aes_decrypt($outer_aes_key, $outer_iv, $decrypted_header); $ciphertext = self::aes_encrypt($outer_aes_key, $outer_iv, $decrypted_header);
$outer_json = json_encode(array("iv" => $b_outer_iv, "key" => $b_outer_aes_key)); $outer_json = json_encode(array("iv" => $b_outer_iv, "key" => $b_outer_aes_key));