sop / x509

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

Indentation +34 added lines, -34 removed lines

@@ -16,41 +16,41 @@
  */
 class RelativeName extends DistributionPointName
 {
-    /**
-     * Relative distinguished name.
-     *
-     * @var RDN $_rdn
-     */
-    protected $_rdn;
+	/**
+	 * Relative distinguished name.
+	 *
+	 * @var RDN $_rdn
+	 */
+	protected $_rdn;
     
-    /**
-     * Constructor.
-     *
-     * @param RDN $rdn
-     */
-    public function __construct(RDN $rdn)
-    {
-        $this->_tag = self::TAG_RDN;
-        $this->_rdn = $rdn;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param RDN $rdn
+	 */
+	public function __construct(RDN $rdn)
+	{
+		$this->_tag = self::TAG_RDN;
+		$this->_rdn = $rdn;
+	}
     
-    /**
-     * Get RDN.
-     *
-     * @return RDN
-     */
-    public function rdn(): RDN
-    {
-        return $this->_rdn;
-    }
+	/**
+	 * Get RDN.
+	 *
+	 * @return RDN
+	 */
+	public function rdn(): RDN
+	{
+		return $this->_rdn;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return Set
-     */
-    protected function _valueASN1(): Set
-    {
-        return $this->_rdn->toASN1();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return Set
+	 */
+	protected function _valueASN1(): Set
+	{
+		return $this->_rdn->toASN1();
+	}
 }

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

Indentation +44 added lines, -44 removed lines

@@ -16,52 +16,52 @@
  */
 class FullName extends DistributionPointName
 {
-    /**
-     * Names.
-     *
-     * @var GeneralNames $_names
-     */
-    protected $_names;
+	/**
+	 * Names.
+	 *
+	 * @var GeneralNames $_names
+	 */
+	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}
-     * @return Sequence
-     */
-    protected function _valueASN1(): Sequence
-    {
-        return $this->_names->toASN1();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return Sequence
+	 */
+	protected function _valueASN1(): Sequence
+	{
+		return $this->_names->toASN1();
+	}
 }

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

Indentation +126 added lines, -126 removed lines

@@ -15,143 +15,143 @@
  */
 class ReasonFlags
 {
-    // const UNUSED = 0x100;
-    const KEY_COMPROMISE = 0x080;
-    const CA_COMPROMISE = 0x040;
-    const AFFILIATION_CHANGED = 0x020;
-    const SUPERSEDED = 0x010;
-    const CESSATION_OF_OPERATION = 0x008;
-    const CERTIFICATE_HOLD = 0x004;
-    const PRIVILEGE_WITHDRAWN = 0x002;
-    const AA_COMPROMISE = 0x001;
+	// const UNUSED = 0x100;
+	const KEY_COMPROMISE = 0x080;
+	const CA_COMPROMISE = 0x040;
+	const AFFILIATION_CHANGED = 0x020;
+	const SUPERSEDED = 0x010;
+	const CESSATION_OF_OPERATION = 0x008;
+	const CERTIFICATE_HOLD = 0x004;
+	const PRIVILEGE_WITHDRAWN = 0x002;
+	const AA_COMPROMISE = 0x001;
     
-    /**
-     * Flags.
-     *
-     * @var int $_flags
-     */
-    protected $_flags;
+	/**
+	 * Flags.
+	 *
+	 * @var int $_flags
+	 */
+	protected $_flags;
     
-    /**
-     * Constructor.
-     *
-     * @param int $flags
-     */
-    public function __construct(int $flags)
-    {
-        $this->_flags = $flags;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int $flags
+	 */
+	public function __construct(int $flags)
+	{
+		$this->_flags = $flags;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param BitString $bs
-     * @return self
-     */
-    public static function fromASN1(BitString $bs): self
-    {
-        return new self(Flags::fromBitString($bs, 9)->intNumber());
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param BitString $bs
+	 * @return self
+	 */
+	public static function fromASN1(BitString $bs): self
+	{
+		return new self(Flags::fromBitString($bs, 9)->intNumber());
+	}
     
-    /**
-     * Check whether keyCompromise flag is set.
-     *
-     * @return bool
-     */
-    public function isKeyCompromise(): bool
-    {
-        return $this->_flagSet(self::KEY_COMPROMISE);
-    }
+	/**
+	 * Check whether keyCompromise flag is set.
+	 *
+	 * @return bool
+	 */
+	public function isKeyCompromise(): bool
+	{
+		return $this->_flagSet(self::KEY_COMPROMISE);
+	}
     
-    /**
-     * Check whether cACompromise flag is set.
-     *
-     * @return bool
-     */
-    public function isCACompromise(): bool
-    {
-        return $this->_flagSet(self::CA_COMPROMISE);
-    }
+	/**
+	 * Check whether cACompromise flag is set.
+	 *
+	 * @return bool
+	 */
+	public function isCACompromise(): bool
+	{
+		return $this->_flagSet(self::CA_COMPROMISE);
+	}
     
-    /**
-     * Check whether affiliationChanged flag is set.
-     *
-     * @return bool
-     */
-    public function isAffiliationChanged(): bool
-    {
-        return $this->_flagSet(self::AFFILIATION_CHANGED);
-    }
+	/**
+	 * Check whether affiliationChanged flag is set.
+	 *
+	 * @return bool
+	 */
+	public function isAffiliationChanged(): bool
+	{
+		return $this->_flagSet(self::AFFILIATION_CHANGED);
+	}
     
-    /**
-     * Check whether superseded flag is set.
-     *
-     * @return bool
-     */
-    public function isSuperseded(): bool
-    {
-        return $this->_flagSet(self::SUPERSEDED);
-    }
+	/**
+	 * Check whether superseded flag is set.
+	 *
+	 * @return bool
+	 */
+	public function isSuperseded(): bool
+	{
+		return $this->_flagSet(self::SUPERSEDED);
+	}
     
-    /**
-     * Check whether cessationOfOperation flag is set.
-     *
-     * @return bool
-     */
-    public function isCessationOfOperation(): bool
-    {
-        return $this->_flagSet(self::CESSATION_OF_OPERATION);
-    }
+	/**
+	 * Check whether cessationOfOperation flag is set.
+	 *
+	 * @return bool
+	 */
+	public function isCessationOfOperation(): bool
+	{
+		return $this->_flagSet(self::CESSATION_OF_OPERATION);
+	}
     
-    /**
-     * Check whether certificateHold flag is set.
-     *
-     * @return bool
-     */
-    public function isCertificateHold(): bool
-    {
-        return $this->_flagSet(self::CERTIFICATE_HOLD);
-    }
+	/**
+	 * Check whether certificateHold flag is set.
+	 *
+	 * @return bool
+	 */
+	public function isCertificateHold(): bool
+	{
+		return $this->_flagSet(self::CERTIFICATE_HOLD);
+	}
     
-    /**
-     * Check whether privilegeWithdrawn flag is set.
-     *
-     * @return bool
-     */
-    public function isPrivilegeWithdrawn(): bool
-    {
-        return $this->_flagSet(self::PRIVILEGE_WITHDRAWN);
-    }
+	/**
+	 * Check whether privilegeWithdrawn flag is set.
+	 *
+	 * @return bool
+	 */
+	public function isPrivilegeWithdrawn(): bool
+	{
+		return $this->_flagSet(self::PRIVILEGE_WITHDRAWN);
+	}
     
-    /**
-     * Check whether aACompromise flag is set.
-     *
-     * @return bool
-     */
-    public function isAACompromise(): bool
-    {
-        return $this->_flagSet(self::AA_COMPROMISE);
-    }
+	/**
+	 * Check whether aACompromise flag is set.
+	 *
+	 * @return bool
+	 */
+	public function isAACompromise(): bool
+	{
+		return $this->_flagSet(self::AA_COMPROMISE);
+	}
     
-    /**
-     * Generate ASN.1 element.
-     *
-     * @return BitString
-     */
-    public function toASN1(): BitString
-    {
-        $flags = new Flags($this->_flags, 9);
-        return $flags->bitString()->withoutTrailingZeroes();
-    }
+	/**
+	 * Generate ASN.1 element.
+	 *
+	 * @return BitString
+	 */
+	public function toASN1(): BitString
+	{
+		$flags = new Flags($this->_flags, 9);
+		return $flags->bitString()->withoutTrailingZeroes();
+	}
     
-    /**
-     * Check whether given flag is set.
-     *
-     * @param int $flag
-     * @return boolean
-     */
-    protected function _flagSet(int $flag): bool
-    {
-        return (bool) ($this->_flags & $flag);
-    }
+	/**
+	 * Check whether given flag is set.
+	 *
+	 * @param int $flag
+	 * @return boolean
+	 */
+	protected function _flagSet(int $flag): bool
+	{
+		return (bool) ($this->_flags & $flag);
+	}
 }

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

Indentation +196 added lines, -196 removed lines

@@ -18,215 +18,215 @@
  */
 class DistributionPoint
 {
-    /**
-     * Distribution point name.
-     *
-     * @var DistributionPointName $_distributionPoint
-     */
-    protected $_distributionPoint;
+	/**
+	 * Distribution point name.
+	 *
+	 * @var DistributionPointName $_distributionPoint
+	 */
+	protected $_distributionPoint;
     
-    /**
-     * Revocation reason.
-     *
-     * @var ReasonFlags $_reasons
-     */
-    protected $_reasons;
+	/**
+	 * Revocation reason.
+	 *
+	 * @var ReasonFlags $_reasons
+	 */
+	protected $_reasons;
     
-    /**
-     * CRL issuer.
-     *
-     * @var GeneralNames $_issuer
-     */
-    protected $_issuer;
+	/**
+	 * CRL issuer.
+	 *
+	 * @var GeneralNames $_issuer
+	 */
+	protected $_issuer;
     
-    /**
-     * Constructor.
-     *
-     * @param DistributionPointName $name
-     * @param ReasonFlags $reasons
-     * @param GeneralNames $issuer
-     */
-    public function __construct(DistributionPointName $name = null,
-        ReasonFlags $reasons = null, GeneralNames $issuer = null)
-    {
-        $this->_distributionPoint = $name;
-        $this->_reasons = $reasons;
-        $this->_issuer = $issuer;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param DistributionPointName $name
+	 * @param ReasonFlags $reasons
+	 * @param 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);
-    }
+	/**
+	 * 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);
-    }
+	/**
+	 * Check whether distribution point name is set.
+	 *
+	 * @return bool
+	 */
+	public function hasDistributionPointName(): bool
+	{
+		return isset($this->_distributionPoint);
+	}
     
-    /**
-     * Get distribution point name.
-     *
-     * @throws \LogicException
-     * @return DistributionPointName
-     */
-    public function distributionPointName(): DistributionPointName
-    {
-        if (!$this->hasDistributionPointName()) {
-            throw new \LogicException("distributionPoint not set.");
-        }
-        return $this->_distributionPoint;
-    }
+	/**
+	 * Get distribution point name.
+	 *
+	 * @throws \LogicException
+	 * @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 $this->distributionPointName()->tag() ==
-             DistributionPointName::TAG_FULL_NAME;
-    }
+	/**
+	 * Check whether distribution point name is set and it's a full name.
+	 *
+	 * @return bool
+	 */
+	public function hasFullName(): bool
+	{
+		return $this->distributionPointName()->tag() ==
+			 DistributionPointName::TAG_FULL_NAME;
+	}
     
-    /**
-     * Get full distribution point name.
-     *
-     * @throws \LogicException
-     * @return FullName
-     */
-    public function fullName(): FullName
-    {
-        if (!$this->hasFullName()) {
-            throw new \LogicException("fullName not set.");
-        }
-        return $this->_distributionPoint;
-    }
+	/**
+	 * Get full distribution point name.
+	 *
+	 * @throws \LogicException
+	 * @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 $this->distributionPointName()->tag() ==
-             DistributionPointName::TAG_RDN;
-    }
+	/**
+	 * Check whether distribution point name is set and it's a relative name.
+	 *
+	 * @return bool
+	 */
+	public function hasRelativeName(): bool
+	{
+		return $this->distributionPointName()->tag() ==
+			 DistributionPointName::TAG_RDN;
+	}
     
-    /**
-     * Get relative distribution point name.
-     *
-     * @throws \LogicException
-     * @return RelativeName
-     */
-    public function relativeName(): RelativeName
-    {
-        if (!$this->hasRelativeName()) {
-            throw new \LogicException("nameRelativeToCRLIssuer not set.");
-        }
-        return $this->_distributionPoint;
-    }
+	/**
+	 * Get relative distribution point name.
+	 *
+	 * @throws \LogicException
+	 * @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);
-    }
+	/**
+	 * Check whether reasons flags is set.
+	 *
+	 * @return bool
+	 */
+	public function hasReasons(): bool
+	{
+		return isset($this->_reasons);
+	}
     
-    /**
-     * Get revocation reason flags.
-     *
-     * @throws \LogicException
-     * @return ReasonFlags
-     */
-    public function reasons(): ReasonFlags
-    {
-        if (!$this->hasReasons()) {
-            throw new \LogicException("reasons not set.");
-        }
-        return $this->_reasons;
-    }
+	/**
+	 * Get revocation reason flags.
+	 *
+	 * @throws \LogicException
+	 * @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);
-    }
+	/**
+	 * Check whether cRLIssuer is set.
+	 *
+	 * @return bool
+	 */
+	public function hasCRLIssuer(): bool
+	{
+		return isset($this->_issuer);
+	}
     
-    /**
-     * Get CRL issuer.
-     *
-     * @throws \LogicException
-     * @return GeneralNames
-     */
-    public function crlIssuer(): GeneralNames
-    {
-        if (!$this->hasCRLIssuer()) {
-            throw new \LogicException("crlIssuer not set.");
-        }
-        return $this->_issuer;
-    }
+	/**
+	 * Get CRL issuer.
+	 *
+	 * @throws \LogicException
+	 * @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 = array();
-        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);
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$elements = array();
+		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/BasicConstraintsExtension.php

Indentation +95 added lines, -95 removed lines

@@ -16,106 +16,106 @@
  */
 class BasicConstraintsExtension extends Extension
 {
-    /**
-     * Whether certificate is a CA.
-     *
-     * @var boolean $_ca
-     */
-    protected $_ca;
+	/**
+	 * Whether certificate is a CA.
+	 *
+	 * @var boolean $_ca
+	 */
+	protected $_ca;
     
-    /**
-     * Maximum certification path length.
-     *
-     * @var int|null $_pathLen
-     */
-    protected $_pathLen;
+	/**
+	 * Maximum certification path length.
+	 *
+	 * @var int|null $_pathLen
+	 */
+	protected $_pathLen;
     
-    /**
-     * Constructor.
-     *
-     * @param bool $critical
-     * @param bool $ca
-     * @param int|null $path_len
-     */
-    public function __construct(bool $critical, bool $ca, $path_len = null)
-    {
-        parent::__construct(self::OID_BASIC_CONSTRAINTS, $critical);
-        $this->_ca = $ca;
-        $this->_pathLen = isset($path_len) ? intval($path_len) : null;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool $critical
+	 * @param bool $ca
+	 * @param int|null $path_len
+	 */
+	public function __construct(bool $critical, bool $ca, $path_len = null)
+	{
+		parent::__construct(self::OID_BASIC_CONSTRAINTS, $critical);
+		$this->_ca = $ca;
+		$this->_pathLen = isset($path_len) ? intval($path_len) : null;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _fromDER(string $data, bool $critical): self
-    {
-        $seq = Sequence::fromDER($data);
-        $ca = false;
-        $path_len = null;
-        $idx = 0;
-        if ($seq->has($idx, Element::TYPE_BOOLEAN)) {
-            $ca = $seq->at($idx++)
-                ->asBoolean()
-                ->value();
-        }
-        if ($seq->has($idx, Element::TYPE_INTEGER)) {
-            $path_len = $seq->at($idx)
-                ->asInteger()
-                ->intNumber();
-        }
-        return new self($critical, $ca, $path_len);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _fromDER(string $data, bool $critical): self
+	{
+		$seq = Sequence::fromDER($data);
+		$ca = false;
+		$path_len = null;
+		$idx = 0;
+		if ($seq->has($idx, Element::TYPE_BOOLEAN)) {
+			$ca = $seq->at($idx++)
+				->asBoolean()
+				->value();
+		}
+		if ($seq->has($idx, Element::TYPE_INTEGER)) {
+			$path_len = $seq->at($idx)
+				->asInteger()
+				->intNumber();
+		}
+		return new self($critical, $ca, $path_len);
+	}
     
-    /**
-     * Whether certificate is a CA.
-     *
-     * @return bool
-     */
-    public function isCA(): bool
-    {
-        return $this->_ca;
-    }
+	/**
+	 * Whether certificate is a CA.
+	 *
+	 * @return bool
+	 */
+	public function isCA(): bool
+	{
+		return $this->_ca;
+	}
     
-    /**
-     * Whether path length is present.
-     *
-     * @return bool
-     */
-    public function hasPathLen(): bool
-    {
-        return isset($this->_pathLen);
-    }
+	/**
+	 * Whether path length is present.
+	 *
+	 * @return bool
+	 */
+	public function hasPathLen(): bool
+	{
+		return isset($this->_pathLen);
+	}
     
-    /**
-     * Get path length.
-     *
-     * @throws \LogicException
-     * @return int
-     */
-    public function pathLen(): int
-    {
-        if (!$this->hasPathLen()) {
-            throw new \LogicException("pathLenConstraint not set.");
-        }
-        return $this->_pathLen;
-    }
+	/**
+	 * Get path length.
+	 *
+	 * @throws \LogicException
+	 * @return int
+	 */
+	public function pathLen(): int
+	{
+		if (!$this->hasPathLen()) {
+			throw new \LogicException("pathLenConstraint not set.");
+		}
+		return $this->_pathLen;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return Sequence
-     */
-    protected function _valueASN1(): Sequence
-    {
-        $elements = array();
-        if ($this->_ca) {
-            $elements[] = new Boolean(true);
-        }
-        if (isset($this->_pathLen)) {
-            $elements[] = new Integer($this->_pathLen);
-        }
-        return new Sequence(...$elements);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return Sequence
+	 */
+	protected function _valueASN1(): Sequence
+	{
+		$elements = array();
+		if ($this->_ca) {
+			$elements[] = new Boolean(true);
+		}
+		if (isset($this->_pathLen)) {
+			$elements[] = new Integer($this->_pathLen);
+		}
+		return new Sequence(...$elements);
+	}
 }

lib/X509/Certificate/Extension/NameConstraintsExtension.php

Indentation +110 added lines, -110 removed lines

@@ -16,122 +16,122 @@
  */
 class NameConstraintsExtension extends Extension
 {
-    /**
-     * Permitted subtrees.
-     *
-     * @var GeneralSubtrees|null $_permitted
-     */
-    protected $_permitted;
+	/**
+	 * Permitted subtrees.
+	 *
+	 * @var GeneralSubtrees|null $_permitted
+	 */
+	protected $_permitted;
     
-    /**
-     * Excluded subtrees.
-     *
-     * @var GeneralSubtrees|null $_excluded
-     */
-    protected $_excluded;
+	/**
+	 * Excluded subtrees.
+	 *
+	 * @var GeneralSubtrees|null $_excluded
+	 */
+	protected $_excluded;
     
-    /**
-     * Constructor.
-     *
-     * @param bool $critical
-     * @param GeneralSubtrees $permitted
-     * @param GeneralSubtrees $excluded
-     */
-    public function __construct(bool $critical, GeneralSubtrees $permitted = null,
-        GeneralSubtrees $excluded = null)
-    {
-        parent::__construct(self::OID_NAME_CONSTRAINTS, $critical);
-        $this->_permitted = $permitted;
-        $this->_excluded = $excluded;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool $critical
+	 * @param GeneralSubtrees $permitted
+	 * @param GeneralSubtrees $excluded
+	 */
+	public function __construct(bool $critical, GeneralSubtrees $permitted = null,
+		GeneralSubtrees $excluded = null)
+	{
+		parent::__construct(self::OID_NAME_CONSTRAINTS, $critical);
+		$this->_permitted = $permitted;
+		$this->_excluded = $excluded;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _fromDER(string $data, bool $critical): self
-    {
-        $seq = Sequence::fromDER($data);
-        $permitted = null;
-        $excluded = null;
-        if ($seq->hasTagged(0)) {
-            $permitted = GeneralSubtrees::fromASN1(
-                $seq->getTagged(0)
-                    ->asImplicit(Element::TYPE_SEQUENCE)
-                    ->asSequence());
-        }
-        if ($seq->hasTagged(1)) {
-            $excluded = GeneralSubtrees::fromASN1(
-                $seq->getTagged(1)
-                    ->asImplicit(Element::TYPE_SEQUENCE)
-                    ->asSequence());
-        }
-        return new self($critical, $permitted, $excluded);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _fromDER(string $data, bool $critical): self
+	{
+		$seq = Sequence::fromDER($data);
+		$permitted = null;
+		$excluded = null;
+		if ($seq->hasTagged(0)) {
+			$permitted = GeneralSubtrees::fromASN1(
+				$seq->getTagged(0)
+					->asImplicit(Element::TYPE_SEQUENCE)
+					->asSequence());
+		}
+		if ($seq->hasTagged(1)) {
+			$excluded = GeneralSubtrees::fromASN1(
+				$seq->getTagged(1)
+					->asImplicit(Element::TYPE_SEQUENCE)
+					->asSequence());
+		}
+		return new self($critical, $permitted, $excluded);
+	}
     
-    /**
-     * Whether permitted subtrees are present.
-     *
-     * @return bool
-     */
-    public function hasPermittedSubtrees(): bool
-    {
-        return isset($this->_permitted);
-    }
+	/**
+	 * Whether permitted subtrees are present.
+	 *
+	 * @return bool
+	 */
+	public function hasPermittedSubtrees(): bool
+	{
+		return isset($this->_permitted);
+	}
     
-    /**
-     * Get permitted subtrees.
-     *
-     * @throws \LogicException
-     * @return GeneralSubtrees
-     */
-    public function permittedSubtrees(): GeneralSubtrees
-    {
-        if (!$this->hasPermittedSubtrees()) {
-            throw new \LogicException("No permitted subtrees.");
-        }
-        return $this->_permitted;
-    }
+	/**
+	 * Get permitted subtrees.
+	 *
+	 * @throws \LogicException
+	 * @return GeneralSubtrees
+	 */
+	public function permittedSubtrees(): GeneralSubtrees
+	{
+		if (!$this->hasPermittedSubtrees()) {
+			throw new \LogicException("No permitted subtrees.");
+		}
+		return $this->_permitted;
+	}
     
-    /**
-     * Whether excluded subtrees are present.
-     *
-     * @return bool
-     */
-    public function hasExcludedSubtrees(): bool
-    {
-        return isset($this->_excluded);
-    }
+	/**
+	 * Whether excluded subtrees are present.
+	 *
+	 * @return bool
+	 */
+	public function hasExcludedSubtrees(): bool
+	{
+		return isset($this->_excluded);
+	}
     
-    /**
-     * Get excluded subtrees.
-     *
-     * @throws \LogicException
-     * @return GeneralSubtrees
-     */
-    public function excludedSubtrees(): GeneralSubtrees
-    {
-        if (!$this->hasExcludedSubtrees()) {
-            throw new \LogicException("No excluded subtrees.");
-        }
-        return $this->_excluded;
-    }
+	/**
+	 * Get excluded subtrees.
+	 *
+	 * @throws \LogicException
+	 * @return GeneralSubtrees
+	 */
+	public function excludedSubtrees(): GeneralSubtrees
+	{
+		if (!$this->hasExcludedSubtrees()) {
+			throw new \LogicException("No excluded subtrees.");
+		}
+		return $this->_excluded;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return Sequence
-     */
-    protected function _valueASN1(): Sequence
-    {
-        $elements = array();
-        if (isset($this->_permitted)) {
-            $elements[] = new ImplicitlyTaggedType(0, $this->_permitted->toASN1());
-        }
-        if (isset($this->_excluded)) {
-            $elements[] = new ImplicitlyTaggedType(1, $this->_excluded->toASN1());
-        }
-        return new Sequence(...$elements);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return Sequence
+	 */
+	protected function _valueASN1(): Sequence
+	{
+		$elements = array();
+		if (isset($this->_permitted)) {
+			$elements[] = new ImplicitlyTaggedType(0, $this->_permitted->toASN1());
+		}
+		if (isset($this->_excluded)) {
+			$elements[] = new ImplicitlyTaggedType(1, $this->_excluded->toASN1());
+		}
+		return new Sequence(...$elements);
+	}
 }

lib/X509/Certificate/Extension/Extension.php

Indentation +199 added lines, -199 removed lines

@@ -19,214 +19,214 @@
  */
 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_AA_CONTROLS = "1.3.6.1.5.5.7.1.6";
+	// OID's from private certificate extensions arc
+	const OID_AA_CONTROLS = "1.3.6.1.5.5.7.1.6";
     
-    /**
-     * Mapping from extension ID to implementation class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_OID_TO_CLASS = array(
-        /* @formatter:off */
-        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_AA_CONTROLS => AAControlsExtension::class
-        /* @formatter:on */
-    );
+	/**
+	 * Mapping from extension ID to implementation class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_OID_TO_CLASS = array(
+		/* @formatter:off */
+		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_AA_CONTROLS => AAControlsExtension::class
+		/* @formatter:on */
+	);
     
-    /**
-     * Extension's OID.
-     *
-     * @var string $_oid
-     */
-    protected $_oid;
+	/**
+	 * Extension's OID.
+	 *
+	 * @var string $_oid
+	 */
+	protected $_oid;
     
-    /**
-     * Whether extension is critical.
-     *
-     * @var bool $_critical
-     */
-    protected $_critical;
+	/**
+	 * Whether extension is critical.
+	 *
+	 * @var bool $_critical
+	 */
+	protected $_critical;
     
-    /**
-     * Get ASN.1 structure of the extension value.
-     *
-     * @return Element
-     */
-    abstract protected function _valueASN1();
+	/**
+	 * Get ASN.1 structure of the extension value.
+	 *
+	 * @return Element
+	 */
+	abstract protected function _valueASN1();
     
-    /**
-     * 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)
-    {
-        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)
+	{
+		throw new \BadMethodCallException(
+			__FUNCTION__ . " must be implemented in derived class.");
+	}
     
-    /**
-     * 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;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): Extension
-    {
-        $extnID = $seq->at(0)
-            ->asObjectIdentifier()
-            ->oid();
-        $critical = false;
-        $idx = 1;
-        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 new UnknownExtension($extnID, $critical, new DERData($data));
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): Extension
+	{
+		$extnID = $seq->at(0)
+			->asObjectIdentifier()
+			->oid();
+		$critical = false;
+		$idx = 1;
+		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 new UnknownExtension($extnID, $critical, new DERData($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 = array(new ObjectIdentifier($this->_oid));
-        if ($this->_critical) {
-            $elements[] = new Boolean(true);
-        }
-        $elements[] = new OctetString($this->_valueASN1()->toDER());
-        return new Sequence(...$elements);
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$elements = array(new ObjectIdentifier($this->_oid));
+		if ($this->_critical) {
+			$elements[] = new Boolean(true);
+		}
+		$elements[] = new OctetString($this->_valueASN1()->toDER());
+		return new Sequence(...$elements);
+	}
 }

lib/X509/Certificate/Extension/SubjectDirectoryAttributesExtension.php

Indentation +47 added lines, -47 removed lines

@@ -15,55 +15,55 @@
  * @link https://tools.ietf.org/html/rfc5280#section-4.2.1.8
  */
 class SubjectDirectoryAttributesExtension extends Extension implements 
-    \Countable,
-    \IteratorAggregate
+	\Countable,
+	\IteratorAggregate
 {
-    use AttributeContainer;
+	use AttributeContainer;
     
-    /**
-     * Constructor.
-     *
-     * @param bool $critical
-     * @param Attribute ...$attribs One or more Attribute objects
-     */
-    public function __construct(bool $critical, Attribute ...$attribs)
-    {
-        parent::__construct(self::OID_SUBJECT_DIRECTORY_ATTRIBUTES, $critical);
-        $this->_attributes = $attribs;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool $critical
+	 * @param Attribute ...$attribs One or more Attribute objects
+	 */
+	public function __construct(bool $critical, Attribute ...$attribs)
+	{
+		parent::__construct(self::OID_SUBJECT_DIRECTORY_ATTRIBUTES, $critical);
+		$this->_attributes = $attribs;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _fromDER(string $data, bool $critical): self
-    {
-        $attribs = array_map(
-            function (UnspecifiedType $el) {
-                return Attribute::fromASN1($el->asSequence());
-            }, Sequence::fromDER($data)->elements());
-        if (!count($attribs)) {
-            throw new \UnexpectedValueException(
-                "SubjectDirectoryAttributes must have at least one Attribute.");
-        }
-        return new self($critical, ...$attribs);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _fromDER(string $data, bool $critical): self
+	{
+		$attribs = array_map(
+			function (UnspecifiedType $el) {
+				return Attribute::fromASN1($el->asSequence());
+			}, Sequence::fromDER($data)->elements());
+		if (!count($attribs)) {
+			throw new \UnexpectedValueException(
+				"SubjectDirectoryAttributes must have at least one Attribute.");
+		}
+		return new self($critical, ...$attribs);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return Sequence
-     */
-    protected function _valueASN1(): Sequence
-    {
-        if (!count($this->_attributes)) {
-            throw new \LogicException("No attributes");
-        }
-        $elements = array_map(
-            function (Attribute $attr) {
-                return $attr->toASN1();
-            }, array_values($this->_attributes));
-        return new Sequence(...$elements);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return Sequence
+	 */
+	protected function _valueASN1(): Sequence
+	{
+		if (!count($this->_attributes)) {
+			throw new \LogicException("No attributes");
+		}
+		$elements = array_map(
+			function (Attribute $attr) {
+				return $attr->toASN1();
+			}, array_values($this->_attributes));
+		return new Sequence(...$elements);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     protected static function _fromDER(string $data, bool $critical): self
     {
         $attribs = array_map(
-            function (UnspecifiedType $el) {
+            function(UnspecifiedType $el) {
                 return Attribute::fromASN1($el->asSequence());
             }, Sequence::fromDER($data)->elements());
         if (!count($attribs)) {
@@ -61,7 +61,7 @@ 
             throw new \LogicException("No attributes");
         }
         $elements = array_map(
-            function (Attribute $attr) {
+            function(Attribute $attr) {
                 return $attr->toASN1();
             }, array_values($this->_attributes));
         return new Sequence(...$elements);

lib/X509/Certificate/Extension/TargetInformationExtension.php

Spacing +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
     protected static function _fromDER(string $data, bool $critical): self
     {
         $targets = array_map(
-            function (UnspecifiedType $el) {
+            function(UnspecifiedType $el) {
                 return Targets::fromASN1($el->asSequence());
             }, Sequence::fromDER($data)->elements());
         return new self($critical, ...$targets);
@@ -128,7 +128,7 @@ 
     protected function _valueASN1(): Sequence
     {
         $elements = array_map(
-            function (Targets $targets) {
+            function(Targets $targets) {
                 return $targets->toASN1();
             }, $this->_targets);
         return new Sequence(...$elements);

Indentation +123 added lines, -123 removed lines

@@ -19,139 +19,139 @@
  * @link https://tools.ietf.org/html/rfc5755#section-4.3.2
  */
 class TargetInformationExtension extends Extension implements 
-    \Countable,
-    \IteratorAggregate
+	\Countable,
+	\IteratorAggregate
 {
-    /**
-     * Targets elements.
-     *
-     * @var Targets[] $_targets
-     */
-    protected $_targets;
+	/**
+	 * Targets elements.
+	 *
+	 * @var Targets[] $_targets
+	 */
+	protected $_targets;
     
-    /**
-     * Targets[] merged to single Targets.
-     *
-     * @var Targets|null
-     */
-    private $_merged;
+	/**
+	 * Targets[] merged to single Targets.
+	 *
+	 * @var Targets|null
+	 */
+	private $_merged;
     
-    /**
-     * Constructor.
-     *
-     * @param bool $critical
-     * @param Targets ...$targets
-     */
-    public function __construct(bool $critical, Targets ...$targets)
-    {
-        parent::__construct(self::OID_TARGET_INFORMATION, $critical);
-        $this->_targets = $targets;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool $critical
+	 * @param Targets ...$targets
+	 */
+	public function __construct(bool $critical, Targets ...$targets)
+	{
+		parent::__construct(self::OID_TARGET_INFORMATION, $critical);
+		$this->_targets = $targets;
+	}
     
-    /**
-     * Initialize from one or more Target objects.
-     *
-     * Extension criticality shall be set to true as specified by RFC 5755.
-     *
-     * @param Target ...$target
-     * @return TargetInformationExtension
-     */
-    public static function fromTargets(Target ...$target): self
-    {
-        return new self(true, new Targets(...$target));
-    }
+	/**
+	 * Initialize from one or more Target objects.
+	 *
+	 * Extension criticality shall be set to true as specified by RFC 5755.
+	 *
+	 * @param Target ...$target
+	 * @return TargetInformationExtension
+	 */
+	public static function fromTargets(Target ...$target): self
+	{
+		return new self(true, new Targets(...$target));
+	}
     
-    /**
-     * Reset internal state on clone.
-     */
-    public function __clone()
-    {
-        $this->_merged = null;
-    }
+	/**
+	 * Reset internal state on clone.
+	 */
+	public function __clone()
+	{
+		$this->_merged = null;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _fromDER(string $data, bool $critical): self
-    {
-        $targets = array_map(
-            function (UnspecifiedType $el) {
-                return Targets::fromASN1($el->asSequence());
-            }, Sequence::fromDER($data)->elements());
-        return new self($critical, ...$targets);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _fromDER(string $data, bool $critical): self
+	{
+		$targets = array_map(
+			function (UnspecifiedType $el) {
+				return Targets::fromASN1($el->asSequence());
+			}, Sequence::fromDER($data)->elements());
+		return new self($critical, ...$targets);
+	}
     
-    /**
-     * Get all targets.
-     *
-     * @return Targets
-     */
-    public function targets(): Targets
-    {
-        if (!isset($this->_merged)) {
-            $a = array();
-            foreach ($this->_targets as $targets) {
-                $a = array_merge($a, $targets->all());
-            }
-            $this->_merged = new Targets(...$a);
-        }
-        return $this->_merged;
-    }
+	/**
+	 * Get all targets.
+	 *
+	 * @return Targets
+	 */
+	public function targets(): Targets
+	{
+		if (!isset($this->_merged)) {
+			$a = array();
+			foreach ($this->_targets as $targets) {
+				$a = array_merge($a, $targets->all());
+			}
+			$this->_merged = new Targets(...$a);
+		}
+		return $this->_merged;
+	}
     
-    /**
-     * Get all name targets.
-     *
-     * @return Target[]
-     */
-    public function names(): array
-    {
-        return $this->targets()->nameTargets();
-    }
+	/**
+	 * Get all name targets.
+	 *
+	 * @return Target[]
+	 */
+	public function names(): array
+	{
+		return $this->targets()->nameTargets();
+	}
     
-    /**
-     * Get all group targets.
-     *
-     * @return Target[]
-     */
-    public function groups(): array
-    {
-        return $this->targets()->groupTargets();
-    }
+	/**
+	 * Get all group targets.
+	 *
+	 * @return Target[]
+	 */
+	public function groups(): array
+	{
+		return $this->targets()->groupTargets();
+	}
     
-    /**
-     *
-     * @see \X509\Certificate\Extension\Extension::_valueASN1()
-     * @return Sequence
-     */
-    protected function _valueASN1(): Sequence
-    {
-        $elements = array_map(
-            function (Targets $targets) {
-                return $targets->toASN1();
-            }, $this->_targets);
-        return new Sequence(...$elements);
-    }
+	/**
+	 *
+	 * @see \X509\Certificate\Extension\Extension::_valueASN1()
+	 * @return Sequence
+	 */
+	protected function _valueASN1(): Sequence
+	{
+		$elements = array_map(
+			function (Targets $targets) {
+				return $targets->toASN1();
+			}, $this->_targets);
+		return new Sequence(...$elements);
+	}
     
-    /**
-     *
-     * @see \Countable::count()
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->targets());
-    }
+	/**
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->targets());
+	}
     
-    /**
-     * Get iterator for targets.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->targets()->all());
-    }
+	/**
+	 * Get iterator for targets.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->targets()->all());
+	}
 }