mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-12-25 03:16:02 +00:00
Merge branch '1.0' into 2.0
Conflicts: README.md
This commit is contained in:
commit
4c4c8554a6
@ -1,6 +1,6 @@
|
|||||||
# phpseclib - PHP Secure Communications Library
|
# phpseclib - PHP Secure Communications Library
|
||||||
|
|
||||||
[![Build Status](https://secure.travis-ci.org/phpseclib/phpseclib.png?branch=php5)](http://travis-ci.org/phpseclib/phpseclib)
|
[![Build Status](https://secure.travis-ci.org/phpseclib/phpseclib.png?branch=2.0)](http://travis-ci.org/phpseclib/phpseclib)
|
||||||
|
|
||||||
MIT-licensed pure-PHP implementations of an arbitrary-precision integer
|
MIT-licensed pure-PHP implementations of an arbitrary-precision integer
|
||||||
arithmetic library, fully PKCS#1 (v2.1) compliant RSA, DES, 3DES, RC4, Rijndael,
|
arithmetic library, fully PKCS#1 (v2.1) compliant RSA, DES, 3DES, RC4, Rijndael,
|
||||||
@ -16,7 +16,7 @@ PEAR Channel: [phpseclib.sourceforge.net](http://phpseclib.sourceforge.net/pear.
|
|||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
* [Documentation / Manual](http://phpseclib.sourceforge.net/)
|
* [Documentation / Manual](http://phpseclib.sourceforge.net/)
|
||||||
* [API Documentation](http://phpseclib.bantux.org/api/php5/) (generated by Sami)
|
* [API Documentation](http://phpseclib.bantux.org/api/2.0/) (generated by Sami)
|
||||||
|
|
||||||
## Support
|
## Support
|
||||||
|
|
||||||
|
@ -2500,7 +2500,7 @@ class RSA
|
|||||||
// be output.
|
// be output.
|
||||||
|
|
||||||
$emLen = ($emBits + 1) >> 3; // ie. ceil($emBits / 8)
|
$emLen = ($emBits + 1) >> 3; // ie. ceil($emBits / 8)
|
||||||
$sLen = $this->sLen == false ? $this->hLen : $this->sLen;
|
$sLen = $this->sLen === false ? $this->hLen : $this->sLen;
|
||||||
|
|
||||||
$mHash = $this->hash->hash($m);
|
$mHash = $this->hash->hash($m);
|
||||||
if ($emLen < $this->hLen + $sLen + 2) {
|
if ($emLen < $this->hLen + $sLen + 2) {
|
||||||
@ -2538,7 +2538,7 @@ class RSA
|
|||||||
// be output.
|
// be output.
|
||||||
|
|
||||||
$emLen = ($emBits + 1) >> 3; // ie. ceil($emBits / 8);
|
$emLen = ($emBits + 1) >> 3; // ie. ceil($emBits / 8);
|
||||||
$sLen = $this->sLen == false ? $this->hLen : $this->sLen;
|
$sLen = $this->sLen === false ? $this->hLen : $this->sLen;
|
||||||
|
|
||||||
$mHash = $this->hash->hash($m);
|
$mHash = $this->hash->hash($m);
|
||||||
if ($emLen < $this->hLen + $sLen + 2) {
|
if ($emLen < $this->hLen + $sLen + 2) {
|
||||||
|
@ -493,7 +493,7 @@ class Stream
|
|||||||
|
|
||||||
$path_from = $this->_parse_path($path_from);
|
$path_from = $this->_parse_path($path_from);
|
||||||
$path_to = parse_url($path_to);
|
$path_to = parse_url($path_to);
|
||||||
if ($path_from == false) {
|
if ($path_from === false) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user