octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-27 03:42:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0'

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpseclib/Crypt/RSA.php
View File

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

1
tests/Unit/Crypt/RSA/LoadKeyTest.php
View File

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