swapping pear error handling so Crypt_RSA can properly detect available
math libraries
This commit is contained in:
parent
3b823f8fbd
commit
caad5859b5
@ -58,7 +58,9 @@ class MagicsigRsaSha256
|
|||||||
$params['public_key'] = $keypair->getPublicKey();
|
$params['public_key'] = $keypair->getPublicKey();
|
||||||
$params['private_key'] = $keypair->getPrivateKey();
|
$params['private_key'] = $keypair->getPrivateKey();
|
||||||
|
|
||||||
|
PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
|
||||||
$this->keypair = new Crypt_RSA($params);
|
$this->keypair = new Crypt_RSA($params);
|
||||||
|
PEAR::popErrorHandling();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -79,6 +81,8 @@ class MagicsigRsaSha256
|
|||||||
|
|
||||||
public function fromString($text)
|
public function fromString($text)
|
||||||
{
|
{
|
||||||
|
PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
|
||||||
|
|
||||||
// remove whitespace
|
// remove whitespace
|
||||||
$text = preg_replace('/\s+/', '', $text);
|
$text = preg_replace('/\s+/', '', $text);
|
||||||
|
|
||||||
@ -87,7 +91,6 @@ class MagicsigRsaSha256
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$mod = base64_url_decode($matches[1]);
|
$mod = base64_url_decode($matches[1]);
|
||||||
$exp = base64_url_decode($matches[2]);
|
$exp = base64_url_decode($matches[2]);
|
||||||
if ($matches[4]) {
|
if ($matches[4]) {
|
||||||
@ -110,6 +113,7 @@ class MagicsigRsaSha256
|
|||||||
}
|
}
|
||||||
|
|
||||||
$this->keypair = new Crypt_RSA($params);
|
$this->keypair = new Crypt_RSA($params);
|
||||||
|
PEAR::popErrorHandling();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getName()
|
public function getName()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user