octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-28 20:12:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0

Browse Source
This commit is contained in:
terrafrost 2015-12-05 10:27:07 -06:00
commit b5ac556213
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpseclib/Net/SSH2.php
View File

@ -3880,7 +3880,11 @@ class Net_SSH2
*/ */
function getLastError() function getLastError()
{ {
return $this->errors[count($this->errors) - 1]; $count = count($this->errors);
if ($count > 0) {
return $this->errors[$count - 1];
}
} }
/** /**

2
tests/Unit/File/ASN1Test.php
View File

@ -18,7 +18,7 @@ class Unit_File_ASN1Test extends PhpseclibTestCase
$KDC_REP = array( $KDC_REP = array(
'type' => FILE_ASN1_TYPE_SEQUENCE, 'type' => FILE_ASN1_TYPE_SEQUENCE,
'children' => array( 'children' => array(
'pvno' => array( 'pvno' => array(
'constant' => 0, 'constant' => 0,
'optional' => true, 'optional' => true,
'explicit' => true, 'explicit' => true,