aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Web
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-09-14 15:02:18 -0700
committerzotlabs <mike@macgirvin.com>2017-09-14 15:02:18 -0700
commitb1876ac14fc4f9b7e39989ef7e69c8135a25c13f (patch)
tree9fd6068adf3735f5f391b4c5cf6df1b091ac8e51 /Zotlabs/Web
parente8e61c83d572b41664a1066d60f2f78ef596183e (diff)
parent46b6415f5fddcea5aa7c4c55842405b68a7ccd6a (diff)
downloadvolse-hubzilla-b1876ac14fc4f9b7e39989ef7e69c8135a25c13f.tar.gz
volse-hubzilla-b1876ac14fc4f9b7e39989ef7e69c8135a25c13f.tar.bz2
volse-hubzilla-b1876ac14fc4f9b7e39989ef7e69c8135a25c13f.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Web')
-rw-r--r--Zotlabs/Web/HTTPSig.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php
index fee8aaa41..6526fa7c8 100644
--- a/Zotlabs/Web/HTTPSig.php
+++ b/Zotlabs/Web/HTTPSig.php
@@ -95,13 +95,18 @@ class HTTPSig {
$algorithm = 'sha512';
}
+ if($key && function_exists($key)) {
+ $result['signer'] = $sig_block['keyId'];
+ $key = $key($sig_block['keyId']);
+ }
+
if(! $key) {
$result['signer'] = $sig_block['keyId'];
$key = self::get_activitypub_key($sig_block['keyId']);
}
if(! $key)
- return null;
+ return $result;
$x = rsa_verify($signed_data,$sig_block['signature'],$key,$algorithm);