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

Don't risk incompatibilities

Browse source
This commit is contained in:
Michael 2018-09-12 06:13:04 +00:00
parent 96d10c25e3
commit 7daa46503d
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/dfrn_notify.php
View file

@ -326,7 +326,7 @@ function dfrn_notify_content(App $a) {
$pub_key = trim($importer['cpubkey']); $pub_key = trim($importer['cpubkey']);
$dplx = intval($importer['duplex']); $dplx = intval($importer['duplex']);
if (!empty($prv_key) && empty($pub_key)) { if (($dplx && strlen($prv_key)) || (strlen($prv_key) && !strlen($pub_key))) {
openssl_private_encrypt($hash, $challenge, $prv_key); openssl_private_encrypt($hash, $challenge, $prv_key);
openssl_private_encrypt($id_str, $encrypted_id, $prv_key); openssl_private_encrypt($id_str, $encrypted_id, $prv_key);
} elseif (strlen($pub_key)) { } elseif (strlen($pub_key)) {

5
src/Protocol/DFRN.php
View file

@ -1280,7 +1280,10 @@ class DFRN
} }
} }
if (empty($contact['prvkey']) && !empty($contact['pubkey'])) { if (($contact['duplex'] && strlen($contact['pubkey']))
|| ($owner['page-flags'] == Contact::PAGE_COMMUNITY && strlen($contact['pubkey']))
|| ($contact['rel'] == Contact::SHARING && strlen($contact['pubkey']))
) {
openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']); openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']);
openssl_public_decrypt($challenge, $postvars['challenge'], $contact['pubkey']); openssl_public_decrypt($challenge, $postvars['challenge'], $contact['pubkey']);
} else { } else {