sop / x509

lib/X509/Certificate/Extension/DistributionPoint/FullName.php

Indentation +43 added lines, -43 removed lines

@@ -16,51 +16,51 @@
  */
 class FullName extends DistributionPointName
 {
-    /**
-     * Names.
-     *
-     * @var GeneralNames
-     */
-    protected $_names;
+	/**
+	 * Names.
+	 *
+	 * @var GeneralNames
+	 */
+	protected $_names;
 
-    /**
-     * Constructor.
-     *
-     * @param GeneralNames $names
-     */
-    public function __construct(GeneralNames $names)
-    {
-        $this->_tag = self::TAG_FULL_NAME;
-        $this->_names = $names;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param GeneralNames $names
+	 */
+	public function __construct(GeneralNames $names)
+	{
+		$this->_tag = self::TAG_FULL_NAME;
+		$this->_names = $names;
+	}
 
-    /**
-     * Initialize with a single URI.
-     *
-     * @param string $uri
-     *
-     * @return self
-     */
-    public static function fromURI(string $uri): self
-    {
-        return new self(new GeneralNames(new UniformResourceIdentifier($uri)));
-    }
+	/**
+	 * Initialize with a single URI.
+	 *
+	 * @param string $uri
+	 *
+	 * @return self
+	 */
+	public static function fromURI(string $uri): self
+	{
+		return new self(new GeneralNames(new UniformResourceIdentifier($uri)));
+	}
 
-    /**
-     * Get names.
-     *
-     * @return GeneralNames
-     */
-    public function names(): GeneralNames
-    {
-        return $this->_names;
-    }
+	/**
+	 * Get names.
+	 *
+	 * @return GeneralNames
+	 */
+	public function names(): GeneralNames
+	{
+		return $this->_names;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _valueASN1(): Element
-    {
-        return $this->_names->toASN1();
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _valueASN1(): Element
+	{
+		return $this->_names->toASN1();
+	}
 }

lib/X509/Certificate/Extension/DistributionPoint/DistributionPointName.php

Indentation +56 added lines, -56 removed lines

@@ -18,65 +18,65 @@
  */
 abstract class DistributionPointName
 {
-    const TAG_FULL_NAME = 0;
-    const TAG_RDN = 1;
+	const TAG_FULL_NAME = 0;
+	const TAG_RDN = 1;
 
-    /**
-     * Type.
-     *
-     * @var int
-     */
-    protected $_tag;
+	/**
+	 * Type.
+	 *
+	 * @var int
+	 */
+	protected $_tag;
 
-    /**
-     * Initialize from TaggedType.
-     *
-     * @param TaggedType $el
-     *
-     * @throws \UnexpectedValueException
-     *
-     * @return self
-     */
-    public static function fromTaggedType(TaggedType $el): self
-    {
-        switch ($el->tag()) {
-            case self::TAG_FULL_NAME:
-                return new FullName(
-                    GeneralNames::fromASN1(
-                        $el->asImplicit(Element::TYPE_SEQUENCE)->asSequence()));
-            case self::TAG_RDN:
-                return new RelativeName(
-                    RDN::fromASN1($el->asImplicit(Element::TYPE_SET)->asSet()));
-            default:
-                throw new \UnexpectedValueException(
-                    'DistributionPointName tag ' . $el->tag() . ' not supported.');
-        }
-    }
+	/**
+	 * Initialize from TaggedType.
+	 *
+	 * @param TaggedType $el
+	 *
+	 * @throws \UnexpectedValueException
+	 *
+	 * @return self
+	 */
+	public static function fromTaggedType(TaggedType $el): self
+	{
+		switch ($el->tag()) {
+			case self::TAG_FULL_NAME:
+				return new FullName(
+					GeneralNames::fromASN1(
+						$el->asImplicit(Element::TYPE_SEQUENCE)->asSequence()));
+			case self::TAG_RDN:
+				return new RelativeName(
+					RDN::fromASN1($el->asImplicit(Element::TYPE_SET)->asSet()));
+			default:
+				throw new \UnexpectedValueException(
+					'DistributionPointName tag ' . $el->tag() . ' not supported.');
+		}
+	}
 
-    /**
-     * Get type tag.
-     *
-     * @return int
-     */
-    public function tag(): int
-    {
-        return $this->_tag;
-    }
+	/**
+	 * Get type tag.
+	 *
+	 * @return int
+	 */
+	public function tag(): int
+	{
+		return $this->_tag;
+	}
 
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return ImplicitlyTaggedType
-     */
-    public function toASN1(): ImplicitlyTaggedType
-    {
-        return new ImplicitlyTaggedType($this->_tag, $this->_valueASN1());
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return ImplicitlyTaggedType
+	 */
+	public function toASN1(): ImplicitlyTaggedType
+	{
+		return new ImplicitlyTaggedType($this->_tag, $this->_valueASN1());
+	}
 
-    /**
-     * Generate ASN.1 element.
-     *
-     * @return Element
-     */
-    abstract protected function _valueASN1(): Element;
+	/**
+	 * Generate ASN.1 element.
+	 *
+	 * @return Element
+	 */
+	abstract protected function _valueASN1(): Element;
 }

lib/X509/Certificate/Extension/DistributionPoint/DistributionPoint.php

Indentation +213 added lines, -213 removed lines

@@ -18,217 +18,217 @@
  */
 class DistributionPoint
 {
-    /**
-     * Distribution point name.
-     *
-     * @var null|DistributionPointName
-     */
-    protected $_distributionPoint;
-
-    /**
-     * Revocation reason.
-     *
-     * @var null|ReasonFlags
-     */
-    protected $_reasons;
-
-    /**
-     * CRL issuer.
-     *
-     * @var null|GeneralNames
-     */
-    protected $_issuer;
-
-    /**
-     * Constructor.
-     *
-     * @param null|DistributionPointName $name
-     * @param null|ReasonFlags           $reasons
-     * @param null|GeneralNames          $issuer
-     */
-    public function __construct(?DistributionPointName $name = null,
-        ?ReasonFlags $reasons = null, ?GeneralNames $issuer = null)
-    {
-        $this->_distributionPoint = $name;
-        $this->_reasons = $reasons;
-        $this->_issuer = $issuer;
-    }
-
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     *
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        $name = null;
-        $reasons = null;
-        $issuer = null;
-        if ($seq->hasTagged(0)) {
-            // promoted to explicit tagging because underlying type is CHOICE
-            $name = DistributionPointName::fromTaggedType(
-                $seq->getTagged(0)->asExplicit()->asTagged());
-        }
-        if ($seq->hasTagged(1)) {
-            $reasons = ReasonFlags::fromASN1(
-                $seq->getTagged(1)->asImplicit(Element::TYPE_BIT_STRING)
-                    ->asBitString());
-        }
-        if ($seq->hasTagged(2)) {
-            $issuer = GeneralNames::fromASN1(
-                $seq->getTagged(2)->asImplicit(Element::TYPE_SEQUENCE)
-                    ->asSequence());
-        }
-        return new self($name, $reasons, $issuer);
-    }
-
-    /**
-     * Check whether distribution point name is set.
-     *
-     * @return bool
-     */
-    public function hasDistributionPointName(): bool
-    {
-        return isset($this->_distributionPoint);
-    }
-
-    /**
-     * Get distribution point name.
-     *
-     * @throws \LogicException If not set
-     *
-     * @return DistributionPointName
-     */
-    public function distributionPointName(): DistributionPointName
-    {
-        if (!$this->hasDistributionPointName()) {
-            throw new \LogicException('distributionPoint not set.');
-        }
-        return $this->_distributionPoint;
-    }
-
-    /**
-     * Check whether distribution point name is set and it's a full name.
-     *
-     * @return bool
-     */
-    public function hasFullName(): bool
-    {
-        return DistributionPointName::TAG_FULL_NAME ===
-             $this->distributionPointName()->tag();
-    }
-
-    /**
-     * Get full distribution point name.
-     *
-     * @throws \LogicException If not set
-     *
-     * @return FullName
-     */
-    public function fullName(): FullName
-    {
-        if (!$this->hasFullName()) {
-            throw new \LogicException('fullName not set.');
-        }
-        return $this->_distributionPoint;
-    }
-
-    /**
-     * Check whether distribution point name is set and it's a relative name.
-     *
-     * @return bool
-     */
-    public function hasRelativeName(): bool
-    {
-        return DistributionPointName::TAG_RDN ===
-             $this->distributionPointName()->tag();
-    }
-
-    /**
-     * Get relative distribution point name.
-     *
-     * @throws \LogicException If not set
-     *
-     * @return RelativeName
-     */
-    public function relativeName(): RelativeName
-    {
-        if (!$this->hasRelativeName()) {
-            throw new \LogicException('nameRelativeToCRLIssuer not set.');
-        }
-        return $this->_distributionPoint;
-    }
-
-    /**
-     * Check whether reasons flags is set.
-     *
-     * @return bool
-     */
-    public function hasReasons(): bool
-    {
-        return isset($this->_reasons);
-    }
-
-    /**
-     * Get revocation reason flags.
-     *
-     * @throws \LogicException If not set
-     *
-     * @return ReasonFlags
-     */
-    public function reasons(): ReasonFlags
-    {
-        if (!$this->hasReasons()) {
-            throw new \LogicException('reasons not set.');
-        }
-        return $this->_reasons;
-    }
-
-    /**
-     * Check whether cRLIssuer is set.
-     *
-     * @return bool
-     */
-    public function hasCRLIssuer(): bool
-    {
-        return isset($this->_issuer);
-    }
-
-    /**
-     * Get CRL issuer.
-     *
-     * @throws \LogicException If not set
-     *
-     * @return GeneralNames
-     */
-    public function crlIssuer(): GeneralNames
-    {
-        if (!$this->hasCRLIssuer()) {
-            throw new \LogicException('crlIssuer not set.');
-        }
-        return $this->_issuer;
-    }
-
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $elements = [];
-        if (isset($this->_distributionPoint)) {
-            $elements[] = new ExplicitlyTaggedType(0,
-                $this->_distributionPoint->toASN1());
-        }
-        if (isset($this->_reasons)) {
-            $elements[] = new ImplicitlyTaggedType(1, $this->_reasons->toASN1());
-        }
-        if (isset($this->_issuer)) {
-            $elements[] = new ImplicitlyTaggedType(2, $this->_issuer->toASN1());
-        }
-        return new Sequence(...$elements);
-    }
+	/**
+	 * Distribution point name.
+	 *
+	 * @var null|DistributionPointName
+	 */
+	protected $_distributionPoint;
+
+	/**
+	 * Revocation reason.
+	 *
+	 * @var null|ReasonFlags
+	 */
+	protected $_reasons;
+
+	/**
+	 * CRL issuer.
+	 *
+	 * @var null|GeneralNames
+	 */
+	protected $_issuer;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param null|DistributionPointName $name
+	 * @param null|ReasonFlags           $reasons
+	 * @param null|GeneralNames          $issuer
+	 */
+	public function __construct(?DistributionPointName $name = null,
+		?ReasonFlags $reasons = null, ?GeneralNames $issuer = null)
+	{
+		$this->_distributionPoint = $name;
+		$this->_reasons = $reasons;
+		$this->_issuer = $issuer;
+	}
+
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 *
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		$name = null;
+		$reasons = null;
+		$issuer = null;
+		if ($seq->hasTagged(0)) {
+			// promoted to explicit tagging because underlying type is CHOICE
+			$name = DistributionPointName::fromTaggedType(
+				$seq->getTagged(0)->asExplicit()->asTagged());
+		}
+		if ($seq->hasTagged(1)) {
+			$reasons = ReasonFlags::fromASN1(
+				$seq->getTagged(1)->asImplicit(Element::TYPE_BIT_STRING)
+					->asBitString());
+		}
+		if ($seq->hasTagged(2)) {
+			$issuer = GeneralNames::fromASN1(
+				$seq->getTagged(2)->asImplicit(Element::TYPE_SEQUENCE)
+					->asSequence());
+		}
+		return new self($name, $reasons, $issuer);
+	}
+
+	/**
+	 * Check whether distribution point name is set.
+	 *
+	 * @return bool
+	 */
+	public function hasDistributionPointName(): bool
+	{
+		return isset($this->_distributionPoint);
+	}
+
+	/**
+	 * Get distribution point name.
+	 *
+	 * @throws \LogicException If not set
+	 *
+	 * @return DistributionPointName
+	 */
+	public function distributionPointName(): DistributionPointName
+	{
+		if (!$this->hasDistributionPointName()) {
+			throw new \LogicException('distributionPoint not set.');
+		}
+		return $this->_distributionPoint;
+	}
+
+	/**
+	 * Check whether distribution point name is set and it's a full name.
+	 *
+	 * @return bool
+	 */
+	public function hasFullName(): bool
+	{
+		return DistributionPointName::TAG_FULL_NAME ===
+			 $this->distributionPointName()->tag();
+	}
+
+	/**
+	 * Get full distribution point name.
+	 *
+	 * @throws \LogicException If not set
+	 *
+	 * @return FullName
+	 */
+	public function fullName(): FullName
+	{
+		if (!$this->hasFullName()) {
+			throw new \LogicException('fullName not set.');
+		}
+		return $this->_distributionPoint;
+	}
+
+	/**
+	 * Check whether distribution point name is set and it's a relative name.
+	 *
+	 * @return bool
+	 */
+	public function hasRelativeName(): bool
+	{
+		return DistributionPointName::TAG_RDN ===
+			 $this->distributionPointName()->tag();
+	}
+
+	/**
+	 * Get relative distribution point name.
+	 *
+	 * @throws \LogicException If not set
+	 *
+	 * @return RelativeName
+	 */
+	public function relativeName(): RelativeName
+	{
+		if (!$this->hasRelativeName()) {
+			throw new \LogicException('nameRelativeToCRLIssuer not set.');
+		}
+		return $this->_distributionPoint;
+	}
+
+	/**
+	 * Check whether reasons flags is set.
+	 *
+	 * @return bool
+	 */
+	public function hasReasons(): bool
+	{
+		return isset($this->_reasons);
+	}
+
+	/**
+	 * Get revocation reason flags.
+	 *
+	 * @throws \LogicException If not set
+	 *
+	 * @return ReasonFlags
+	 */
+	public function reasons(): ReasonFlags
+	{
+		if (!$this->hasReasons()) {
+			throw new \LogicException('reasons not set.');
+		}
+		return $this->_reasons;
+	}
+
+	/**
+	 * Check whether cRLIssuer is set.
+	 *
+	 * @return bool
+	 */
+	public function hasCRLIssuer(): bool
+	{
+		return isset($this->_issuer);
+	}
+
+	/**
+	 * Get CRL issuer.
+	 *
+	 * @throws \LogicException If not set
+	 *
+	 * @return GeneralNames
+	 */
+	public function crlIssuer(): GeneralNames
+	{
+		if (!$this->hasCRLIssuer()) {
+			throw new \LogicException('crlIssuer not set.');
+		}
+		return $this->_issuer;
+	}
+
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$elements = [];
+		if (isset($this->_distributionPoint)) {
+			$elements[] = new ExplicitlyTaggedType(0,
+				$this->_distributionPoint->toASN1());
+		}
+		if (isset($this->_reasons)) {
+			$elements[] = new ImplicitlyTaggedType(1, $this->_reasons->toASN1());
+		}
+		if (isset($this->_issuer)) {
+			$elements[] = new ImplicitlyTaggedType(2, $this->_issuer->toASN1());
+		}
+		return new Sequence(...$elements);
+	}
 }

