Merge branch '2.0'

This commit is contained in:
terrafrost 2016-04-03 21:37:52 -05:00
commit 9cf93a02b3
2 changed files with 2 additions and 1 deletions

View File

@ -958,7 +958,7 @@ class RSA
function setPrivateKey($key = false, $type = false)
{
if ($key === false && !empty($this->publicExponent)) {
$rsa->publicExponent = false;
$this->publicExponent = false;
return true;
}

View File

@ -350,6 +350,7 @@ Z2sKniRCcDT1ZP4=
$this->assertTrue($result);
}
<<<<<<< HEAD
public function testPKCS1EncryptionChange()
{
$rsa = new RSA();