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

mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution cipher would be adequate for our requirements.

Browse Source
This commit is contained in:
redmatrix
2015-05-19 02:16:12 -07:00
parent c11b1f8b0d
commit 77e2ef45f0
5 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/diaspora.php
View File

@@ -1703,11 +1703,10 @@ function diaspora_conversation($importer,$xml,$msg) {
continue;
}
$key = get_config('system','pubkey');
if($subject)
$subject = json_encode(crypto_encapsulate($subject,$key));
$subject = base64url_encode($subject);
if($body)
$body = json_encode(crypto_encapsulate($body,$key));
$body = base64url_encode($body);
q("insert into mail ( `channel_id`, `convid`, `from_xchan`,`to_xchan`,`title`,`body`,`mail_flags`,`mid`,`parent_mid`,`created`) values ( %d, %d, '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s')",
intval($importer['channel_id']),
@@ -1837,9 +1836,9 @@ function diaspora_message($importer,$xml,$msg) {
$key = get_config('system','pubkey');
if($subject)
$subject = json_encode(crypto_encapsulate($subject,$key));
$subject = base64url_encode($subject);
if($body)
$body = json_encode(crypto_encapsulate($body,$key));
$body = base64url_encode($body);
q("insert into mail ( `channel_id`, `convid`, `from_xchan`,`to_xchan`,`title`,`body`,`mail_flags`,`mid`,`parent_mid`,`created`) values ( %d, %d, '%s', '%s', '%s', '%s', '%d','%s','%s','%s')",
intval($importer['channel_id']),
@@ -2861,11 +2860,10 @@ function diaspora_send_mail($item,$owner,$contact) {
);
if(array_key_exists('mail_flags',$item) && ($item['mail_flags'] & MAIL_OBSCURED)) {
$key = get_config('system','prvkey');
// if($item['title'])
// $item['title'] = crypto_unencapsulate(json_decode_plus($item['title']),$key);
if($item['title'])
$item['title'] = base64url_decode($item['title']);
if($item['body'])
$item['body'] = crypto_unencapsulate(json_decode_plus($item['body']),$key);
$item['body'] = base64url_decode($item['body']);
}