deon/openpgp-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

https://github.com/phpseclib/phpseclib/issues/1113

Browse Source 
Add compatibility with phpseclib 2.0.3 - 2.0.4
This commit is contained in:
Jason Gallavin 2017-04-10 20:27:48 -04:00
parent 7538c62edd
commit cea5b176fc
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -12,5 +12,7 @@ env:
- PHPSECLIB="2.0.0" - PHPSECLIB="2.0.0"
- PHPSECLIB="2.0.1" - PHPSECLIB="2.0.1"
- PHPSECLIB="2.0.2" - PHPSECLIB="2.0.2"
- PHPSECLIB="2.0.3"
- PHPSECLIB="2.0.4"
before_script: 'sed -i "s/\"phpseclib\/phpseclib\": \"[^\"]*/\"phpseclib\/phpseclib\": \"$PHPSECLIB/" composer.json && composer install --prefer-source --dev' before_script: 'sed -i "s/\"phpseclib\/phpseclib\": \"[^\"]*/\"phpseclib\/phpseclib\": \"$PHPSECLIB/" composer.json && composer install --prefer-source --dev'

2
composer.json
View File

@ -13,7 +13,7 @@
} }
], ],
"require": { "require": {
"phpseclib/phpseclib": ">=2.0.0 <2.0.3" "phpseclib/phpseclib": ">=2.0.0 <=2.0.4"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4.0" "phpunit/phpunit": "~4.0"

14
lib/openpgp_crypt_rsa.php
View File

@ -245,8 +245,18 @@ class OpenPGP_Crypt_RSA {
$rsa = self::crypt_rsa_key($mod, $exp); $rsa = self::crypt_rsa_key($mod, $exp);
if($private) { if($private) {
if($packet->key['p'] && $packet->key['q']) $rsa->primes = array($packet->key['p'], $packet->key['q']); /**
if($packet->key['u']) $rsa->coefficients = array($packet->key['u']); * @see https://github.com/phpseclib/phpseclib/issues/1113
* Primes and coefficients now use BigIntegers.
**/
//set the primes
if($packet->key['p'] && $packet->key['q'])
$rsa->primes = array(
1 => new Math_BigInteger($packet->key['p'], 256),
2 => new Math_BigInteger($packet->key['q'], 256)
);
// set the coefficients
if($packet->key['u']) $rsa->coefficients = array(2 => new Math_BigInteger($packet->key['u'], 256));
} }
return $rsa; return $rsa;