From cf663df69f7f266ebc58e500ec7c663400c8b716 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 12 Jul 2015 11:22:36 +0200 Subject: [PATCH] Testing code removed --- include/items.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/items.php b/include/items.php index 8fd1cbcb48..45d25e379f 100644 --- a/include/items.php +++ b/include/items.php @@ -2064,11 +2064,11 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { || ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) { openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']); openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']); - } elseif($contact['prvkey']) { + } + else { openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']); openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']); - } else - logger("No private or public key for contact ".$contact['id']." ".$contact['url']); + } $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.')); -- 2.39.5