mirror of
https://github.com/danog/phpseclib.git
synced 2024-12-12 09:09:39 +01:00
Merge branch 'master' of https://github.com/phpseclib/phpseclib
This commit is contained in:
commit
999cc470b1
8
.gitattributes
vendored
8
.gitattributes
vendored
@ -1 +1,9 @@
|
|||||||
* text=auto
|
* text=auto
|
||||||
|
/build/ export-ignore
|
||||||
|
/tests/ export-ignore
|
||||||
|
/travis/ export-ignore
|
||||||
|
/.gitattributes export-ignore
|
||||||
|
/.gitignore export-ignore
|
||||||
|
/.travis.yml export-ignore
|
||||||
|
/CHANGELOG.md export-ignore
|
||||||
|
/phpunit.xml.dist export-ignore
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 2.0.0 - 2015-08-04
|
||||||
|
|
||||||
|
- Classes were renamed and namespaced ([#243](https://github.com/phpseclib/phpseclib/issues/243))
|
||||||
|
- The use of an autoloader is now required (e.g. Composer)
|
||||||
|
|
||||||
## 1.0.0 - 2015-08-02
|
## 1.0.0 - 2015-08-02
|
||||||
|
|
||||||
- OpenSSL support for symmetric ciphers ([#507](https://github.com/phpseclib/phpseclib/pull/507))
|
- OpenSSL support for symmetric ciphers ([#507](https://github.com/phpseclib/phpseclib/pull/507))
|
||||||
|
@ -172,7 +172,9 @@ class Agent
|
|||||||
$length = current(unpack('N', fread($this->fsock, 4)));
|
$length = current(unpack('N', fread($this->fsock, 4)));
|
||||||
$key_blob = fread($this->fsock, $length);
|
$key_blob = fread($this->fsock, $length);
|
||||||
$length = current(unpack('N', fread($this->fsock, 4)));
|
$length = current(unpack('N', fread($this->fsock, 4)));
|
||||||
|
if ($length) {
|
||||||
$key_comment = fread($this->fsock, $length);
|
$key_comment = fread($this->fsock, $length);
|
||||||
|
}
|
||||||
$length = current(unpack('N', substr($key_blob, 0, 4)));
|
$length = current(unpack('N', substr($key_blob, 0, 4)));
|
||||||
$key_type = substr($key_blob, 4, $length);
|
$key_type = substr($key_blob, 4, $length);
|
||||||
switch ($key_type) {
|
switch ($key_type) {
|
||||||
|
Loading…
Reference in New Issue
Block a user