lib/X509/Certificate/Extension/SubjectInformationAccessExtension.php

Indentation +70 added lines, -70 removed lines

@@ -17,80 +17,80 @@
  */
 class SubjectInformationAccessExtension extends Extension implements \Countable, \IteratorAggregate
 {
-    /**
-     * Access descriptions.
-     *
-     * @var SubjectAccessDescription[]
-     */
-    private $_accessDescriptions;
+	/**
+	 * Access descriptions.
+	 *
+	 * @var SubjectAccessDescription[]
+	 */
+	private $_accessDescriptions;
 
-    /**
-     * Constructor.
-     *
-     * @param bool                     $critical
-     * @param SubjectAccessDescription ...$access
-     */
-    public function __construct(bool $critical, SubjectAccessDescription ...$access)
-    {
-        parent::__construct(self::OID_SUBJECT_INFORMATION_ACCESS, $critical);
-        $this->_accessDescriptions = $access;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool                     $critical
+	 * @param SubjectAccessDescription ...$access
+	 */
+	public function __construct(bool $critical, SubjectAccessDescription ...$access)
+	{
+		parent::__construct(self::OID_SUBJECT_INFORMATION_ACCESS, $critical);
+		$this->_accessDescriptions = $access;
+	}
 
-    /**
-     * Get the access descriptions.
-     *
-     * @return SubjectAccessDescription[]
-     */
-    public function accessDescriptions(): array
-    {
-        return $this->_accessDescriptions;
-    }
+	/**
+	 * Get the access descriptions.
+	 *
+	 * @return SubjectAccessDescription[]
+	 */
+	public function accessDescriptions(): array
+	{
+		return $this->_accessDescriptions;
+	}
 
-    /**
-     * Get the number of access descriptions.
-     *
-     * @see \Countable::count()
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_accessDescriptions);
-    }
+	/**
+	 * Get the number of access descriptions.
+	 *
+	 * @see \Countable::count()
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_accessDescriptions);
+	}
 
-    /**
-     * Get iterator for access descriptions.
-     *
-     * @see \IteratorAggregate::getIterator()
-     *
-     * @return \ArrayIterator List of SubjectAccessDescription objects
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_accessDescriptions);
-    }
+	/**
+	 * Get iterator for access descriptions.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 *
+	 * @return \ArrayIterator List of SubjectAccessDescription objects
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_accessDescriptions);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected static function _fromDER(string $data, bool $critical): Extension
-    {
-        $access = array_map(
-            function (UnspecifiedType $el) {
-                return SubjectAccessDescription::fromASN1($el->asSequence());
-            }, UnspecifiedType::fromDER($data)->asSequence()->elements());
-        return new self($critical, ...$access);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected static function _fromDER(string $data, bool $critical): Extension
+	{
+		$access = array_map(
+			function (UnspecifiedType $el) {
+				return SubjectAccessDescription::fromASN1($el->asSequence());
+			}, UnspecifiedType::fromDER($data)->asSequence()->elements());
+		return new self($critical, ...$access);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _valueASN1(): Element
-    {
-        $elements = array_map(
-            function (AccessDescription $access) {
-                return $access->toASN1();
-            }, $this->_accessDescriptions);
-        return new Sequence(...$elements);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _valueASN1(): Element
+	{
+		$elements = array_map(
+			function (AccessDescription $access) {
+				return $access->toASN1();
+			}, $this->_accessDescriptions);
+		return new Sequence(...$elements);
+	}
 }

lib/X509/Certificate/Extension/Extension.php

Indentation +258 added lines, -258 removed lines

@@ -18,277 +18,277 @@
  */
 abstract class Extension
 {
-    // OID's from standard certificate extensions
-    const OID_OBSOLETE_AUTHORITY_KEY_IDENTIFIER = '2.5.29.1';
-    const OID_OBSOLETE_KEY_ATTRIBUTES = '2.5.29.2';
-    const OID_OBSOLETE_CERTIFICATE_POLICIES = '2.5.29.3';
-    const OID_OBSOLETE_KEY_USAGE_RESTRICTION = '2.5.29.4';
-    const OID_OBSOLETE_POLICY_MAPPING = '2.5.29.5';
-    const OID_OBSOLETE_SUBTREES_CONSTRAINT = '2.5.29.6';
-    const OID_OBSOLETE_SUBJECT_ALT_NAME = '2.5.29.7';
-    const OID_OBSOLETE_ISSUER_ALT_NAME = '2.5.29.8';
-    const OID_SUBJECT_DIRECTORY_ATTRIBUTES = '2.5.29.9';
-    const OID_OBSOLETE_BASIC_CONSTRAINTS = '2.5.29.10';
-    const OID_SUBJECT_KEY_IDENTIFIER = '2.5.29.14';
-    const OID_KEY_USAGE = '2.5.29.15';
-    const OID_PRIVATE_KEY_USAGE_PERIOD = '2.5.29.16';
-    const OID_SUBJECT_ALT_NAME = '2.5.29.17';
-    const OID_ISSUER_ALT_NAME = '2.5.29.18';
-    const OID_BASIC_CONSTRAINTS = '2.5.29.19';
-    const OID_CRL_NUMBER = '2.5.29.20';
-    const OID_REASON_CODE = '2.5.29.21';
-    const OID_OBSOLETE_EXPIRATION_DATE = '2.5.29.22';
-    const OID_INSTRUCTION_CODE = '2.5.29.23';
-    const OID_INVALIDITY_DATE = '2.5.29.24';
-    const OID_OBSOLETE_CRL_DISTRIBUTION_POINTS = '2.5.29.25';
-    const OID_OBSOLETE_ISSUING_DISTRIBUTION_POINT = '2.5.29.26';
-    const OID_DELTA_CRL_INDICATOR = '2.5.29.27';
-    const OID_ISSUING_DISTRIBUTION_POINT = '2.5.29.28';
-    const OID_CERTIFICATE_ISSUER = '2.5.29.29';
-    const OID_NAME_CONSTRAINTS = '2.5.29.30';
-    const OID_CRL_DISTRIBUTION_POINTS = '2.5.29.31';
-    const OID_CERTIFICATE_POLICIES = '2.5.29.32';
-    const OID_POLICY_MAPPINGS = '2.5.29.33';
-    const OID_OBSOLETE_POLICY_CONSTRAINTS = '2.5.29.34';
-    const OID_AUTHORITY_KEY_IDENTIFIER = '2.5.29.35';
-    const OID_POLICY_CONSTRAINTS = '2.5.29.36';
-    const OID_EXT_KEY_USAGE = '2.5.29.37';
-    const OID_AUTHORITY_ATTRIBUTE_IDENTIFIER = '2.5.29.38';
-    const OID_ROLE_SPEC_CERT_IDENTIFIER = '2.5.29.39';
-    const OID_CRL_STREAM_IDENTIFIER = '2.5.29.40';
-    const OID_BASIC_ATT_CONSTRAINTS = '2.5.29.41';
-    const OID_DELEGATED_NAME_CONSTRAINTS = '2.5.29.42';
-    const OID_TIME_SPECIFICATION = '2.5.29.43';
-    const OID_CRL_SCOPE = '2.5.29.44';
-    const OID_STATUS_REFERRALS = '2.5.29.45';
-    const OID_FRESHEST_CRL = '2.5.29.46';
-    const OID_ORDERED_LIST = '2.5.29.47';
-    const OID_ATTRIBUTE_DESCRIPTOR = '2.5.29.48';
-    const OID_USER_NOTICE = '2.5.29.49';
-    const OID_SOA_IDENTIFIER = '2.5.29.50';
-    const OID_BASE_UPDATE_TIME = '2.5.29.51';
-    const OID_ACCEPTABLE_CERT_POLICIES = '2.5.29.52';
-    const OID_DELTA_INFO = '2.5.29.53';
-    const OID_INHIBIT_ANY_POLICY = '2.5.29.54';
-    const OID_TARGET_INFORMATION = '2.5.29.55';
-    const OID_NO_REV_AVAIL = '2.5.29.56';
-    const OID_ACCEPTABLE_PRIVILEGE_POLICIES = '2.5.29.57';
-    const OID_TO_BE_REVOKED = '2.5.29.58';
-    const OID_REVOKED_GROUPS = '2.5.29.59';
-    const OID_EXPIRED_CERTS_ON_CRL = '2.5.29.60';
-    const OID_INDIRECT_ISSUER = '2.5.29.61';
-    const OID_NO_ASSERTION = '2.5.29.62';
-    const OID_AA_ISSUING_DISTRIBUTION_POINT = '2.5.29.63';
-    const OID_ISSUED_ON_BEHALF_OF = '2.5.29.64';
-    const OID_SINGLE_USE = '2.5.29.65';
-    const OID_GROUP_AC = '2.5.29.66';
-    const OID_ALLOWED_ATT_ASS = '2.5.29.67';
-    const OID_ATTRIBUTE_MAPPINGS = '2.5.29.68';
-    const OID_HOLDER_NAME_CONSTRAINTS = '2.5.29.69';
+	// OID's from standard certificate extensions
+	const OID_OBSOLETE_AUTHORITY_KEY_IDENTIFIER = '2.5.29.1';
+	const OID_OBSOLETE_KEY_ATTRIBUTES = '2.5.29.2';
+	const OID_OBSOLETE_CERTIFICATE_POLICIES = '2.5.29.3';
+	const OID_OBSOLETE_KEY_USAGE_RESTRICTION = '2.5.29.4';
+	const OID_OBSOLETE_POLICY_MAPPING = '2.5.29.5';
+	const OID_OBSOLETE_SUBTREES_CONSTRAINT = '2.5.29.6';
+	const OID_OBSOLETE_SUBJECT_ALT_NAME = '2.5.29.7';
+	const OID_OBSOLETE_ISSUER_ALT_NAME = '2.5.29.8';
+	const OID_SUBJECT_DIRECTORY_ATTRIBUTES = '2.5.29.9';
+	const OID_OBSOLETE_BASIC_CONSTRAINTS = '2.5.29.10';
+	const OID_SUBJECT_KEY_IDENTIFIER = '2.5.29.14';
+	const OID_KEY_USAGE = '2.5.29.15';
+	const OID_PRIVATE_KEY_USAGE_PERIOD = '2.5.29.16';
+	const OID_SUBJECT_ALT_NAME = '2.5.29.17';
+	const OID_ISSUER_ALT_NAME = '2.5.29.18';
+	const OID_BASIC_CONSTRAINTS = '2.5.29.19';
+	const OID_CRL_NUMBER = '2.5.29.20';
+	const OID_REASON_CODE = '2.5.29.21';
+	const OID_OBSOLETE_EXPIRATION_DATE = '2.5.29.22';
+	const OID_INSTRUCTION_CODE = '2.5.29.23';
+	const OID_INVALIDITY_DATE = '2.5.29.24';
+	const OID_OBSOLETE_CRL_DISTRIBUTION_POINTS = '2.5.29.25';
+	const OID_OBSOLETE_ISSUING_DISTRIBUTION_POINT = '2.5.29.26';
+	const OID_DELTA_CRL_INDICATOR = '2.5.29.27';
+	const OID_ISSUING_DISTRIBUTION_POINT = '2.5.29.28';
+	const OID_CERTIFICATE_ISSUER = '2.5.29.29';
+	const OID_NAME_CONSTRAINTS = '2.5.29.30';
+	const OID_CRL_DISTRIBUTION_POINTS = '2.5.29.31';
+	const OID_CERTIFICATE_POLICIES = '2.5.29.32';
+	const OID_POLICY_MAPPINGS = '2.5.29.33';
+	const OID_OBSOLETE_POLICY_CONSTRAINTS = '2.5.29.34';
+	const OID_AUTHORITY_KEY_IDENTIFIER = '2.5.29.35';
+	const OID_POLICY_CONSTRAINTS = '2.5.29.36';
+	const OID_EXT_KEY_USAGE = '2.5.29.37';
+	const OID_AUTHORITY_ATTRIBUTE_IDENTIFIER = '2.5.29.38';
+	const OID_ROLE_SPEC_CERT_IDENTIFIER = '2.5.29.39';
+	const OID_CRL_STREAM_IDENTIFIER = '2.5.29.40';
+	const OID_BASIC_ATT_CONSTRAINTS = '2.5.29.41';
+	const OID_DELEGATED_NAME_CONSTRAINTS = '2.5.29.42';
+	const OID_TIME_SPECIFICATION = '2.5.29.43';
+	const OID_CRL_SCOPE = '2.5.29.44';
+	const OID_STATUS_REFERRALS = '2.5.29.45';
+	const OID_FRESHEST_CRL = '2.5.29.46';
+	const OID_ORDERED_LIST = '2.5.29.47';
+	const OID_ATTRIBUTE_DESCRIPTOR = '2.5.29.48';
+	const OID_USER_NOTICE = '2.5.29.49';
+	const OID_SOA_IDENTIFIER = '2.5.29.50';
+	const OID_BASE_UPDATE_TIME = '2.5.29.51';
+	const OID_ACCEPTABLE_CERT_POLICIES = '2.5.29.52';
+	const OID_DELTA_INFO = '2.5.29.53';
+	const OID_INHIBIT_ANY_POLICY = '2.5.29.54';
+	const OID_TARGET_INFORMATION = '2.5.29.55';
+	const OID_NO_REV_AVAIL = '2.5.29.56';
+	const OID_ACCEPTABLE_PRIVILEGE_POLICIES = '2.5.29.57';
+	const OID_TO_BE_REVOKED = '2.5.29.58';
+	const OID_REVOKED_GROUPS = '2.5.29.59';
+	const OID_EXPIRED_CERTS_ON_CRL = '2.5.29.60';
+	const OID_INDIRECT_ISSUER = '2.5.29.61';
+	const OID_NO_ASSERTION = '2.5.29.62';
+	const OID_AA_ISSUING_DISTRIBUTION_POINT = '2.5.29.63';
+	const OID_ISSUED_ON_BEHALF_OF = '2.5.29.64';
+	const OID_SINGLE_USE = '2.5.29.65';
+	const OID_GROUP_AC = '2.5.29.66';
+	const OID_ALLOWED_ATT_ASS = '2.5.29.67';
+	const OID_ATTRIBUTE_MAPPINGS = '2.5.29.68';
+	const OID_HOLDER_NAME_CONSTRAINTS = '2.5.29.69';
 
-    // OID's from private certificate extensions arc
-    const OID_AUTHORITY_INFORMATION_ACCESS = '1.3.6.1.5.5.7.1.1';
-    const OID_AA_CONTROLS = '1.3.6.1.5.5.7.1.6';
-    const OID_SUBJECT_INFORMATION_ACCESS = '1.3.6.1.5.5.7.1.11';
-    const OID_LOGOTYPE = '1.3.6.1.5.5.7.1.12';
+	// OID's from private certificate extensions arc
+	const OID_AUTHORITY_INFORMATION_ACCESS = '1.3.6.1.5.5.7.1.1';
+	const OID_AA_CONTROLS = '1.3.6.1.5.5.7.1.6';
+	const OID_SUBJECT_INFORMATION_ACCESS = '1.3.6.1.5.5.7.1.11';
+	const OID_LOGOTYPE = '1.3.6.1.5.5.7.1.12';
 
-    /**
-     * Mapping from extension ID to implementation class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_OID_TO_CLASS = [
-        self::OID_AUTHORITY_KEY_IDENTIFIER => AuthorityKeyIdentifierExtension::class,
-        self::OID_SUBJECT_KEY_IDENTIFIER => SubjectKeyIdentifierExtension::class,
-        self::OID_KEY_USAGE => KeyUsageExtension::class,
-        self::OID_CERTIFICATE_POLICIES => CertificatePoliciesExtension::class,
-        self::OID_POLICY_MAPPINGS => PolicyMappingsExtension::class,
-        self::OID_SUBJECT_ALT_NAME => SubjectAlternativeNameExtension::class,
-        self::OID_ISSUER_ALT_NAME => IssuerAlternativeNameExtension::class,
-        self::OID_SUBJECT_DIRECTORY_ATTRIBUTES => SubjectDirectoryAttributesExtension::class,
-        self::OID_BASIC_CONSTRAINTS => BasicConstraintsExtension::class,
-        self::OID_NAME_CONSTRAINTS => NameConstraintsExtension::class,
-        self::OID_POLICY_CONSTRAINTS => PolicyConstraintsExtension::class,
-        self::OID_EXT_KEY_USAGE => ExtendedKeyUsageExtension::class,
-        self::OID_CRL_DISTRIBUTION_POINTS => CRLDistributionPointsExtension::class,
-        self::OID_INHIBIT_ANY_POLICY => InhibitAnyPolicyExtension::class,
-        self::OID_FRESHEST_CRL => FreshestCRLExtension::class,
-        self::OID_NO_REV_AVAIL => NoRevocationAvailableExtension::class,
-        self::OID_TARGET_INFORMATION => TargetInformationExtension::class,
-        self::OID_AUTHORITY_INFORMATION_ACCESS => AuthorityInformationAccessExtension::class,
-        self::OID_AA_CONTROLS => AAControlsExtension::class,
-        self::OID_SUBJECT_INFORMATION_ACCESS => SubjectInformationAccessExtension::class,
-    ];
+	/**
+	 * Mapping from extension ID to implementation class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_OID_TO_CLASS = [
+		self::OID_AUTHORITY_KEY_IDENTIFIER => AuthorityKeyIdentifierExtension::class,
+		self::OID_SUBJECT_KEY_IDENTIFIER => SubjectKeyIdentifierExtension::class,
+		self::OID_KEY_USAGE => KeyUsageExtension::class,
+		self::OID_CERTIFICATE_POLICIES => CertificatePoliciesExtension::class,
+		self::OID_POLICY_MAPPINGS => PolicyMappingsExtension::class,
+		self::OID_SUBJECT_ALT_NAME => SubjectAlternativeNameExtension::class,
+		self::OID_ISSUER_ALT_NAME => IssuerAlternativeNameExtension::class,
+		self::OID_SUBJECT_DIRECTORY_ATTRIBUTES => SubjectDirectoryAttributesExtension::class,
+		self::OID_BASIC_CONSTRAINTS => BasicConstraintsExtension::class,
+		self::OID_NAME_CONSTRAINTS => NameConstraintsExtension::class,
+		self::OID_POLICY_CONSTRAINTS => PolicyConstraintsExtension::class,
+		self::OID_EXT_KEY_USAGE => ExtendedKeyUsageExtension::class,
+		self::OID_CRL_DISTRIBUTION_POINTS => CRLDistributionPointsExtension::class,
+		self::OID_INHIBIT_ANY_POLICY => InhibitAnyPolicyExtension::class,
+		self::OID_FRESHEST_CRL => FreshestCRLExtension::class,
+		self::OID_NO_REV_AVAIL => NoRevocationAvailableExtension::class,
+		self::OID_TARGET_INFORMATION => TargetInformationExtension::class,
+		self::OID_AUTHORITY_INFORMATION_ACCESS => AuthorityInformationAccessExtension::class,
+		self::OID_AA_CONTROLS => AAControlsExtension::class,
+		self::OID_SUBJECT_INFORMATION_ACCESS => SubjectInformationAccessExtension::class,
+	];
 
-    /**
-     * Mapping from extensions ID to short name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_OID_TO_NAME = [
-        self::OID_AUTHORITY_KEY_IDENTIFIER => 'authorityKeyIdentifier',
-        self::OID_SUBJECT_KEY_IDENTIFIER => 'subjectKeyIdentifier',
-        self::OID_KEY_USAGE => 'keyUsage',
-        self::OID_PRIVATE_KEY_USAGE_PERIOD => 'privateKeyUsagePeriod',
-        self::OID_CERTIFICATE_POLICIES => 'certificatePolicies',
-        self::OID_POLICY_MAPPINGS => 'policyMappings',
-        self::OID_SUBJECT_ALT_NAME => 'subjectAltName',
-        self::OID_ISSUER_ALT_NAME => 'issuerAltName',
-        self::OID_SUBJECT_DIRECTORY_ATTRIBUTES => 'subjectDirectoryAttributes',
-        self::OID_BASIC_CONSTRAINTS => 'basicConstraints',
-        self::OID_NAME_CONSTRAINTS => 'nameConstraints',
-        self::OID_POLICY_CONSTRAINTS => 'policyConstraints',
-        self::OID_EXT_KEY_USAGE => 'extKeyUsage',
-        self::OID_CRL_DISTRIBUTION_POINTS => 'cRLDistributionPoints',
-        self::OID_INHIBIT_ANY_POLICY => 'inhibitAnyPolicy',
-        self::OID_FRESHEST_CRL => 'freshestCRL',
-        self::OID_NO_REV_AVAIL => 'noRevAvail',
-        self::OID_TARGET_INFORMATION => 'targetInformation',
-        self::OID_AUTHORITY_INFORMATION_ACCESS => 'authorityInfoAccess',
-        self::OID_AA_CONTROLS => 'aaControls',
-        self::OID_SUBJECT_INFORMATION_ACCESS => 'subjectInfoAccess',
-        self::OID_LOGOTYPE => 'logotype',
-    ];
+	/**
+	 * Mapping from extensions ID to short name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_OID_TO_NAME = [
+		self::OID_AUTHORITY_KEY_IDENTIFIER => 'authorityKeyIdentifier',
+		self::OID_SUBJECT_KEY_IDENTIFIER => 'subjectKeyIdentifier',
+		self::OID_KEY_USAGE => 'keyUsage',
+		self::OID_PRIVATE_KEY_USAGE_PERIOD => 'privateKeyUsagePeriod',
+		self::OID_CERTIFICATE_POLICIES => 'certificatePolicies',
+		self::OID_POLICY_MAPPINGS => 'policyMappings',
+		self::OID_SUBJECT_ALT_NAME => 'subjectAltName',
+		self::OID_ISSUER_ALT_NAME => 'issuerAltName',
+		self::OID_SUBJECT_DIRECTORY_ATTRIBUTES => 'subjectDirectoryAttributes',
+		self::OID_BASIC_CONSTRAINTS => 'basicConstraints',
+		self::OID_NAME_CONSTRAINTS => 'nameConstraints',
+		self::OID_POLICY_CONSTRAINTS => 'policyConstraints',
+		self::OID_EXT_KEY_USAGE => 'extKeyUsage',
+		self::OID_CRL_DISTRIBUTION_POINTS => 'cRLDistributionPoints',
+		self::OID_INHIBIT_ANY_POLICY => 'inhibitAnyPolicy',
+		self::OID_FRESHEST_CRL => 'freshestCRL',
+		self::OID_NO_REV_AVAIL => 'noRevAvail',
+		self::OID_TARGET_INFORMATION => 'targetInformation',
+		self::OID_AUTHORITY_INFORMATION_ACCESS => 'authorityInfoAccess',
+		self::OID_AA_CONTROLS => 'aaControls',
+		self::OID_SUBJECT_INFORMATION_ACCESS => 'subjectInfoAccess',
+		self::OID_LOGOTYPE => 'logotype',
+	];
 
-    /**
-     * Extension's OID.
-     *
-     * @var string
-     */
-    protected $_oid;
+	/**
+	 * Extension's OID.
+	 *
+	 * @var string
+	 */
+	protected $_oid;
 
-    /**
-     * Whether extension is critical.
-     *
-     * @var bool
-     */
-    protected $_critical;
+	/**
+	 * Whether extension is critical.
+	 *
+	 * @var bool
+	 */
+	protected $_critical;
 
-    /**
-     * Constructor.
-     *
-     * @param string $oid      Extension OID
-     * @param bool   $critical Whether extension is critical
-     */
-    public function __construct(string $oid, bool $critical)
-    {
-        $this->_oid = $oid;
-        $this->_critical = $critical;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $oid      Extension OID
+	 * @param bool   $critical Whether extension is critical
+	 */
+	public function __construct(string $oid, bool $critical)
+	{
+		$this->_oid = $oid;
+		$this->_critical = $critical;
+	}
 
-    /**
-     * @return string
-     */
-    public function __toString(): string
-    {
-        return $this->extensionName();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return $this->extensionName();
+	}
 
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     *
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): Extension
-    {
-        $idx = 0;
-        $extnID = $seq->at($idx++)->asObjectIdentifier()->oid();
-        $critical = false;
-        if ($seq->has($idx, Element::TYPE_BOOLEAN)) {
-            $critical = $seq->at($idx++)->asBoolean()->value();
-        }
-        $data = $seq->at($idx)->asOctetString()->string();
-        if (array_key_exists($extnID, self::MAP_OID_TO_CLASS)) {
-            $cls = self::MAP_OID_TO_CLASS[$extnID];
-            return $cls::_fromDER($data, $critical);
-        }
-        return UnknownExtension::fromRawString($extnID, $critical, $data);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 *
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): Extension
+	{
+		$idx = 0;
+		$extnID = $seq->at($idx++)->asObjectIdentifier()->oid();
+		$critical = false;
+		if ($seq->has($idx, Element::TYPE_BOOLEAN)) {
+			$critical = $seq->at($idx++)->asBoolean()->value();
+		}
+		$data = $seq->at($idx)->asOctetString()->string();
+		if (array_key_exists($extnID, self::MAP_OID_TO_CLASS)) {
+			$cls = self::MAP_OID_TO_CLASS[$extnID];
+			return $cls::_fromDER($data, $critical);
+		}
+		return UnknownExtension::fromRawString($extnID, $critical, $data);
+	}
 
-    /**
-     * Get extension OID.
-     *
-     * @return string
-     */
-    public function oid(): string
-    {
-        return $this->_oid;
-    }
+	/**
+	 * Get extension OID.
+	 *
+	 * @return string
+	 */
+	public function oid(): string
+	{
+		return $this->_oid;
+	}
 
-    /**
-     * Check whether extension is critical.
-     *
-     * @return bool
-     */
-    public function isCritical(): bool
-    {
-        return $this->_critical;
-    }
+	/**
+	 * Check whether extension is critical.
+	 *
+	 * @return bool
+	 */
+	public function isCritical(): bool
+	{
+		return $this->_critical;
+	}
 
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $elements = [new ObjectIdentifier($this->_oid)];
-        if ($this->_critical) {
-            $elements[] = new Boolean(true);
-        }
-        $elements[] = $this->_extnValue();
-        return new Sequence(...$elements);
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$elements = [new ObjectIdentifier($this->_oid)];
+		if ($this->_critical) {
+			$elements[] = new Boolean(true);
+		}
+		$elements[] = $this->_extnValue();
+		return new Sequence(...$elements);
+	}
 
-    /**
-     * Get short name of the extension.
-     *
-     * @return string
-     */
-    public function extensionName(): string
-    {
-        if (array_key_exists($this->_oid, self::MAP_OID_TO_NAME)) {
-            return self::MAP_OID_TO_NAME[$this->_oid];
-        }
-        return $this->oid();
-    }
+	/**
+	 * Get short name of the extension.
+	 *
+	 * @return string
+	 */
+	public function extensionName(): string
+	{
+		if (array_key_exists($this->_oid, self::MAP_OID_TO_NAME)) {
+			return self::MAP_OID_TO_NAME[$this->_oid];
+		}
+		return $this->oid();
+	}
 
-    /**
-     * Get ASN.1 structure of the extension value.
-     *
-     * @return Element
-     */
-    abstract protected function _valueASN1(): Element;
+	/**
+	 * Get ASN.1 structure of the extension value.
+	 *
+	 * @return Element
+	 */
+	abstract protected function _valueASN1(): Element;
 
-    /**
-     * Parse extension value from DER.
-     *
-     * @param string $data     DER data
-     * @param bool   $critical Whether extension is critical
-     *
-     * @throws \BadMethodCallException
-     *
-     * @return self
-     */
-    protected static function _fromDER(string $data, bool $critical): Extension
-    {
-        throw new \BadMethodCallException(
-            __FUNCTION__ . ' must be implemented in derived class.');
-    }
+	/**
+	 * Parse extension value from DER.
+	 *
+	 * @param string $data     DER data
+	 * @param bool   $critical Whether extension is critical
+	 *
+	 * @throws \BadMethodCallException
+	 *
+	 * @return self
+	 */
+	protected static function _fromDER(string $data, bool $critical): Extension
+	{
+		throw new \BadMethodCallException(
+			__FUNCTION__ . ' must be implemented in derived class.');
+	}
 
-    /**
-     * Get the extnValue element.
-     *
-     * @return OctetString
-     */
-    protected function _extnValue(): OctetString
-    {
-        return new OctetString($this->_valueASN1()->toDER());
-    }
+	/**
+	 * Get the extnValue element.
+	 *
+	 * @return OctetString
+	 */
+	protected function _extnValue(): OctetString
+	{
+		return new OctetString($this->_valueASN1()->toDER());
+	}
 }

lib/X509/Certificate/Extension/CRLDistributionPointsExtension.php

Indentation +79 added lines, -79 removed lines

@@ -16,89 +16,89 @@
  */
 class CRLDistributionPointsExtension extends Extension implements \Countable, \IteratorAggregate
 {
-    /**
-     * Distribution points.
-     *
-     * @var DistributionPoint[]
-     */
-    protected $_distributionPoints;
+	/**
+	 * Distribution points.
+	 *
+	 * @var DistributionPoint[]
+	 */
+	protected $_distributionPoints;
 
-    /**
-     * Constructor.
-     *
-     * @param bool              $critical
-     * @param DistributionPoint ...$distribution_points
-     */
-    public function __construct(bool $critical,
-        DistributionPoint ...$distribution_points)
-    {
-        parent::__construct(self::OID_CRL_DISTRIBUTION_POINTS, $critical);
-        $this->_distributionPoints = $distribution_points;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool              $critical
+	 * @param DistributionPoint ...$distribution_points
+	 */
+	public function __construct(bool $critical,
+		DistributionPoint ...$distribution_points)
+	{
+		parent::__construct(self::OID_CRL_DISTRIBUTION_POINTS, $critical);
+		$this->_distributionPoints = $distribution_points;
+	}
 
-    /**
-     * Get distribution points.
-     *
-     * @return DistributionPoint[]
-     */
-    public function distributionPoints(): array
-    {
-        return $this->_distributionPoints;
-    }
+	/**
+	 * Get distribution points.
+	 *
+	 * @return DistributionPoint[]
+	 */
+	public function distributionPoints(): array
+	{
+		return $this->_distributionPoints;
+	}
 
-    /**
-     * Get the number of distribution points.
-     *
-     * @see \Countable::count()
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_distributionPoints);
-    }
+	/**
+	 * Get the number of distribution points.
+	 *
+	 * @see \Countable::count()
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_distributionPoints);
+	}
 
-    /**
-     * Get iterator for distribution points.
-     *
-     * @see \IteratorAggregate::getIterator()
-     *
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_distributionPoints);
-    }
+	/**
+	 * Get iterator for distribution points.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 *
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_distributionPoints);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected static function _fromDER(string $data, bool $critical): Extension
-    {
-        $dps = array_map(
-            function (UnspecifiedType $el) {
-                return DistributionPoint::fromASN1($el->asSequence());
-            }, UnspecifiedType::fromDER($data)->asSequence()->elements());
-        if (!count($dps)) {
-            throw new \UnexpectedValueException(
-                'CRLDistributionPoints must have at least one DistributionPoint.');
-        }
-        // late static bound, extended by Freshest CRL extension
-        return new static($critical, ...$dps);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected static function _fromDER(string $data, bool $critical): Extension
+	{
+		$dps = array_map(
+			function (UnspecifiedType $el) {
+				return DistributionPoint::fromASN1($el->asSequence());
+			}, UnspecifiedType::fromDER($data)->asSequence()->elements());
+		if (!count($dps)) {
+			throw new \UnexpectedValueException(
+				'CRLDistributionPoints must have at least one DistributionPoint.');
+		}
+		// late static bound, extended by Freshest CRL extension
+		return new static($critical, ...$dps);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _valueASN1(): Element
-    {
-        if (!count($this->_distributionPoints)) {
-            throw new \LogicException('No distribution points.');
-        }
-        $elements = array_map(
-            function (DistributionPoint $dp) {
-                return $dp->toASN1();
-            }, $this->_distributionPoints);
-        return new Sequence(...$elements);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _valueASN1(): Element
+	{
+		if (!count($this->_distributionPoints)) {
+			throw new \LogicException('No distribution points.');
+		}
+		$elements = array_map(
+			function (DistributionPoint $dp) {
+				return $dp->toASN1();
+			}, $this->_distributionPoints);
+		return new Sequence(...$elements);
+	}
 }

lib/X509/Certificate/Extension/PolicyMappingsExtension.php

Indentation +150 added lines, -150 removed lines

@@ -17,164 +17,164 @@
  */
 class PolicyMappingsExtension extends Extension implements \Countable, \IteratorAggregate
 {
-    /**
-     * Policy mappings.
-     *
-     * @var PolicyMapping[]
-     */
-    protected $_mappings;
+	/**
+	 * Policy mappings.
+	 *
+	 * @var PolicyMapping[]
+	 */
+	protected $_mappings;
 
-    /**
-     * Constructor.
-     *
-     * @param bool          $critical
-     * @param PolicyMapping ...$mappings One or more PolicyMapping objects
-     */
-    public function __construct(bool $critical, PolicyMapping ...$mappings)
-    {
-        parent::__construct(self::OID_POLICY_MAPPINGS, $critical);
-        $this->_mappings = $mappings;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool          $critical
+	 * @param PolicyMapping ...$mappings One or more PolicyMapping objects
+	 */
+	public function __construct(bool $critical, PolicyMapping ...$mappings)
+	{
+		parent::__construct(self::OID_POLICY_MAPPINGS, $critical);
+		$this->_mappings = $mappings;
+	}
 
-    /**
-     * Get all mappings.
-     *
-     * @return PolicyMapping[]
-     */
-    public function mappings(): array
-    {
-        return $this->_mappings;
-    }
+	/**
+	 * Get all mappings.
+	 *
+	 * @return PolicyMapping[]
+	 */
+	public function mappings(): array
+	{
+		return $this->_mappings;
+	}
 
-    /**
-     * Get mappings flattened into a single array of arrays of subject domains
-     * keyed by issuer domain.
-     *
-     * Eg. if policy mappings contains multiple mappings with the same issuer
-     * domain policy, their corresponding subject domain policies are placed
-     * under the same key.
-     *
-     * @return (string[])[]
-     */
-    public function flattenedMappings(): array
-    {
-        $mappings = [];
-        foreach ($this->_mappings as $mapping) {
-            $idp = $mapping->issuerDomainPolicy();
-            if (!isset($mappings[$idp])) {
-                $mappings[$idp] = [];
-            }
-            array_push($mappings[$idp], $mapping->subjectDomainPolicy());
-        }
-        return $mappings;
-    }
+	/**
+	 * Get mappings flattened into a single array of arrays of subject domains
+	 * keyed by issuer domain.
+	 *
+	 * Eg. if policy mappings contains multiple mappings with the same issuer
+	 * domain policy, their corresponding subject domain policies are placed
+	 * under the same key.
+	 *
+	 * @return (string[])[]
+	 */
+	public function flattenedMappings(): array
+	{
+		$mappings = [];
+		foreach ($this->_mappings as $mapping) {
+			$idp = $mapping->issuerDomainPolicy();
+			if (!isset($mappings[$idp])) {
+				$mappings[$idp] = [];
+			}
+			array_push($mappings[$idp], $mapping->subjectDomainPolicy());
+		}
+		return $mappings;
+	}
 
-    /**
-     * Get all subject domain policy OIDs that are mapped to given issuer
-     * domain policy OID.
-     *
-     * @param string $oid Issuer domain policy
-     *
-     * @return string[] List of OIDs in dotted format
-     */
-    public function issuerMappings(string $oid): array
-    {
-        $oids = [];
-        foreach ($this->_mappings as $mapping) {
-            if ($mapping->issuerDomainPolicy() == $oid) {
-                $oids[] = $mapping->subjectDomainPolicy();
-            }
-        }
-        return $oids;
-    }
+	/**
+	 * Get all subject domain policy OIDs that are mapped to given issuer
+	 * domain policy OID.
+	 *
+	 * @param string $oid Issuer domain policy
+	 *
+	 * @return string[] List of OIDs in dotted format
+	 */
+	public function issuerMappings(string $oid): array
+	{
+		$oids = [];
+		foreach ($this->_mappings as $mapping) {
+			if ($mapping->issuerDomainPolicy() == $oid) {
+				$oids[] = $mapping->subjectDomainPolicy();
+			}
+		}
+		return $oids;
+	}
 
-    /**
-     * Get all mapped issuer domain policy OIDs.
-     *
-     * @return string[]
-     */
-    public function issuerDomainPolicies(): array
-    {
-        $idps = array_map(
-            function (PolicyMapping $mapping) {
-                return $mapping->issuerDomainPolicy();
-            }, $this->_mappings);
-        return array_values(array_unique($idps));
-    }
+	/**
+	 * Get all mapped issuer domain policy OIDs.
+	 *
+	 * @return string[]
+	 */
+	public function issuerDomainPolicies(): array
+	{
+		$idps = array_map(
+			function (PolicyMapping $mapping) {
+				return $mapping->issuerDomainPolicy();
+			}, $this->_mappings);
+		return array_values(array_unique($idps));
+	}
 
-    /**
-     * Check whether policy mappings have anyPolicy mapped.
-     *
-     * RFC 5280 section 4.2.1.5 states that "Policies MUST NOT be mapped either
-     * to or from the special value anyPolicy".
-     *
-     * @return bool
-     */
-    public function hasAnyPolicyMapping(): bool
-    {
-        foreach ($this->_mappings as $mapping) {
-            if (PolicyInformation::OID_ANY_POLICY === $mapping->issuerDomainPolicy()) {
-                return true;
-            }
-            if (PolicyInformation::OID_ANY_POLICY === $mapping->subjectDomainPolicy()) {
-                return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * Check whether policy mappings have anyPolicy mapped.
+	 *
+	 * RFC 5280 section 4.2.1.5 states that "Policies MUST NOT be mapped either
+	 * to or from the special value anyPolicy".
+	 *
+	 * @return bool
+	 */
+	public function hasAnyPolicyMapping(): bool
+	{
+		foreach ($this->_mappings as $mapping) {
+			if (PolicyInformation::OID_ANY_POLICY === $mapping->issuerDomainPolicy()) {
+				return true;
+			}
+			if (PolicyInformation::OID_ANY_POLICY === $mapping->subjectDomainPolicy()) {
+				return true;
+			}
+		}
+		return false;
+	}
 
-    /**
-     * Get the number of mappings.
-     *
-     * @see \Countable::count()
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_mappings);
-    }
+	/**
+	 * Get the number of mappings.
+	 *
+	 * @see \Countable::count()
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_mappings);
+	}
 
-    /**
-     * Get iterator for policy mappings.
-     *
-     * @see \IteratorAggregate::getIterator()
-     *
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_mappings);
-    }
+	/**
+	 * Get iterator for policy mappings.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 *
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_mappings);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected static function _fromDER(string $data, bool $critical): Extension
-    {
-        $mappings = array_map(
-            function (UnspecifiedType $el) {
-                return PolicyMapping::fromASN1($el->asSequence());
-            }, UnspecifiedType::fromDER($data)->asSequence()->elements());
-        if (!count($mappings)) {
-            throw new \UnexpectedValueException(
-                'PolicyMappings must have at least one mapping.');
-        }
-        return new self($critical, ...$mappings);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected static function _fromDER(string $data, bool $critical): Extension
+	{
+		$mappings = array_map(
+			function (UnspecifiedType $el) {
+				return PolicyMapping::fromASN1($el->asSequence());
+			}, UnspecifiedType::fromDER($data)->asSequence()->elements());
+		if (!count($mappings)) {
+			throw new \UnexpectedValueException(
+				'PolicyMappings must have at least one mapping.');
+		}
+		return new self($critical, ...$mappings);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _valueASN1(): Element
-    {
-        if (!count($this->_mappings)) {
-            throw new \LogicException('No mappings.');
-        }
-        $elements = array_map(
-            function (PolicyMapping $mapping) {
-                return $mapping->toASN1();
-            }, $this->_mappings);
-        return new Sequence(...$elements);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _valueASN1(): Element
+	{
+		if (!count($this->_mappings)) {
+			throw new \LogicException('No mappings.');
+		}
+		$elements = array_map(
+			function (PolicyMapping $mapping) {
+				return $mapping->toASN1();
+			}, $this->_mappings);
+		return new Sequence(...$elements);
+	}
 }

lib/X509/Certificate/Extension/SubjectKeyIdentifierExtension.php

Indentation +45 added lines, -45 removed lines

@@ -15,49 +15,49 @@
  */
 class SubjectKeyIdentifierExtension extends Extension
 {
-    /**
-     * Key identifier.
-     *
-     * @var string
-     */
-    protected $_keyIdentifier;
-
-    /**
-     * Constructor.
-     *
-     * @param bool   $critical
-     * @param string $keyIdentifier
-     */
-    public function __construct(bool $critical, string $keyIdentifier)
-    {
-        parent::__construct(self::OID_SUBJECT_KEY_IDENTIFIER, $critical);
-        $this->_keyIdentifier = $keyIdentifier;
-    }
-
-    /**
-     * Get key identifier.
-     *
-     * @return string
-     */
-    public function keyIdentifier(): string
-    {
-        return $this->_keyIdentifier;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected static function _fromDER(string $data, bool $critical): Extension
-    {
-        return new self($critical,
-            UnspecifiedType::fromDER($data)->asOctetString()->string());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function _valueASN1(): Element
-    {
-        return new OctetString($this->_keyIdentifier);
-    }
+	/**
+	 * Key identifier.
+	 *
+	 * @var string
+	 */
+	protected $_keyIdentifier;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param bool   $critical
+	 * @param string $keyIdentifier
+	 */
+	public function __construct(bool $critical, string $keyIdentifier)
+	{
+		parent::__construct(self::OID_SUBJECT_KEY_IDENTIFIER, $critical);
+		$this->_keyIdentifier = $keyIdentifier;
+	}
+
+	/**
+	 * Get key identifier.
+	 *
+	 * @return string
+	 */
+	public function keyIdentifier(): string
+	{
+		return $this->_keyIdentifier;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected static function _fromDER(string $data, bool $critical): Extension
+	{
+		return new self($critical,
+			UnspecifiedType::fromDER($data)->asOctetString()->string());
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _valueASN1(): Element
+	{
+		return new OctetString($this->_keyIdentifier);
+	}
 }

lib/X509/Certificate/Extension/PolicyMappings/PolicyMapping.php

Indentation +64 added lines, -64 removed lines

@@ -15,74 +15,74 @@
  */
 class PolicyMapping
 {
-    /**
-     * OID of the issuer policy.
-     *
-     * @var string
-     */
-    protected $_issuerDomainPolicy;
+	/**
+	 * OID of the issuer policy.
+	 *
+	 * @var string
+	 */
+	protected $_issuerDomainPolicy;
 
-    /**
-     * OID of the subject policy.
-     *
-     * @var string
-     */
-    protected $_subjectDomainPolicy;
+	/**
+	 * OID of the subject policy.
+	 *
+	 * @var string
+	 */
+	protected $_subjectDomainPolicy;
 
-    /**
-     * Constructor.
-     *
-     * @param string $issuer_policy  OID of the issuer policy
-     * @param string $subject_policy OID of the subject policy
-     */
-    public function __construct(string $issuer_policy, string $subject_policy)
-    {
-        $this->_issuerDomainPolicy = $issuer_policy;
-        $this->_subjectDomainPolicy = $subject_policy;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $issuer_policy  OID of the issuer policy
+	 * @param string $subject_policy OID of the subject policy
+	 */
+	public function __construct(string $issuer_policy, string $subject_policy)
+	{
+		$this->_issuerDomainPolicy = $issuer_policy;
+		$this->_subjectDomainPolicy = $subject_policy;
+	}
 
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     *
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        $issuer_policy = $seq->at(0)->asObjectIdentifier()->oid();
-        $subject_policy = $seq->at(1)->asObjectIdentifier()->oid();
-        return new self($issuer_policy, $subject_policy);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 *
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		$issuer_policy = $seq->at(0)->asObjectIdentifier()->oid();
+		$subject_policy = $seq->at(1)->asObjectIdentifier()->oid();
+		return new self($issuer_policy, $subject_policy);
+	}
 
-    /**
-     * Get issuer domain policy.
-     *
-     * @return string OID in dotted format
-     */
-    public function issuerDomainPolicy(): string
-    {
-        return $this->_issuerDomainPolicy;
-    }
+	/**
+	 * Get issuer domain policy.
+	 *
+	 * @return string OID in dotted format
+	 */
+	public function issuerDomainPolicy(): string
+	{
+		return $this->_issuerDomainPolicy;
+	}
 
-    /**
-     * Get subject domain policy.
-     *
-     * @return string OID in dotted format
-     */
-    public function subjectDomainPolicy(): string
-    {
-        return $this->_subjectDomainPolicy;
-    }
+	/**
+	 * Get subject domain policy.
+	 *
+	 * @return string OID in dotted format
+	 */
+	public function subjectDomainPolicy(): string
+	{
+		return $this->_subjectDomainPolicy;
+	}
 
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        return new Sequence(new ObjectIdentifier($this->_issuerDomainPolicy),
-            new ObjectIdentifier($this->_subjectDomainPolicy));
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		return new Sequence(new ObjectIdentifier($this->_issuerDomainPolicy),
+			new ObjectIdentifier($this->_subjectDomainPolicy));
+	}
 }