sop / x509

lib/X509/Certificate/Extension/NameConstraints/GeneralSubtrees.php

Indentation +79 added lines, -79 removed lines

@@ -15,89 +15,89 @@
  */
 class GeneralSubtrees implements \Countable, \IteratorAggregate
 {
-    /**
-     * Subtrees.
-     *
-     * @var GeneralSubtree[]
-     */
-    protected $_subtrees;
+	/**
+	 * Subtrees.
+	 *
+	 * @var GeneralSubtree[]
+	 */
+	protected $_subtrees;
 
-    /**
-     * Constructor.
-     *
-     * @param GeneralSubtree ...$subtrees
-     */
-    public function __construct(GeneralSubtree ...$subtrees)
-    {
-        $this->_subtrees = $subtrees;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param GeneralSubtree ...$subtrees
+	 */
+	public function __construct(GeneralSubtree ...$subtrees)
+	{
+		$this->_subtrees = $subtrees;
+	}
 
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     *
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        $subtrees = array_map(
-            function (UnspecifiedType $el) {
-                return GeneralSubtree::fromASN1($el->asSequence());
-            }, $seq->elements());
-        if (!count($subtrees)) {
-            throw new \UnexpectedValueException(
-                'GeneralSubtrees must contain at least one GeneralSubtree.');
-        }
-        return new self(...$subtrees);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 *
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		$subtrees = array_map(
+			function (UnspecifiedType $el) {
+				return GeneralSubtree::fromASN1($el->asSequence());
+			}, $seq->elements());
+		if (!count($subtrees)) {
+			throw new \UnexpectedValueException(
+				'GeneralSubtrees must contain at least one GeneralSubtree.');
+		}
+		return new self(...$subtrees);
+	}
 
-    /**
-     * Get all subtrees.
-     *
-     * @return GeneralSubtree[]
-     */
-    public function all(): array
-    {
-        return $this->_subtrees;
-    }
+	/**
+	 * Get all subtrees.
+	 *
+	 * @return GeneralSubtree[]
+	 */
+	public function all(): array
+	{
+		return $this->_subtrees;
+	}
 
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        if (!count($this->_subtrees)) {
-            throw new \LogicException('No subtrees.');
-        }
-        $elements = array_map(
-            function (GeneralSubtree $gs) {
-                return $gs->toASN1();
-            }, $this->_subtrees);
-        return new Sequence(...$elements);
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		if (!count($this->_subtrees)) {
+			throw new \LogicException('No subtrees.');
+		}
+		$elements = array_map(
+			function (GeneralSubtree $gs) {
+				return $gs->toASN1();
+			}, $this->_subtrees);
+		return new Sequence(...$elements);
+	}
 
