wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up error logging

Browse Source
This commit is contained in:
James Walker 2010-02-22 23:30:05 -05:00
parent cd561657c2
commit 17b8020d25
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/OStatus/classes/Magicsig.php
View File

@ -89,7 +89,7 @@ class Magicsig extends Memcached_DataObject
return parent::insert(); return parent::insert();
} }
public function generate($key_length = 512) public function generate($key_length = 512)
{ {
PEAR::pushErrorHandling(PEAR_ERROR_RETURN); PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
@ -143,15 +143,15 @@ class Magicsig extends Memcached_DataObject
$params['public_key'] = new Crypt_RSA_KEY($mod, $exp, 'public'); $params['public_key'] = new Crypt_RSA_KEY($mod, $exp, 'public');
if ($params['public_key']->isError()) { if ($params['public_key']->isError()) {
$error = $params['public_key']->getLastError(); $error = $params['public_key']->getLastError();
print $error->getMessage(); common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage());
exit; return false;
} }
if ($private_exp) { if ($private_exp) {
$params['private_key'] = new Crypt_RSA_KEY($mod, $private_exp, 'private'); $params['private_key'] = new Crypt_RSA_KEY($mod, $private_exp, 'private');
if ($params['private_key']->isError()) { if ($params['private_key']->isError()) {
$error = $params['private_key']->getLastError(); $error = $params['private_key']->getLastError();
print $error->getMessage(); common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage());
exit; return false;
} }
} }
@ -182,6 +182,7 @@ class Magicsig extends Memcached_DataObject
if ($this->_rsa->isError()) { if ($this->_rsa->isError()) {
$error = $this->_rsa->getLastError(); $error = $this->_rsa->getLastError();
common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage()); common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage());
return false;
} }
return $sig; return $sig;
@ -192,8 +193,8 @@ class Magicsig extends Memcached_DataObject
$result = $this->_rsa->validateSign($signed_bytes, $signature, null, 'sha256'); $result = $this->_rsa->validateSign($signed_bytes, $signature, null, 'sha256');
if ($this->_rsa->isError()) { if ($this->_rsa->isError()) {
$error = $this->keypair->getLastError(); $error = $this->keypair->getLastError();
//common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage()); common_log(LOG_DEBUG, 'RSA Error: '. $error->getMessage());
print $error->getMessage(); return false;
} }
return $result; return $result;
} }