From 5d2dc4e8fdb62785cf306496c7cdcefb31d4a0ed Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 23 Aug 2014 02:45:21 -0700
Subject: switch everything over to crypto_encapsulate()

---
 include/items.php | 8 ++++----
 mod/item.php      | 4 ++--
 mod/zfinger.php   | 2 +-
 version.inc       | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/items.php b/include/items.php
index 1f2b33579..bdf4007af 100755
--- a/include/items.php
+++ b/include/items.php
@@ -318,9 +318,9 @@ function post_activity_item($arr) {
 		$key = get_config('system','pubkey');
 		$arr['item_flags'] = $arr['item_flags'] | ITEM_OBSCURED;
 		if($arr['title'])
-			$arr['title'] = json_encode(aes_encapsulate($arr['title'],$key));
+			$arr['title'] = json_encode(crypto_encapsulate($arr['title'],$key));
 		if($arr['body'])
-			$arr['body']  = json_encode(aes_encapsulate($arr['body'],$key));
+			$arr['body']  = json_encode(crypto_encapsulate($arr['body'],$key));
 	}
 
 	$arr['mid']          = 	((x($arr,'mid')) ? $arr['mid'] : item_message_id());
@@ -2713,9 +2713,9 @@ function start_delivery_chain($channel,$item,$item_id,$parent) {
 			$key = get_config('system','pubkey');
 			$flag_bits = $flag_bits|ITEM_OBSCURED;
 			if($title)
-				$title = json_encode(aes_encapsulate($title,$key));
+				$title = json_encode(crypto_encapsulate($title,$key));
 			if($body)
-				$body  = json_encode(aes_encapsulate($body,$key));
+				$body  = json_encode(crypto_encapsulate($body,$key));
 		}
 	}
 	else {
diff --git a/mod/item.php b/mod/item.php
index 27691eb4f..df51c8a92 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -768,9 +768,9 @@ function item_post(&$a) {
 		$key = get_config('system','pubkey');
 		$datarray['item_flags'] = $datarray['item_flags'] | ITEM_OBSCURED;
 		if($datarray['title'])
-			$datarray['title'] = json_encode(aes_encapsulate($datarray['title'],$key));
+			$datarray['title'] = json_encode(crypto_encapsulate($datarray['title'],$key));
 		if($datarray['body'])
-			$datarray['body']  = json_encode(aes_encapsulate($datarray['body'],$key));
+			$datarray['body']  = json_encode(crypto_encapsulate($datarray['body'],$key));
 	}
 
 	if($orig_post) {
diff --git a/mod/zfinger.php b/mod/zfinger.php
index cf8a3fda1..ef55085d6 100644
--- a/mod/zfinger.php
+++ b/mod/zfinger.php
@@ -203,7 +203,7 @@ function zfinger_init(&$a) {
 			$permissions['connected'] = true;
 	}
 
-	$ret['permissions'] = (($ztarget && $zkey) ? aes_encapsulate(json_encode($permissions),$zkey) : $permissions);
+	$ret['permissions'] = (($ztarget && $zkey) ? crypto_encapsulate(json_encode($permissions),$zkey) : $permissions);
 
 	if($permissions['view_profile'])
 		$ret['profile']  = $profile;
diff --git a/version.inc b/version.inc
index 66e432ce0..416f0207c 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-08-22.775
+2014-08-23.776
-- 
cgit v1.2.3