diff options
| author | zotlabs <mike@macgirvin.com> | 2018-01-13 14:08:15 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-01-13 14:08:15 -0800 |
| commit | eb3e43feec4e2de439de5398fcf498c0de5afbd4 (patch) | |
| tree | b4554bf6591503c9629c7c0da88b6422da143bda | |
| parent | 08bea83c032675e93c789070e681aab212c1d2a4 (diff) | |
| download | volse-hubzilla-eb3e43feec4e2de439de5398fcf498c0de5afbd4.tar.gz volse-hubzilla-eb3e43feec4e2de439de5398fcf498c0de5afbd4.tar.bz2 volse-hubzilla-eb3e43feec4e2de439de5398fcf498c0de5afbd4.zip | |
cleanup of last fix
| -rw-r--r-- | Zotlabs/Module/Owa.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Web/HTTPSig.php | 2 | ||||
| -rw-r--r-- | include/crypto.php | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Module/Owa.php b/Zotlabs/Module/Owa.php index 537489687..23ee14f39 100644 --- a/Zotlabs/Module/Owa.php +++ b/Zotlabs/Module/Owa.php @@ -38,7 +38,7 @@ class Owa extends \Zotlabs\Web\Controller { foreach($r as $hubloc) { $verified = \Zotlabs\Web\HTTPSig::verify('',$hubloc['xchan_pubkey']); if($verified && $verified['header_signed'] && $verified['header_valid']) { - logger('OWA header: ' . print_r($verified,true)); + logger('OWA header: ' . print_r($verified,true),LOGGER_DATA); logger('OWA success: ' . $hubloc['hubloc_addr'],LOGGER_DATA); $ret['success'] = true; $token = random_string(32); diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php index 9a6c3cd39..63033ce5e 100644 --- a/Zotlabs/Web/HTTPSig.php +++ b/Zotlabs/Web/HTTPSig.php @@ -117,7 +117,7 @@ class HTTPSig { logger('verified: ' . $x, LOGGER_DEBUG); - if(! intval($x)) + if(! $x) return $result; if(! $spoofable) diff --git a/include/crypto.php b/include/crypto.php index ab10edb03..b990b18d9 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -22,13 +22,13 @@ function rsa_verify($data,$sig,$key,$alg = 'sha256') { $alg = OPENSSL_ALGO_SHA256; $verify = @openssl_verify($data,$sig,$key,$alg); - if(! $verify) { + if($verify === (-1)) { while($msg = openssl_error_string()) logger('openssl_verify: ' . $msg,LOGGER_NORMAL,LOG_ERR); btlogger('openssl_verify: key: ' . $key, LOGGER_DEBUG, LOG_ERR); } - return (intval($verify) > 0 ? 1 : 0); + return (($verify > 0) ? true : false); } function pkcs5_pad ($text, $blocksize) |