Merge branch 'identifier-update-1.0' into 2.0

Conflicts:
	phpseclib/Net/SSH2.php
This commit is contained in:
terrafrost 2015-12-05 10:30:08 -06:00
commit 041ece8b6c
2 changed files with 13 additions and 1 deletions

View File

@ -616,7 +616,7 @@ class ASN1
}
// Fail mapping if all input items have not been consumed.
return $i < $n? null: $map;
return $i < $n ? null: $map;
// the main diff between sets and sequences is the encapsulation of the foreach in another for loop
case self::TYPE_SET:

View File

@ -803,6 +803,18 @@ class BigInteger
}
}
/**
* __debugInfo() magic method
*
* Will be called, automatically, when print_r() or var_dump() are called
*
* @access public
*/
function __debugInfo()
{
return array('value' => '0x' . $this->toHex(true));
}
/**
* Adds two BigIntegers.
*