diff options
| author | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2018-11-24 13:01:01 +0100 |
|---|---|---|
| committer | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2018-11-24 13:01:01 +0100 |
| commit | f865d6e5dab19122fffc677da495b21d3d5e93e7 (patch) | |
| tree | 8631750db2c385438207326479350ea909a625b4 /Zotlabs/Web/HTTPSig.php | |
| parent | 0bba9482dfbcc0fd8bea880ac3820548281ecfc2 (diff) | |
| parent | bc9f2922e0e255e97cb607d099f60c8a81c4736f (diff) | |
| download | volse-hubzilla-f865d6e5dab19122fffc677da495b21d3d5e93e7.tar.gz volse-hubzilla-f865d6e5dab19122fffc677da495b21d3d5e93e7.tar.bz2 volse-hubzilla-f865d6e5dab19122fffc677da495b21d3d5e93e7.zip | |
Resolved merge conflicts
Diffstat (limited to 'Zotlabs/Web/HTTPSig.php')
| -rw-r--r-- | Zotlabs/Web/HTTPSig.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php index f27aa0556..fe0b9428f 100644 --- a/Zotlabs/Web/HTTPSig.php +++ b/Zotlabs/Web/HTTPSig.php @@ -342,6 +342,10 @@ class HTTPSig { */ static function parse_sigheader($header) { + if(is_array($header)) { + btlogger('is_array: ' . print_r($header,true)); + } + $ret = []; $matches = []; @@ -397,7 +401,7 @@ class HTTPSig { $data = $matches[1]; if($iv && $key && $alg && $data) { - return crypto_unencapsulate([ 'iv' => $iv, 'key' => $key, 'alg' => $alg, 'data' => $data ] , $prvkey); + return crypto_unencapsulate([ 'encrypted' => true, 'iv' => $iv, 'key' => $key, 'alg' => $alg, 'data' => $data ] , $prvkey); } return ''; |