-    /**
-     * @see \Countable::count()
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_subtrees);
-    }
+	/**
+	 * @see \Countable::count()
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_subtrees);
+	}
 
-    /**
-     * Get iterator for subtrees.
-     *
-     * @see \IteratorAggregate::getIterator()
-     *
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_subtrees);
-    }
+	/**
+	 * Get iterator for subtrees.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 *
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_subtrees);
+	}
 }

lib/X509/Certificate/Extension/UnknownExtension.php

Indentation +68 added lines, -68 removed lines

@@ -12,78 +12,78 @@
  */
 class UnknownExtension extends Extension
 {
-    /**
-     * Decoded extension value.
-     *
-     * @var null|Element
-     */
-    protected $_element;
+	/**
+	 * Decoded extension value.
+	 *
+	 * @var null|Element
+	 */
+	protected $_element;
 
-    /**
-     * Raw extension value.
-     *
-     * @var string
-     */
-    protected $_data;
+	/**
+	 * Raw extension value.
+	 *
+	 * @var string
+	 */
+	protected $_data;
 
-    /**
-     * Constructor.
-     *
-     * @param string  $oid
-     * @param bool    $critical
-     * @param Element $element
-     */
-    public function __construct(string $oid, bool $critical, Element $element)
-    {
-        parent::__construct($oid, $critical);
-        $this->_element = $element;
-        $this->_data = $element->toDER();
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string  $oid
+	 * @param bool    $critical
+	 * @param Element $element
+	 */
+	public function __construct(string $oid, bool $critical, Element $element)
+	{
+		parent::__construct($oid, $critical);
+		$this->_element = $element;
+		$this->_data = $element->toDER();
+	}
 
-    /**
-     * Create instance from a raw encoded extension value.
-     *
-     * @param string $oid
-     * @param bool   $critical
-     * @param string $data
-     *
-     * @return self
-     */
-    public static function fromRawString(string $oid, bool $critical,
-        string $data): self
-    {
-        $obj = new self($oid, $critical, new OctetString(''));
-        $obj->_element = null;
-        $obj->_data = $data;
-        return $obj;
-    }
+	/**
+	 * Create instance from a raw encoded extension value.
+	 *
+	 * @param string $oid
+	 * @param bool   $critical
+	 * @param string $data
+	 *
+	 * @return self
+	 */
+	public static function fromRawString(string $oid, bool $critical,
+		string $data): self
+	{
+		$obj = new self($oid, $critical, new OctetString(''));
+		$obj->_element = null;
+		$obj->_data = $data;
+		return $obj;
+	}
 
-    /**
-     * Get the encoded extension value.
-     *
-     * @return string
-     */
-    public function extensionValue(): string
-    {
-        return $this->_data;
-    }
+	/**
+	 * Get the encoded extension value.
+	 *
+	 * @return string
+	 */
+	public function extensionValue(): string
+	{
+		return $this->_data;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _extnValue(): OctetString
-    {
-        return new OctetString($this->_data);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _extnValue(): OctetString
+	{
+		return new OctetString($this->_data);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _valueASN1(): Element
-    {
-        if (!isset($this->_element)) {
-            throw new \RuntimeException('Extension value is not DER encoded.');
-        }
-        return $this->_element;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _valueASN1(): Element
+	{
+		if (!isset($this->_element)) {
+			throw new \RuntimeException('Extension value is not DER encoded.');
+		}
+		return $this->_element;
+	}
 }

lib/X509/Certificate/Extension/AccessDescription/AuthorityAccessDescription.php

Indentation +25 added lines, -25 removed lines

@@ -9,31 +9,31 @@
  */
 class AuthorityAccessDescription extends AccessDescription
 {
-    /**
-     * Access method OID's.
-     *
-     * @var string
-     */
-    const OID_METHOD_OSCP = '1.3.6.1.5.5.7.48.1';
-    const OID_METHOD_CA_ISSUERS = '1.3.6.1.5.5.7.48.2';
+	/**
+	 * Access method OID's.
+	 *
+	 * @var string
+	 */
+	const OID_METHOD_OSCP = '1.3.6.1.5.5.7.48.1';
+	const OID_METHOD_CA_ISSUERS = '1.3.6.1.5.5.7.48.2';
 
-    /**
-     * Check whether access method is OSCP.
-     *
-     * @return bool
-     */
-    public function isOSCPMethod(): bool
-    {
-        return self::OID_METHOD_OSCP === $this->_accessMethod;
-    }
+	/**
+	 * Check whether access method is OSCP.
+	 *
+	 * @return bool
+	 */
+	public function isOSCPMethod(): bool
+	{
+		return self::OID_METHOD_OSCP === $this->_accessMethod;
+	}
 
-    /**
-     * Check whether access method is CA issuers.
-     *
-     * @return bool
-     */
-    public function isCAIssuersMethod(): bool
-    {
-        return self::OID_METHOD_CA_ISSUERS === $this->_accessMethod;
-    }
+	/**
+	 * Check whether access method is CA issuers.
+	 *
+	 * @return bool
+	 */
+	public function isCAIssuersMethod(): bool
+	{
+		return self::OID_METHOD_CA_ISSUERS === $this->_accessMethod;
+	}
 }

lib/X509/Certificate/Extension/AccessDescription/SubjectAccessDescription.php

Indentation +25 added lines, -25 removed lines

@@ -9,31 +9,31 @@
  */
 class SubjectAccessDescription extends AccessDescription
 {
-    /**
-     * Access method OID's.
-     *
-     * @var string
-     */
-    const OID_METHOD_TIME_STAMPING = '1.3.6.1.5.5.7.48.3';
-    const OID_METHOD_CA_REPOSITORY = '1.3.6.1.5.5.7.48.5';
+	/**
+	 * Access method OID's.
+	 *
+	 * @var string
+	 */
+	const OID_METHOD_TIME_STAMPING = '1.3.6.1.5.5.7.48.3';
+	const OID_METHOD_CA_REPOSITORY = '1.3.6.1.5.5.7.48.5';
 
-    /**
-     * Check whether access method is time stamping.
-     *
-     * @return bool
-     */
-    public function isTimeStampingMethod(): bool
-    {
-        return self::OID_METHOD_TIME_STAMPING === $this->_accessMethod;
-    }
+	/**
+	 * Check whether access method is time stamping.
+	 *
+	 * @return bool
+	 */
+	public function isTimeStampingMethod(): bool
+	{
+		return self::OID_METHOD_TIME_STAMPING === $this->_accessMethod;
+	}
 
-    /**
-     * Check whether access method is CA repository.
-     *
-     * @return bool
-     */
-    public function isCARepositoryMethod(): bool
-    {
-        return self::OID_METHOD_CA_REPOSITORY === $this->_accessMethod;
-    }
+	/**
+	 * Check whether access method is CA repository.
+	 *
+	 * @return bool
+	 */
+	public function isCARepositoryMethod(): bool
+	{
+		return self::OID_METHOD_CA_REPOSITORY === $this->_accessMethod;
+	}
 }

lib/X509/Certificate/Extension/AccessDescription/AccessDescription.php

Indentation +63 added lines, -63 removed lines

@@ -17,73 +17,73 @@
  */
 abstract class AccessDescription
 {
-    /**
-     * Access method OID.
-     *
-     * @var string
-     */
-    protected $_accessMethod;
+	/**
+	 * Access method OID.
+	 *
+	 * @var string
+	 */
+	protected $_accessMethod;
 
-    /**
-     * Access location.
-     *
-     * @var GeneralName
-     */
-    protected $_accessLocation;
+	/**
+	 * Access location.
+	 *
+	 * @var GeneralName
+	 */
+	protected $_accessLocation;
 
-    /**
-     * Constructor.
-     *
-     * @param string      $method   Access method OID
-     * @param GeneralName $location Access location
-     */
-    public function __construct(string $method, GeneralName $location)
-    {
-        $this->_accessMethod = $method;
-        $this->_accessLocation = $location;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string      $method   Access method OID
+	 * @param GeneralName $location Access location
+	 */
+	public function __construct(string $method, GeneralName $location)
+	{
+		$this->_accessMethod = $method;
+		$this->_accessLocation = $location;
+	}
 
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     *
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        return new static($seq->at(0)->asObjectIdentifier()->oid(),
-            GeneralName::fromASN1($seq->at(1)->asTagged()));
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 *
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		return new static($seq->at(0)->asObjectIdentifier()->oid(),
+			GeneralName::fromASN1($seq->at(1)->asTagged()));
+	}
 
-    /**
-     * Get the access method OID.
-     *
-     * @return string
-     */
-    public function accessMethod(): string
-    {
-        return $this->_accessMethod;
-    }
+	/**
+	 * Get the access method OID.
+	 *
+	 * @return string
+	 */
+	public function accessMethod(): string
+	{
+		return $this->_accessMethod;
+	}
 
-    /**
-     * Get the access location.
-     *
-     * @return GeneralName
-     */
-    public function accessLocation(): GeneralName
-    {
-        return $this->_accessLocation;
-    }
+	/**
+	 * Get the access location.
+	 *
+	 * @return GeneralName
+	 */
+	public function accessLocation(): GeneralName
+	{
+		return $this->_accessLocation;
+	}
 
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        return new Sequence(new ObjectIdentifier($this->_accessMethod),
-            $this->_accessLocation->toASN1());
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		return new Sequence(new ObjectIdentifier($this->_accessMethod),
+			$this->_accessLocation->toASN1());
+	}
 }

lib/X509/Certificate/Extension/FreshestCRLExtension.php

Indentation +12 added lines, -12 removed lines

@@ -13,16 +13,16 @@
  */
 class FreshestCRLExtension extends CRLDistributionPointsExtension
 {
-    /**
-     * Constructor.
-     *
-     * @param bool              $critical
-     * @param DistributionPoint ...$distribution_points
-     */
-    public function __construct(bool $critical,
-        DistributionPoint ...$distribution_points)
-    {
-        Extension::__construct(self::OID_FRESHEST_CRL, $critical);
-        $this->_distributionPoints = $distribution_points;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool              $critical
+	 * @param DistributionPoint ...$distribution_points
+	 */
+	public function __construct(bool $critical,
+		DistributionPoint ...$distribution_points)
+	{
+		Extension::__construct(self::OID_FRESHEST_CRL, $critical);
+		$this->_distributionPoints = $distribution_points;
+	}
 }

lib/X509/Certificate/Extension/CertificatePoliciesExtension.php

Indentation +121 added lines, -121 removed lines

@@ -16,134 +16,134 @@
  */
 class CertificatePoliciesExtension extends Extension implements \Countable, \IteratorAggregate
 {
-    /**
-     * Policy information terms.
-     *
-     * @var PolicyInformation[]
-     */
-    protected $_policies;
+	/**
+	 * Policy information terms.
+	 *
+	 * @var PolicyInformation[]
+	 */
+	protected $_policies;
 
-    /**
-     * Constructor.
-     *
-     * @param bool              $critical
-     * @param PolicyInformation ...$policies
-     */
-    public function __construct(bool $critical, PolicyInformation ...$policies)
-    {
-        parent::__construct(Extension::OID_CERTIFICATE_POLICIES, $critical);
-        $this->_policies = [];
-        foreach ($policies as $policy) {
-            $this->_policies[$policy->oid()] = $policy;
-        }
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool              $critical
+	 * @param PolicyInformation ...$policies
+	 */
+	public function __construct(bool $critical, PolicyInformation ...$policies)
+	{
+		parent::__construct(Extension::OID_CERTIFICATE_POLICIES, $critical);
+		$this->_policies = [];
+		foreach ($policies as $policy) {
+			$this->_policies[$policy->oid()] = $policy;
+		}
+	}
 
-    /**
-     * Check whether policy information by OID is present.
-     *
-     * @param string $oid
-     *
-     * @return bool
-     */
-    public function has(string $oid): bool
-    {
-        return isset($this->_policies[$oid]);
-    }
+	/**
+	 * Check whether policy information by OID is present.
+	 *
+	 * @param string $oid
+	 *
+	 * @return bool
+	 */
+	public function has(string $oid): bool
+	{
+		return isset($this->_policies[$oid]);
+	}
 
-    /**
-     * Get policy information by OID.
-     *
-     * @param string $oid
-     *
-     * @throws \LogicException If not set
-     *
-     * @return PolicyInformation
-     */
-    public function get(string $oid): PolicyInformation
-    {
-        if (!$this->has($oid)) {
-            throw new \LogicException("Not certificate policy by OID {$oid}.");
-        }
-        return $this->_policies[$oid];
-    }
+	/**
+	 * Get policy information by OID.
+	 *
+	 * @param string $oid
+	 *
+	 * @throws \LogicException If not set
+	 *
+	 * @return PolicyInformation
+	 */
+	public function get(string $oid): PolicyInformation
+	{
+		if (!$this->has($oid)) {
+			throw new \LogicException("Not certificate policy by OID {$oid}.");
+		}
+		return $this->_policies[$oid];
+	}
 
-    /**
-     * Check whether anyPolicy is present.
-     *
-     * @return bool
-     */
-    public function hasAnyPolicy(): bool
-    {
-        return $this->has(PolicyInformation::OID_ANY_POLICY);
-    }
+	/**
+	 * Check whether anyPolicy is present.
+	 *
+	 * @return bool
+	 */
+	public function hasAnyPolicy(): bool
+	{
+		return $this->has(PolicyInformation::OID_ANY_POLICY);
+	}
 
-    /**
-     * Get anyPolicy information.
-     *
-     * @throws \LogicException if anyPolicy is not present
-     *
-     * @return PolicyInformation
-     */
-    public function anyPolicy(): PolicyInformation
-    {
-        if (!$this->hasAnyPolicy()) {
-            throw new \LogicException('No anyPolicy.');
-        }
-        return $this->get(PolicyInformation::OID_ANY_POLICY);
-    }
+	/**
+	 * Get anyPolicy information.
+	 *
+	 * @throws \LogicException if anyPolicy is not present
+	 *
+	 * @return PolicyInformation
+	 */
+	public function anyPolicy(): PolicyInformation
+	{
+		if (!$this->hasAnyPolicy()) {
+			throw new \LogicException('No anyPolicy.');
+		}
+		return $this->get(PolicyInformation::OID_ANY_POLICY);
+	}
 
-    /**
-     * Get the number of policies.
-     *
-     * @see \Countable::count()
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_policies);
-    }
+	/**
+	 * Get the number of policies.
+	 *
+	 * @see \Countable::count()
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_policies);
+	}
 
-    /**
-     * Get iterator for policy information terms.
-     *
-     * @see \IteratorAggregate::getIterator()
-     *
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_policies);
-    }
+	/**
+	 * Get iterator for policy information terms.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 *
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_policies);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected static function _fromDER(string $data, bool $critical): Extension
-    {
-        $policies = array_map(
-            function (UnspecifiedType $el) {
-                return PolicyInformation::fromASN1($el->asSequence());
-            }, UnspecifiedType::fromDER($data)->asSequence()->elements());
-        if (!count($policies)) {
-            throw new \UnexpectedValueException(
-                'certificatePolicies must contain at least one PolicyInformation.');
-        }
-        return new self($critical, ...$policies);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected static function _fromDER(string $data, bool $critical): Extension
+	{
+		$policies = array_map(
+			function (UnspecifiedType $el) {
+				return PolicyInformation::fromASN1($el->asSequence());
+			}, UnspecifiedType::fromDER($data)->asSequence()->elements());
+		if (!count($policies)) {
+			throw new \UnexpectedValueException(
+				'certificatePolicies must contain at least one PolicyInformation.');
+		}
+		return new self($critical, ...$policies);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _valueASN1(): Element
-    {
-        if (!count($this->_policies)) {
-            throw new \LogicException('No policies.');
-        }
-        $elements = array_map(
-            function (PolicyInformation $pi) {
-                return $pi->toASN1();
-            }, array_values($this->_policies));
-        return new Sequence(...$elements);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _valueASN1(): Element
+	{
+		if (!count($this->_policies)) {
+			throw new \LogicException('No policies.');
+		}
+		$elements = array_map(
+			function (PolicyInformation $pi) {
+				return $pi->toASN1();
+			}, array_values($this->_policies));
+		return new Sequence(...$elements);
+	}
 }

lib/X509/Certificate/Extension/PolicyConstraintsExtension.php

Indentation +102 added lines, -102 removed lines

@@ -17,114 +17,114 @@
  */
 class PolicyConstraintsExtension extends Extension
 {
-    /**
-     * @var null|int
-     */
-    protected $_requireExplicitPolicy;
+	/**
+	 * @var null|int
+	 */
+	protected $_requireExplicitPolicy;
 
-    /**
-     * @var null|int
-     */
-    protected $_inhibitPolicyMapping;
+	/**
+	 * @var null|int
+	 */
+	protected $_inhibitPolicyMapping;
 
-    /**
-     * Constructor.
-     *
-     * @param bool     $critical
-     * @param null|int $require_explicit_policy
-     * @param null|int $inhibit_policy_mapping
-     */
-    public function __construct(bool $critical,
-        ?int $require_explicit_policy = null, ?int $inhibit_policy_mapping = null)
-    {
-        parent::__construct(self::OID_POLICY_CONSTRAINTS, $critical);
-        $this->_requireExplicitPolicy = $require_explicit_policy;
-        $this->_inhibitPolicyMapping = $inhibit_policy_mapping;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool     $critical
+	 * @param null|int $require_explicit_policy
+	 * @param null|int $inhibit_policy_mapping
+	 */
+	public function __construct(bool $critical,
+		?int $require_explicit_policy = null, ?int $inhibit_policy_mapping = null)
+	{
+		parent::__construct(self::OID_POLICY_CONSTRAINTS, $critical);
+		$this->_requireExplicitPolicy = $require_explicit_policy;
+		$this->_inhibitPolicyMapping = $inhibit_policy_mapping;
+	}
 
-    /**
-     * Whether requireExplicitPolicy is present.
-     *
-     * @return bool
-     */
-    public function hasRequireExplicitPolicy(): bool
-    {
-        return isset($this->_requireExplicitPolicy);
-    }
+	/**
+	 * Whether requireExplicitPolicy is present.
+	 *
+	 * @return bool
+	 */
+	public function hasRequireExplicitPolicy(): bool
+	{
+		return isset($this->_requireExplicitPolicy);
+	}
 
-    /**
-     * Get requireExplicitPolicy.
-     *
-     * @throws \LogicException If not set
-     *
-     * @return int
-     */
-    public function requireExplicitPolicy(): int
-    {
-        if (!$this->hasRequireExplicitPolicy()) {
-            throw new \LogicException('requireExplicitPolicy not set.');
-        }
-        return $this->_requireExplicitPolicy;
-    }
+	/**
+	 * Get requireExplicitPolicy.
+	 *
+	 * @throws \LogicException If not set
+	 *
+	 * @return int
+	 */
+	public function requireExplicitPolicy(): int
+	{
+		if (!$this->hasRequireExplicitPolicy()) {
+			throw new \LogicException('requireExplicitPolicy not set.');
+		}
+		return $this->_requireExplicitPolicy;
+	}
 
-    /**
-     * Whether inhibitPolicyMapping is present.
-     *
-     * @return bool
-     */
-    public function hasInhibitPolicyMapping(): bool
-    {
-        return isset($this->_inhibitPolicyMapping);
-    }
+	/**
+	 * Whether inhibitPolicyMapping is present.
+	 *
+	 * @return bool
+	 */
+	public function hasInhibitPolicyMapping(): bool
+	{
+		return isset($this->_inhibitPolicyMapping);
+	}
 
-    /**
-     * Get inhibitPolicyMapping.
-     *
-     * @throws \LogicException If not set
-     *
-     * @return int
-     */
-    public function inhibitPolicyMapping(): int
-    {
-        if (!$this->hasInhibitPolicyMapping()) {
-            throw new \LogicException('inhibitPolicyMapping not set.');
-        }
-        return $this->_inhibitPolicyMapping;
-    }
+	/**
+	 * Get inhibitPolicyMapping.
+	 *
+	 * @throws \LogicException If not set
+	 *
+	 * @return int
+	 */
+	public function inhibitPolicyMapping(): int
+	{
+		if (!$this->hasInhibitPolicyMapping()) {
+			throw new \LogicException('inhibitPolicyMapping not set.');
+		}
+		return $this->_inhibitPolicyMapping;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected static function _fromDER(string $data, bool $critical): Extension
-    {
-        $seq = UnspecifiedType::fromDER($data)->asSequence();
-        $require_explicit_policy = null;
-        $inhibit_policy_mapping = null;
-        if ($seq->hasTagged(0)) {
-            $require_explicit_policy = $seq->getTagged(0)
-                ->asImplicit(Element::TYPE_INTEGER)->asInteger()->intNumber();
-        }
-        if ($seq->hasTagged(1)) {
-            $inhibit_policy_mapping = $seq->getTagged(1)
-                ->asImplicit(Element::TYPE_INTEGER)->asInteger()->intNumber();
-        }
-        return new self($critical, $require_explicit_policy, $inhibit_policy_mapping);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected static function _fromDER(string $data, bool $critical): Extension
+	{
+		$seq = UnspecifiedType::fromDER($data)->asSequence();
+		$require_explicit_policy = null;
+		$inhibit_policy_mapping = null;
+		if ($seq->hasTagged(0)) {
+			$require_explicit_policy = $seq->getTagged(0)
+				->asImplicit(Element::TYPE_INTEGER)->asInteger()->intNumber();
+		}
+		if ($seq->hasTagged(1)) {
+			$inhibit_policy_mapping = $seq->getTagged(1)
+				->asImplicit(Element::TYPE_INTEGER)->asInteger()->intNumber();
+		}
+		return new self($critical, $require_explicit_policy, $inhibit_policy_mapping);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _valueASN1(): Element
-    {
-        $elements = [];
-        if (isset($this->_requireExplicitPolicy)) {
-            $elements[] = new ImplicitlyTaggedType(0,
-                new Integer($this->_requireExplicitPolicy));
-        }
-        if (isset($this->_inhibitPolicyMapping)) {
-            $elements[] = new ImplicitlyTaggedType(1,
-                new Integer($this->_inhibitPolicyMapping));
-        }
-        return new Sequence(...$elements);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _valueASN1(): Element
+	{
+		$elements = [];
+		if (isset($this->_requireExplicitPolicy)) {
+			$elements[] = new ImplicitlyTaggedType(0,
+				new Integer($this->_requireExplicitPolicy));
+		}
+		if (isset($this->_inhibitPolicyMapping)) {
+			$elements[] = new ImplicitlyTaggedType(1,
+				new Integer($this->_inhibitPolicyMapping));
+		}
+		return new Sequence(...$elements);
+	}
 }

lib/X509/Certificate/Extension/AuthorityKeyIdentifierExtension.php

Indentation +161 added lines, -161 removed lines

@@ -20,176 +20,176 @@
  */
 class AuthorityKeyIdentifierExtension extends Extension
 {
-    /**
-     * Key identifier.
-     *
-     * @var null|string
-     */
-    protected $_keyIdentifier;
+	/**
+	 * Key identifier.
+	 *
+	 * @var null|string
+	 */
+	protected $_keyIdentifier;
 
-    /**
-     * Issuer name.
-     *
-     * @var null|GeneralNames
-     */
-    protected $_authorityCertIssuer;
+	/**
+	 * Issuer name.
+	 *
+	 * @var null|GeneralNames
+	 */
+	protected $_authorityCertIssuer;
 
-    /**
-     * Issuer serial number as a base 10 integer.
-     *
-     * @var null|string
-     */
-    protected $_authorityCertSerialNumber;
+	/**
+	 * Issuer serial number as a base 10 integer.
+	 *
+	 * @var null|string
+	 */
+	protected $_authorityCertSerialNumber;
 
-    /**
-     * Constructor.
-     *
-     * @param bool              $critical      Conforming CA's must mark as non-critical (false)
-     * @param null|string       $keyIdentifier Key identifier
-     * @param null|GeneralNames $issuer        Issuer name
-     * @param null|int|string   $serial        Issuer serial number as a base 10 integer
-     */
-    public function __construct(bool $critical, ?string $keyIdentifier,
-        ?GeneralNames $issuer = null, $serial = null)
-    {
-        parent::__construct(self::OID_AUTHORITY_KEY_IDENTIFIER, $critical);
-        $this->_keyIdentifier = $keyIdentifier;
-        $this->_authorityCertIssuer = $issuer;
-        $this->_authorityCertSerialNumber = isset($serial) ? strval($serial) : null;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool              $critical      Conforming CA's must mark as non-critical (false)
+	 * @param null|string       $keyIdentifier Key identifier
+	 * @param null|GeneralNames $issuer        Issuer name
+	 * @param null|int|string   $serial        Issuer serial number as a base 10 integer
+	 */
+	public function __construct(bool $critical, ?string $keyIdentifier,
+		?GeneralNames $issuer = null, $serial = null)
+	{
+		parent::__construct(self::OID_AUTHORITY_KEY_IDENTIFIER, $critical);
+		$this->_keyIdentifier = $keyIdentifier;
+		$this->_authorityCertIssuer = $issuer;
+		$this->_authorityCertSerialNumber = isset($serial) ? strval($serial) : null;
+	}
 
-    /**
-     * Create from public key info.
-     *
-     * @param PublicKeyInfo $pki
-     *
-     * @return AuthorityKeyIdentifierExtension
-     */
-    public static function fromPublicKeyInfo(PublicKeyInfo $pki): self
-    {
-        return new self(false, $pki->keyIdentifier());
-    }
+	/**
+	 * Create from public key info.
+	 *
+	 * @param PublicKeyInfo $pki
+	 *
+	 * @return AuthorityKeyIdentifierExtension
+	 */
+	public static function fromPublicKeyInfo(PublicKeyInfo $pki): self
+	{
+		return new self(false, $pki->keyIdentifier());
+	}
 
-    /**
-     * Whether key identifier is present.
-     *
-     * @return bool
-     */
-    public function hasKeyIdentifier(): bool
-    {
-        return isset($this->_keyIdentifier);
-    }
+	/**
+	 * Whether key identifier is present.
+	 *
+	 * @return bool
+	 */
+	public function hasKeyIdentifier(): bool
+	{
+		return isset($this->_keyIdentifier);
+	}
 
-    /**
-     * Get key identifier.
-     *
-     * @throws \LogicException If not set
-     *
-     * @return string
-     */
-    public function keyIdentifier(): string
-    {
-        if (!$this->hasKeyIdentifier()) {
-            throw new \LogicException('keyIdentifier not set.');
-        }
-        return $this->_keyIdentifier;
-    }
+	/**
+	 * Get key identifier.
+	 *
+	 * @throws \LogicException If not set
+	 *
+	 * @return string
+	 */
+	public function keyIdentifier(): string
+	{
+		if (!$this->hasKeyIdentifier()) {
+			throw new \LogicException('keyIdentifier not set.');
+		}
+		return $this->_keyIdentifier;
+	}
 
-    /**
-     * Whether issuer is present.
-     *
-     * @return bool
-     */
-    public function hasIssuer(): bool
-    {
-        return isset($this->_authorityCertIssuer);
-    }
+	/**
+	 * Whether issuer is present.
+	 *
+	 * @return bool
+	 */
+	public function hasIssuer(): bool
+	{
+		return isset($this->_authorityCertIssuer);
+	}
 
-    /**
-     * Get issuer.
-     *
-     * @throws \LogicException If not set
-     *
-     * @return GeneralNames
-     */
-    public function issuer(): GeneralNames
-    {
-        if (!$this->hasIssuer()) {
-            throw new \LogicException('authorityCertIssuer not set.');
-        }
-        return $this->_authorityCertIssuer;
-    }
+	/**
+	 * Get issuer.
+	 *
+	 * @throws \LogicException If not set
+	 *
+	 * @return GeneralNames
+	 */
+	public function issuer(): GeneralNames
+	{
+		if (!$this->hasIssuer()) {
+			throw new \LogicException('authorityCertIssuer not set.');
+		}
+		return $this->_authorityCertIssuer;
+	}
 
-    /**
-     * Get serial number.
-     *
-     * @throws \LogicException If not set
-     *
-     * @return string Base 10 integer string
-     */
-    public function serial(): string
-    {
-        // both issuer and serial must be present or both absent
-        if (!$this->hasIssuer()) {
-            throw new \LogicException('authorityCertSerialNumber not set.');
-        }
-        return $this->_authorityCertSerialNumber;
-    }
+	/**
+	 * Get serial number.
+	 *
+	 * @throws \LogicException If not set
+	 *
+	 * @return string Base 10 integer string
+	 */
+	public function serial(): string
+	{
+		// both issuer and serial must be present or both absent
+		if (!$this->hasIssuer()) {
+			throw new \LogicException('authorityCertSerialNumber not set.');
+		}
+		return $this->_authorityCertSerialNumber;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected static function _fromDER(string $data, bool $critical): Extension
-    {
-        $seq = UnspecifiedType::fromDER($data)->asSequence();
-        $keyIdentifier = null;
-        $issuer = null;
-        $serial = null;
-        if ($seq->hasTagged(0)) {
-            $keyIdentifier = $seq->getTagged(0)
-                ->asImplicit(Element::TYPE_OCTET_STRING)
-                ->asOctetString()->string();
-        }
-        if ($seq->hasTagged(1) || $seq->hasTagged(2)) {
-            if (!$seq->hasTagged(1) || !$seq->hasTagged(2)) {
-                throw new \UnexpectedValueException(
-                    'AuthorityKeyIdentifier must have both' .
-                        ' authorityCertIssuer and authorityCertSerialNumber' .
-                        ' present or both absent.');
-            }
-            $issuer = GeneralNames::fromASN1($seq->getTagged(1)
-                ->asImplicit(Element::TYPE_SEQUENCE)->asSequence());
-            $serial = $seq->getTagged(2)->asImplicit(Element::TYPE_INTEGER)
-                ->asInteger()->number();
-        }
-        return new self($critical, $keyIdentifier, $issuer, $serial);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected static function _fromDER(string $data, bool $critical): Extension
+	{
+		$seq = UnspecifiedType::fromDER($data)->asSequence();
+		$keyIdentifier = null;
+		$issuer = null;
+		$serial = null;
+		if ($seq->hasTagged(0)) {
+			$keyIdentifier = $seq->getTagged(0)
+				->asImplicit(Element::TYPE_OCTET_STRING)
+				->asOctetString()->string();
+		}
+		if ($seq->hasTagged(1) || $seq->hasTagged(2)) {
+			if (!$seq->hasTagged(1) || !$seq->hasTagged(2)) {
+				throw new \UnexpectedValueException(
+					'AuthorityKeyIdentifier must have both' .
+						' authorityCertIssuer and authorityCertSerialNumber' .
+						' present or both absent.');
+			}
+			$issuer = GeneralNames::fromASN1($seq->getTagged(1)
+				->asImplicit(Element::TYPE_SEQUENCE)->asSequence());
+			$serial = $seq->getTagged(2)->asImplicit(Element::TYPE_INTEGER)
+				->asInteger()->number();
+		}
+		return new self($critical, $keyIdentifier, $issuer, $serial);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _valueASN1(): Element
-    {
-        $elements = [];
-        if (isset($this->_keyIdentifier)) {
-            $elements[] = new ImplicitlyTaggedType(0,
-                new OctetString($this->_keyIdentifier));
-        }
-        // if either issuer or serial is set, both must be set
-        if (isset($this->_authorityCertIssuer) ||
-             isset($this->_authorityCertSerialNumber)) {
-            if (!isset($this->_authorityCertIssuer,
-                $this->_authorityCertSerialNumber)) {
-                throw new \LogicException(
-                    'AuthorityKeyIdentifier must have both' .
-                        ' authorityCertIssuer and authorityCertSerialNumber' .
-                        ' present or both absent.');
-            }
-            $elements[] = new ImplicitlyTaggedType(1,
-                $this->_authorityCertIssuer->toASN1());
-            $elements[] = new ImplicitlyTaggedType(2,
-                new Integer($this->_authorityCertSerialNumber));
-        }
-        return new Sequence(...$elements);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _valueASN1(): Element
+	{
+		$elements = [];
+		if (isset($this->_keyIdentifier)) {
+			$elements[] = new ImplicitlyTaggedType(0,
+				new OctetString($this->_keyIdentifier));
+		}
+		// if either issuer or serial is set, both must be set
+		if (isset($this->_authorityCertIssuer) ||
+			 isset($this->_authorityCertSerialNumber)) {
+			if (!isset($this->_authorityCertIssuer,
+				$this->_authorityCertSerialNumber)) {
+				throw new \LogicException(
+					'AuthorityKeyIdentifier must have both' .
+						' authorityCertIssuer and authorityCertSerialNumber' .
+						' present or both absent.');
+			}
+			$elements[] = new ImplicitlyTaggedType(1,
+				$this->_authorityCertIssuer->toASN1());
+			$elements[] = new ImplicitlyTaggedType(2,
+				new Integer($this->_authorityCertSerialNumber));
+		}
+		return new Sequence(...$elements);
+	}
 }