diff --git a/phpseclib/File/X509.php b/phpseclib/File/X509.php index a95784b5..8ed58c4e 100644 --- a/phpseclib/File/X509.php +++ b/phpseclib/File/X509.php @@ -36,6 +36,7 @@ use phpseclib\File\ASN1\Element; use phpseclib\Math\BigInteger; use phpseclib\File\ASN1\Maps; + /** * Pure-PHP X.509 Parser * @@ -1564,7 +1565,7 @@ class X509 * @param mixed $format optional * @param array $dn optional * @access public - * @return bool + * @return array|bool */ public function getDN($format = self::DN_ARRAY, $dn = null) { @@ -2796,7 +2797,7 @@ class X509 */ if (strtolower($date) == 'lifetime') { $temp = '99991231235959Z'; - $temp = chr(ASN1::TYPE_GENERALIZED_TIME) . Functions::encodeLength(strlen($temp)) . $temp; + $temp = chr(ASN1::TYPE_GENERALIZED_TIME) . ASN1::encodeLength(strlen($temp)) . $temp; $this->endDate = new Element($temp); } else { $this->endDate = @date('D, d M Y H:i:s O', @strtotime($date)); @@ -3117,12 +3118,13 @@ class X509 * * @param string $id * @param array $cert optional + * @param string $path * @access public * @return mixed */ - public function getExtension($id, $cert = null) + public function getExtension($id, $cert = null, $path) { - return $this->getExtensionHelper($id, $cert); + return $this->getExtensionHelper($id, $cert, $path); } /** @@ -3430,7 +3432,7 @@ class X509 * Format a public key as appropriate * * @access private - * @return array + * @return array|bool */ private function formatSubjectPublicKey() { @@ -3602,7 +3604,7 @@ class X509 * * @param array $crl optional * @access public - * @return array + * @return array|bool */ public function listRevoked($crl = null) { @@ -3676,7 +3678,7 @@ class X509 * @param string $serial * @param array $crl optional * @access public - * @return array + * @return array|bool */ public function getRevokedCertificateExtensions($serial, $crl = null) {