From 48ffa880f099b19052f18e399bf6af50780a24b0 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 7 Aug 2011 16:15:54 -0700
Subject: cleanup

---
 mod/salmon.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'mod/salmon.php')

diff --git a/mod/salmon.php b/mod/salmon.php
index 300ad8746..514653be3 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -134,7 +134,14 @@ function salmon_post(&$a) {
 
 	// Setup RSA stuff to verify the signature
 
-	set_include_path(get_include_path() . PATH_SEPARATOR . 'library/phpsec');
+    require_once('library/phpsec/Crypt/RSA.php');
+
+    $rsa = new CRYPT_RSA();
+    $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
+    $rsa->setHash('sha256');
+    $rsa->loadKey($prvkey);
+
+    $sig   = $rsa->sign($data);
 
 	require_once('library/phpsec/Crypt/RSA.php');
 
@@ -194,7 +201,7 @@ function salmon_post(&$a) {
 	// is this a follower? Or have we ignored the person?
 	// If so we can not accept this post.
 
-	if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == REL_VIP) || ($r[0]['blocked']))) {
+	if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
 		logger('mod-salmon: Ignoring this author.');
 		salmon_return(202);
 		// NOTREACHED
-- 
cgit v1.2.3