octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-15 09:54:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wrong class name fix

Browse Source 
PHPDOC fixes
This commit is contained in:
Sokolovskyy Roman 2017-08-03 09:13:44 +02:00
parent 0c6d8607ce
commit f48995ac96
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
phpseclib/File/X509.php
View File

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