sop / x509

lib/X509/CertificationPath/PathBuilding/CertificationPathBuilder.php

Indentation +128 added lines, -128 removed lines

@@ -16,137 +16,137 @@
  */
 class CertificationPathBuilder
 {
-    /**
-     * Trust anchors.
-     *
-     * @var CertificateBundle
-     */
-    protected $_trustList;
+	/**
+	 * Trust anchors.
+	 *
+	 * @var CertificateBundle
+	 */
+	protected $_trustList;
     
-    /**
-     * Constructor.
-     *
-     * @param CertificateBundle $trust_list List of trust anchors
-     */
-    public function __construct(CertificateBundle $trust_list)
-    {
-        $this->_trustList = $trust_list;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param CertificateBundle $trust_list List of trust anchors
+	 */
+	public function __construct(CertificateBundle $trust_list)
+	{
+		$this->_trustList = $trust_list;
+	}
     
-    /**
-     * Get all certification paths to given target certificate from
-     * any trust anchor.
-     *
-     * @param Certificate $target Target certificate
-     * @param CertificateBundle|null $intermediate Optional intermediate
-     *        certificates
-     * @return CertificationPath[]
-     */
-    public function allPathsToTarget(Certificate $target,
-        CertificateBundle $intermediate = null): array
-    {
-        $paths = $this->_resolvePathsToTarget($target, $intermediate);
-        // map paths to CertificationPath objects
-        return array_map(
-            function ($certs) {
-                return new CertificationPath(...$certs);
-            }, $paths);
-    }
+	/**
+	 * Get all certification paths to given target certificate from
+	 * any trust anchor.
+	 *
+	 * @param Certificate $target Target certificate
+	 * @param CertificateBundle|null $intermediate Optional intermediate
+	 *        certificates
+	 * @return CertificationPath[]
+	 */
+	public function allPathsToTarget(Certificate $target,
+		CertificateBundle $intermediate = null): array
+	{
+		$paths = $this->_resolvePathsToTarget($target, $intermediate);
+		// map paths to CertificationPath objects
+		return array_map(
+			function ($certs) {
+				return new CertificationPath(...$certs);
+			}, $paths);
+	}
     
-    /**
-     * Resolve all possible certification paths from any trust anchor to
-     * the target certificate, using optional intermediate certificates.
-     *
-     * Helper method for allPathsToTarget to be called recursively.
-     *
-     * @todo Implement loop detection
-     * @param Certificate $target
-     * @param CertificateBundle $intermediate
-     * @return array[] Array of arrays containing path certificates
-     */
-    private function _resolvePathsToTarget(Certificate $target,
-        CertificateBundle $intermediate = null): array
-    {
-        // array of possible paths
-        $paths = array();
-        // signed by certificate in the trust list
-        foreach ($this->_findIssuers($target, $this->_trustList) as $issuer) {
-            // if target is self-signed, path consists of only
-            // the target certificate
-            if ($target->equals($issuer)) {
-                $paths[] = array($target);
-            } else {
-                $paths[] = array($issuer, $target);
-            }
-        }
-        if (isset($intermediate)) {
-            // signed by intermediate certificate
-            foreach ($this->_findIssuers($target, $intermediate) as $issuer) {
-                // intermediate certificate must not be self-signed
-                if ($issuer->isSelfIssued()) {
-                    continue;
-                }
-                // resolve paths to issuer
-                $subpaths = $this->_resolvePathsToTarget($issuer, $intermediate);
-                foreach ($subpaths as $path) {
-                    $paths[] = array_merge($path, array($target));
-                }
-            }
-        }
-        return $paths;
-    }
+	/**
+	 * Resolve all possible certification paths from any trust anchor to
+	 * the target certificate, using optional intermediate certificates.
+	 *
+	 * Helper method for allPathsToTarget to be called recursively.
+	 *
+	 * @todo Implement loop detection
+	 * @param Certificate $target
+	 * @param CertificateBundle $intermediate
+	 * @return array[] Array of arrays containing path certificates
+	 */
+	private function _resolvePathsToTarget(Certificate $target,
+		CertificateBundle $intermediate = null): array
+	{
+		// array of possible paths
+		$paths = array();
+		// signed by certificate in the trust list
+		foreach ($this->_findIssuers($target, $this->_trustList) as $issuer) {
+			// if target is self-signed, path consists of only
+			// the target certificate
+			if ($target->equals($issuer)) {
+				$paths[] = array($target);
+			} else {
+				$paths[] = array($issuer, $target);
+			}
+		}
+		if (isset($intermediate)) {
+			// signed by intermediate certificate
+			foreach ($this->_findIssuers($target, $intermediate) as $issuer) {
+				// intermediate certificate must not be self-signed
+				if ($issuer->isSelfIssued()) {
+					continue;
+				}
+				// resolve paths to issuer
+				$subpaths = $this->_resolvePathsToTarget($issuer, $intermediate);
+				foreach ($subpaths as $path) {
+					$paths[] = array_merge($path, array($target));
+				}
+			}
+		}
+		return $paths;
+	}
     
-    /**
-     * Get shortest path to given target certificate from any trust anchor.
-     *
-     * @param Certificate $target Target certificate
-     * @param CertificateBundle|null $intermediate Optional intermediate
-     *        certificates
-     * @throws PathBuildingException
-     * @return CertificationPath
-     */
-    public function shortestPathToTarget(Certificate $target,
-        CertificateBundle $intermediate = null): CertificationPath
-    {
-        $paths = $this->allPathsToTarget($target, $intermediate);
-        if (!count($paths)) {
-            throw new PathBuildingException("No certification paths.");
-        }
-        usort($paths,
-            function ($a, $b) {
-                return count($a) < count($b) ? -1 : 1;
-            });
-        return reset($paths);
-    }
+	/**
+	 * Get shortest path to given target certificate from any trust anchor.
+	 *
+	 * @param Certificate $target Target certificate
+	 * @param CertificateBundle|null $intermediate Optional intermediate
+	 *        certificates
+	 * @throws PathBuildingException
+	 * @return CertificationPath
+	 */
+	public function shortestPathToTarget(Certificate $target,
+		CertificateBundle $intermediate = null): CertificationPath
+	{
+		$paths = $this->allPathsToTarget($target, $intermediate);
+		if (!count($paths)) {
+			throw new PathBuildingException("No certification paths.");
+		}
+		usort($paths,
+			function ($a, $b) {
+				return count($a) < count($b) ? -1 : 1;
+			});
+		return reset($paths);
+	}
     
-    /**
-     * Find all issuers of the target certificate from a given bundle.
-     *
-     * @param Certificate $target Target certificate
-     * @param CertificateBundle $bundle Certificates to search
-     * @return Certificate[]
-     */
-    protected function _findIssuers(Certificate $target,
-        CertificateBundle $bundle): array
-    {
-        $issuers = array();
-        $issuer_name = $target->tbsCertificate()->issuer();
-        $extensions = $target->tbsCertificate()->extensions();
-        // find by authority key identifier
-        if ($extensions->hasAuthorityKeyIdentifier()) {
-            $ext = $extensions->authorityKeyIdentifier();
-            if ($ext->hasKeyIdentifier()) {
-                foreach ($bundle->allBySubjectKeyIdentifier(
-                    $ext->keyIdentifier()) as $issuer) {
-                    // check that issuer name matches
-                    if ($issuer->tbsCertificate()
-                        ->subject()
-                        ->equals($issuer_name)) {
-                        $issuers[] = $issuer;
-                    }
-                }
-            }
-        }
-        return $issuers;
-    }
+	/**
+	 * Find all issuers of the target certificate from a given bundle.
+	 *
+	 * @param Certificate $target Target certificate
+	 * @param CertificateBundle $bundle Certificates to search
+	 * @return Certificate[]
+	 */
+	protected function _findIssuers(Certificate $target,
+		CertificateBundle $bundle): array
+	{
+		$issuers = array();
+		$issuer_name = $target->tbsCertificate()->issuer();
+		$extensions = $target->tbsCertificate()->extensions();
+		// find by authority key identifier
+		if ($extensions->hasAuthorityKeyIdentifier()) {
+			$ext = $extensions->authorityKeyIdentifier();
+			if ($ext->hasKeyIdentifier()) {
+				foreach ($bundle->allBySubjectKeyIdentifier(
+					$ext->keyIdentifier()) as $issuer) {
+					// check that issuer name matches
+					if ($issuer->tbsCertificate()
+						->subject()
+						->equals($issuer_name)) {
+						$issuers[] = $issuer;
+					}
+				}
+			}
+		}
+		return $issuers;
+	}
 }

lib/X509/CertificationRequest/CertificationRequestInfo.php

Indentation +200 added lines, -200 removed lines

@@ -24,204 +24,204 @@
  */
 class CertificationRequestInfo
 {
-    const VERSION_1 = 0;
-    
-    /**
-     * Version.
-     *
-     * @var int
-     */
-    protected $_version;
-    
-    /**
-     * Subject.
-     *
-     * @var Name $_subject
-     */
-    protected $_subject;
-    
-    /**
-     * Public key info.
-     *
-     * @var PublicKeyInfo $_subjectPKInfo
-     */
-    protected $_subjectPKInfo;
-    
-    /**
-     * Attributes.
-     *
-     * @var Attributes|null $_attributes
-     */
-    protected $_attributes;
-    
-    /**
-     * Constructor.
-     *
-     * @param Name $subject Subject
-     * @param PublicKeyInfo $pkinfo Public key info
-     */
-    public function __construct(Name $subject, PublicKeyInfo $pkinfo)
-    {
-        $this->_version = self::VERSION_1;
-        $this->_subject = $subject;
-        $this->_subjectPKInfo = $pkinfo;
-    }
-    
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        $version = $seq->at(0)
-            ->asInteger()
-            ->intNumber();
-        if ($version != self::VERSION_1) {
-            throw new \UnexpectedValueException(
-                "Version $version not supported.");
-        }
-        $subject = Name::fromASN1($seq->at(1)->asSequence());
-        $pkinfo = PublicKeyInfo::fromASN1($seq->at(2)->asSequence());
-        $obj = new self($subject, $pkinfo);
-        if ($seq->hasTagged(0)) {
-            $obj->_attributes = Attributes::fromASN1(
-                $seq->getTagged(0)
-                    ->asImplicit(Element::TYPE_SET)
-                    ->asSet());
-        }
-        return $obj;
-    }
-    
-    /**
-     * Get version.
-     *
-     * @return int
-     */
-    public function version(): int
-    {
-        return $this->_version;
-    }
-    
-    /**
-     * Get self with subject.
-     *
-     * @param Name $subject
-     * @return self
-     */
-    public function withSubject(Name $subject): self
-    {
-        $obj = clone $this;
-        $obj->_subject = $subject;
-        return $obj;
-    }
-    
-    /**
-     * Get subject.
-     *
-     * @return Name
-     */
-    public function subject(): Name
-    {
-        return $this->_subject;
-    }
-    
-    /**
-     * Get subject public key info.
-     *
-     * @return PublicKeyInfo
-     */
-    public function subjectPKInfo(): PublicKeyInfo
-    {
-        return $this->_subjectPKInfo;
-    }
-    
-    /**
-     * Whether certification request info has attributes.
-     *
-     * @return bool
-     */
-    public function hasAttributes(): bool
-    {
-        return isset($this->_attributes);
-    }
-    
-    /**
-     * Get attributes.
-     *
-     * @throws \LogicException
-     * @return Attributes
-     */
-    public function attributes(): Attributes
-    {
-        if (!$this->hasAttributes()) {
-            throw new \LogicException("No attributes.");
-        }
-        return $this->_attributes;
-    }
-    
-    /**
-     * Get instance of self with attributes.
-     *
-     * @param Attributes $attribs
-     */
-    public function withAttributes(Attributes $attribs): self
-    {
-        $obj = clone $this;
-        $obj->_attributes = $attribs;
-        return $obj;
-    }
-    
-    /**
-     * Get self with extension request attribute.
-     *
-     * @param Extensions $extensions Extensions to request
-     * @return self
-     */
-    public function withExtensionRequest(Extensions $extensions): self
-    {
-        $obj = clone $this;
-        if (!isset($obj->_attributes)) {
-            $obj->_attributes = new Attributes();
-        }
-        $obj->_attributes = $obj->_attributes->withUnique(
-            Attribute::fromAttributeValues(
-                new ExtensionRequestValue($extensions)));
-        return $obj;
-    }
-    
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $elements = array(new Integer($this->_version),
-            $this->_subject->toASN1(), $this->_subjectPKInfo->toASN1());
-        if (isset($this->_attributes)) {
-            $elements[] = new ImplicitlyTaggedType(0,
-                $this->_attributes->toASN1());
-        }
-        return new Sequence(...$elements);
-    }
-    
-    /**
-     * Create signed CertificationRequest.
-     *
-     * @param SignatureAlgorithmIdentifier $algo Algorithm used for signing
-     * @param PrivateKeyInfo $privkey_info Private key used for signing
-     * @param Crypto|null $crypto Crypto engine, use default if not set
-     * @return CertificationRequest
-     */
-    public function sign(SignatureAlgorithmIdentifier $algo,
-        PrivateKeyInfo $privkey_info, Crypto $crypto = null): CertificationRequest
-    {
-        $crypto = $crypto ?: Crypto::getDefault();
-        $data = $this->toASN1()->toDER();
-        $signature = $crypto->sign($data, $privkey_info, $algo);
-        return new CertificationRequest($this, $algo, $signature);
-    }
+	const VERSION_1 = 0;
+    
+	/**
+	 * Version.
+	 *
+	 * @var int
+	 */
+	protected $_version;
+    
+	/**
+	 * Subject.
+	 *
+	 * @var Name $_subject
+	 */
+	protected $_subject;
+    
+	/**
+	 * Public key info.
+	 *
+	 * @var PublicKeyInfo $_subjectPKInfo
+	 */
+	protected $_subjectPKInfo;
+    
+	/**
+	 * Attributes.
+	 *
+	 * @var Attributes|null $_attributes
+	 */
+	protected $_attributes;
+    
+	/**
+	 * Constructor.
+	 *
+	 * @param Name $subject Subject
+	 * @param PublicKeyInfo $pkinfo Public key info
+	 */
+	public function __construct(Name $subject, PublicKeyInfo $pkinfo)
+	{
+		$this->_version = self::VERSION_1;
+		$this->_subject = $subject;
+		$this->_subjectPKInfo = $pkinfo;
+	}
+    
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		$version = $seq->at(0)
+			->asInteger()
+			->intNumber();
+		if ($version != self::VERSION_1) {
+			throw new \UnexpectedValueException(
+				"Version $version not supported.");
+		}
+		$subject = Name::fromASN1($seq->at(1)->asSequence());
+		$pkinfo = PublicKeyInfo::fromASN1($seq->at(2)->asSequence());
+		$obj = new self($subject, $pkinfo);
+		if ($seq->hasTagged(0)) {
+			$obj->_attributes = Attributes::fromASN1(
+				$seq->getTagged(0)
+					->asImplicit(Element::TYPE_SET)
+					->asSet());
+		}
+		return $obj;
+	}
+    
+	/**
+	 * Get version.
+	 *
+	 * @return int
+	 */
+	public function version(): int
+	{
+		return $this->_version;
+	}
+    
+	/**
+	 * Get self with subject.
+	 *
+	 * @param Name $subject
+	 * @return self
+	 */
+	public function withSubject(Name $subject): self
+	{
+		$obj = clone $this;
+		$obj->_subject = $subject;
+		return $obj;
+	}
+    
+	/**
+	 * Get subject.
+	 *
+	 * @return Name
+	 */
+	public function subject(): Name
+	{
+		return $this->_subject;
+	}
+    
+	/**
+	 * Get subject public key info.
+	 *
+	 * @return PublicKeyInfo
+	 */
+	public function subjectPKInfo(): PublicKeyInfo
+	{
+		return $this->_subjectPKInfo;
+	}
+    
+	/**
+	 * Whether certification request info has attributes.
+	 *
+	 * @return bool
+	 */
+	public function hasAttributes(): bool
+	{
+		return isset($this->_attributes);
+	}
+    
+	/**
+	 * Get attributes.
+	 *
+	 * @throws \LogicException
+	 * @return Attributes
+	 */
+	public function attributes(): Attributes
+	{
+		if (!$this->hasAttributes()) {
+			throw new \LogicException("No attributes.");
+		}
+		return $this->_attributes;
+	}
+    
+	/**
+	 * Get instance of self with attributes.
+	 *
+	 * @param Attributes $attribs
+	 */
+	public function withAttributes(Attributes $attribs): self
+	{
+		$obj = clone $this;
+		$obj->_attributes = $attribs;
+		return $obj;
+	}
+    
+	/**
+	 * Get self with extension request attribute.
+	 *
+	 * @param Extensions $extensions Extensions to request
+	 * @return self
+	 */
+	public function withExtensionRequest(Extensions $extensions): self
+	{
+		$obj = clone $this;
+		if (!isset($obj->_attributes)) {
+			$obj->_attributes = new Attributes();
+		}
+		$obj->_attributes = $obj->_attributes->withUnique(
+			Attribute::fromAttributeValues(
+				new ExtensionRequestValue($extensions)));
+		return $obj;
+	}
+    
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$elements = array(new Integer($this->_version),
+			$this->_subject->toASN1(), $this->_subjectPKInfo->toASN1());
+		if (isset($this->_attributes)) {
+			$elements[] = new ImplicitlyTaggedType(0,
+				$this->_attributes->toASN1());
+		}
+		return new Sequence(...$elements);
+	}
+    
+	/**
+	 * Create signed CertificationRequest.
+	 *
+	 * @param SignatureAlgorithmIdentifier $algo Algorithm used for signing
+	 * @param PrivateKeyInfo $privkey_info Private key used for signing
+	 * @param Crypto|null $crypto Crypto engine, use default if not set
+	 * @return CertificationRequest
+	 */
+	public function sign(SignatureAlgorithmIdentifier $algo,
+		PrivateKeyInfo $privkey_info, Crypto $crypto = null): CertificationRequest
+	{
+		$crypto = $crypto ?: Crypto::getDefault();
+		$data = $this->toASN1()->toDER();
+		$signature = $crypto->sign($data, $privkey_info, $algo);
+		return new CertificationRequest($this, $algo, $signature);
+	}
 }

lib/X509/CertificationRequest/Attribute/ExtensionRequestValue.php

Indentation +81 added lines, -81 removed lines

@@ -17,94 +17,94 @@
  */
 class ExtensionRequestValue extends AttributeValue
 {
-    const OID = "1.2.840.113549.1.9.14";
+	const OID = "1.2.840.113549.1.9.14";
     
-    /**
-     * Extensions.
-     *
-     * @var Extensions $_extensions
-     */
-    protected $_extensions;
+	/**
+	 * Extensions.
+	 *
+	 * @var Extensions $_extensions
+	 */
+	protected $_extensions;
     
-    /**
-     * Constructor.
-     *
-     * @param Extensions $extensions
-     */
-    public function __construct(Extensions $extensions)
-    {
-        $this->_extensions = $extensions;
-        $this->_oid = self::OID;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Extensions $extensions
+	 */
+	public function __construct(Extensions $extensions)
+	{
+		$this->_extensions = $extensions;
+		$this->_oid = self::OID;
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::fromASN1()
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromASN1(UnspecifiedType $el): self
-    {
-        return new self(Extensions::fromASN1($el->asSequence()));
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::fromASN1()
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromASN1(UnspecifiedType $el): self
+	{
+		return new self(Extensions::fromASN1($el->asSequence()));
+	}
     
-    /**
-     * Get requested extensions.
-     *
-     * @return Extensions
-     */
-    public function extensions(): Extensions
-    {
-        return $this->_extensions;
-    }
+	/**
+	 * Get requested extensions.
+	 *
+	 * @return Extensions
+	 */
+	public function extensions(): Extensions
+	{
+		return $this->_extensions;
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::toASN1()
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        return $this->_extensions->toASN1();
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::toASN1()
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		return $this->_extensions->toASN1();
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::stringValue()
-     * @return string
-     */
-    public function stringValue(): string
-    {
-        return "#" . bin2hex($this->toASN1()->toDER());
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::stringValue()
+	 * @return string
+	 */
+	public function stringValue(): string
+	{
+		return "#" . bin2hex($this->toASN1()->toDER());
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::equalityMatchingRule()
-     * @return BinaryMatch
-     */
-    public function equalityMatchingRule(): BinaryMatch
-    {
-        return new BinaryMatch();
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::equalityMatchingRule()
+	 * @return BinaryMatch
+	 */
+	public function equalityMatchingRule(): BinaryMatch
+	{
+		return new BinaryMatch();
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::rfc2253String()
-     * @return string
-     */
-    public function rfc2253String(): string
-    {
-        return $this->stringValue();
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::rfc2253String()
+	 * @return string
+	 */
+	public function rfc2253String(): string
+	{
+		return $this->stringValue();
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::_transcodedString()
-     * @return string
-     */
-    protected function _transcodedString(): string
-    {
-        return $this->stringValue();
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::_transcodedString()
+	 * @return string
+	 */
+	protected function _transcodedString(): string
+	{
+		return $this->stringValue();
+	}
 }

lib/X509/Feature/AttributeContainer.php

Indentation +123 added lines, -123 removed lines

@@ -14,136 +14,136 @@
  */
 trait AttributeContainer
 {
-    /**
-     * Array of attributes.
-     *
-     * @var Attribute[] $_attributes
-     */
-    protected $_attributes;
+	/**
+	 * Array of attributes.
+	 *
+	 * @var Attribute[] $_attributes
+	 */
+	protected $_attributes;
     
-    /**
-     * Find first attribute of given name or OID.
-     *
-     * @param string $name
-     * @return Attribute|null
-     */
-    protected function _findFirst(string $name)
-    {
-        $oid = AttributeType::attrNameToOID($name);
-        foreach ($this->_attributes as $attr) {
-            if ($attr->oid() == $oid) {
-                return $attr;
-            }
-        }
-        return null;
-    }
+	/**
+	 * Find first attribute of given name or OID.
+	 *
+	 * @param string $name
+	 * @return Attribute|null
+	 */
+	protected function _findFirst(string $name)
+	{
+		$oid = AttributeType::attrNameToOID($name);
+		foreach ($this->_attributes as $attr) {
+			if ($attr->oid() == $oid) {
+				return $attr;
+			}
+		}
+		return null;
+	}
     
-    /**
-     * Check whether attribute is present.
-     *
-     * @param string $name OID or attribute name
-     * @return boolean
-     */
-    public function has(string $name): bool
-    {
-        return null !== $this->_findFirst($name);
-    }
+	/**
+	 * Check whether attribute is present.
+	 *
+	 * @param string $name OID or attribute name
+	 * @return boolean
+	 */
+	public function has(string $name): bool
+	{
+		return null !== $this->_findFirst($name);
+	}
     
-    /**
-     * Get first attribute by OID or attribute name.
-     *
-     * @param string $name OID or attribute name
-     * @throws \OutOfBoundsException
-     * @return Attribute
-     */
-    public function firstOf(string $name): Attribute
-    {
-        $attr = $this->_findFirst($name);
-        if (!$attr) {
-            throw new \UnexpectedValueException("No $name attribute.");
-        }
-        return $attr;
-    }
+	/**
+	 * Get first attribute by OID or attribute name.
+	 *
+	 * @param string $name OID or attribute name
+	 * @throws \OutOfBoundsException
+	 * @return Attribute
+	 */
+	public function firstOf(string $name): Attribute
+	{
+		$attr = $this->_findFirst($name);
+		if (!$attr) {
+			throw new \UnexpectedValueException("No $name attribute.");
+		}
+		return $attr;
+	}
     
-    /**
-     * Get all attributes of given name.
-     *
-     * @param string $name OID or attribute name
-     * @return Attribute[]
-     */
-    public function allOf(string $name): array
-    {
-        $oid = AttributeType::attrNameToOID($name);
-        $attrs = array_filter($this->_attributes,
-            function (Attribute $attr) use ($oid) {
-                return $attr->oid() == $oid;
-            });
-        return array_values($attrs);
-    }
+	/**
+	 * Get all attributes of given name.
+	 *
+	 * @param string $name OID or attribute name
+	 * @return Attribute[]
+	 */
+	public function allOf(string $name): array
+	{
+		$oid = AttributeType::attrNameToOID($name);
+		$attrs = array_filter($this->_attributes,
+			function (Attribute $attr) use ($oid) {
+				return $attr->oid() == $oid;
+			});
+		return array_values($attrs);
+	}
     
-    /**
-     * Get all attributes.
-     *
-     * @return Attribute[]
-     */
-    public function all(): array
-    {
-        return $this->_attributes;
-    }
+	/**
+	 * Get all attributes.
+	 *
+	 * @return Attribute[]
+	 */
+	public function all(): array
+	{
+		return $this->_attributes;
+	}
     
-    /**
-     * Get self with additional attributes added.
-     *
-     * @param Attribute ...$attribs
-     * @return self
-     */
-    public function withAdditional(Attribute ...$attribs): self
-    {
-        $obj = clone $this;
-        foreach ($attribs as $attr) {
-            $obj->_attributes[] = $attr;
-        }
-        return $obj;
-    }
+	/**
+	 * Get self with additional attributes added.
+	 *
+	 * @param Attribute ...$attribs
+	 * @return self
+	 */
+	public function withAdditional(Attribute ...$attribs): self
+	{
+		$obj = clone $this;
+		foreach ($attribs as $attr) {
+			$obj->_attributes[] = $attr;
+		}
+		return $obj;
+	}
     
-    /**
-     * Get self with single unique attribute added.
-     *
-     * All previous attributes of the same type are removed.
-     *
-     * @param Attribute $attr
-     * @return self
-     */
-    public function withUnique(Attribute $attr): self
-    {
-        $obj = clone $this;
-        $obj->_attributes = array_filter($obj->_attributes,
-            function (Attribute $a) use ($attr) {
-                return $a->oid() != $attr->oid();
-            });
-        $obj->_attributes[] = $attr;
-        return $obj;
-    }
+	/**
+	 * Get self with single unique attribute added.
+	 *
+	 * All previous attributes of the same type are removed.
+	 *
+	 * @param Attribute $attr
+	 * @return self
+	 */
+	public function withUnique(Attribute $attr): self
+	{
+		$obj = clone $this;
+		$obj->_attributes = array_filter($obj->_attributes,
+			function (Attribute $a) use ($attr) {
+				return $a->oid() != $attr->oid();
+			});
+		$obj->_attributes[] = $attr;
+		return $obj;
+	}
     
-    /**
-     * Get number of attributes.
-     *
-     * @see \Countable::count()
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_attributes);
-    }
+	/**
+	 * Get number of attributes.
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_attributes);
+	}
     
-    /**
-     * Get iterator for attributes.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_attributes);
-    }
+	/**
+	 * Get iterator for attributes.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_attributes);
+	}
 }

lib/X509/Feature/DateTimeHelper.php

Indentation +62 added lines, -62 removed lines

@@ -9,69 +9,69 @@
  */
 trait DateTimeHelper
 {
-    /**
-     * Create DateTime object from time string and timezone.
-     *
-     * @param string|null $time Time string, default to 'now'
-     * @param string|null $tz Timezone, default if omitted
-     * @throws \RuntimeException
-     * @return \DateTimeImmutable
-     */
-    private static function _createDateTime($time = null, $tz = null): \DateTimeImmutable
-    {
-        if (!isset($time)) {
-            $time = 'now';
-        }
-        if (!isset($tz)) {
-            $tz = date_default_timezone_get();
-        }
-        try {
-            $dt = new \DateTimeImmutable($time, self::_createTimeZone($tz));
-            return self::_roundDownFractionalSeconds($dt);
-        } catch (\Exception $e) {
-            throw new \RuntimeException(
-                "Failed to create DateTime: " .
-                     self::_getLastDateTimeImmutableErrorsStr(), 0, $e);
-        }
-    }
+	/**
+	 * Create DateTime object from time string and timezone.
+	 *
+	 * @param string|null $time Time string, default to 'now'
+	 * @param string|null $tz Timezone, default if omitted
+	 * @throws \RuntimeException
+	 * @return \DateTimeImmutable
+	 */
+	private static function _createDateTime($time = null, $tz = null): \DateTimeImmutable
+	{
+		if (!isset($time)) {
+			$time = 'now';
+		}
+		if (!isset($tz)) {
+			$tz = date_default_timezone_get();
+		}
+		try {
+			$dt = new \DateTimeImmutable($time, self::_createTimeZone($tz));
+			return self::_roundDownFractionalSeconds($dt);
+		} catch (\Exception $e) {
+			throw new \RuntimeException(
+				"Failed to create DateTime: " .
+					 self::_getLastDateTimeImmutableErrorsStr(), 0, $e);
+		}
+	}
     
-    /**
-     * Rounds a \DateTimeImmutable value such that fractional
-     * seconds are removed.
-     *
-     * @param \DateTimeImmutable $dt
-     * @return \DateTimeImmutable
-     */
-    private static function _roundDownFractionalSeconds(\DateTimeImmutable $dt): \DateTimeImmutable
-    {
-        return \DateTimeImmutable::createFromFormat("Y-m-d H:i:s",
-            $dt->format("Y-m-d H:i:s"), $dt->getTimezone());
-    }
+	/**
+	 * Rounds a \DateTimeImmutable value such that fractional
+	 * seconds are removed.
+	 *
+	 * @param \DateTimeImmutable $dt
+	 * @return \DateTimeImmutable
+	 */
+	private static function _roundDownFractionalSeconds(\DateTimeImmutable $dt): \DateTimeImmutable
+	{
+		return \DateTimeImmutable::createFromFormat("Y-m-d H:i:s",
+			$dt->format("Y-m-d H:i:s"), $dt->getTimezone());
+	}
     
-    /**
-     * Create DateTimeZone object from string.
-     *
-     * @param string $tz
-     * @throws \UnexpectedValueException
-     * @return \DateTimeZone
-     */
-    private static function _createTimeZone(string $tz): \DateTimeZone
-    {
-        try {
-            return new \DateTimeZone($tz);
-        } catch (\Exception $e) {
-            throw new \UnexpectedValueException("Invalid timezone.", 0, $e);
-        }
-    }
+	/**
+	 * Create DateTimeZone object from string.
+	 *
+	 * @param string $tz
+	 * @throws \UnexpectedValueException
+	 * @return \DateTimeZone
+	 */
+	private static function _createTimeZone(string $tz): \DateTimeZone
+	{
+		try {
+			return new \DateTimeZone($tz);
+		} catch (\Exception $e) {
+			throw new \UnexpectedValueException("Invalid timezone.", 0, $e);
+		}
+	}
     
-    /**
-     * Get last error caused by DateTimeImmutable.
-     *
-     * @return string
-     */
-    private static function _getLastDateTimeImmutableErrorsStr(): string
-    {
-        $errors = \DateTimeImmutable::getLastErrors()["errors"];
-        return implode(", ", $errors);
-    }
+	/**
+	 * Get last error caused by DateTimeImmutable.
+	 *
+	 * @return string
+	 */
+	private static function _getLastDateTimeImmutableErrorsStr(): string
+	{
+		$errors = \DateTimeImmutable::getLastErrors()["errors"];
+		return implode(", ", $errors);
+	}
 }

lib/X509/GeneralName/GeneralName.php

Indentation +134 added lines, -134 removed lines

@@ -15,147 +15,147 @@
  */
 abstract class GeneralName
 {
-    // GeneralName CHOICE tags
-    const TAG_OTHER_NAME = 0;
-    const TAG_RFC822_NAME = 1;
-    const TAG_DNS_NAME = 2;
-    const TAG_X400_ADDRESS = 3;
-    const TAG_DIRECTORY_NAME = 4;
-    const TAG_EDI_PARTY_NAME = 5;
-    const TAG_URI = 6;
-    const TAG_IP_ADDRESS = 7;
-    const TAG_REGISTERED_ID = 8;
+	// GeneralName CHOICE tags
+	const TAG_OTHER_NAME = 0;
+	const TAG_RFC822_NAME = 1;
+	const TAG_DNS_NAME = 2;
+	const TAG_X400_ADDRESS = 3;
+	const TAG_DIRECTORY_NAME = 4;
+	const TAG_EDI_PARTY_NAME = 5;
+	const TAG_URI = 6;
+	const TAG_IP_ADDRESS = 7;
+	const TAG_REGISTERED_ID = 8;
     
-    /**
-     * Chosen tag.
-     *
-     * @var int $_tag
-     */
-    protected $_tag;
+	/**
+	 * Chosen tag.
+	 *
+	 * @var int $_tag
+	 */
+	protected $_tag;
     
-    /**
-     * Get string value of the type.
-     *
-     * @return string
-     */
-    abstract public function string(): string;
+	/**
+	 * Get string value of the type.
+	 *
+	 * @return string
+	 */
+	abstract public function string(): string;
     
-    /**
-     * Get ASN.1 value in GeneralName CHOICE context.
-     *
-     * @return TaggedType
-     */
-    abstract protected function _choiceASN1(): TaggedType;
+	/**
+	 * Get ASN.1 value in GeneralName CHOICE context.
+	 *
+	 * @return TaggedType
+	 */
+	abstract protected function _choiceASN1(): TaggedType;
     
-    /**
-     * Initialize concrete object from the chosen ASN.1 element.
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el)
-    {
-        throw new \BadMethodCallException(
-            __FUNCTION__ . " must be implemented in the derived class.");
-    }
+	/**
+	 * Initialize concrete object from the chosen ASN.1 element.
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el)
+	{
+		throw new \BadMethodCallException(
+			__FUNCTION__ . " must be implemented in the derived class.");
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param TaggedType $el
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromASN1(TaggedType $el): self
-    {
-        switch ($el->tag()) {
-            // otherName
-            case self::TAG_OTHER_NAME:
-                return OtherName::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_SEQUENCE));
-            // rfc822Name
-            case self::TAG_RFC822_NAME:
-                return RFC822Name::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_IA5_STRING));
-            // dNSName
-            case self::TAG_DNS_NAME:
-                return DNSName::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_IA5_STRING));
-            // x400Address
-            case self::TAG_X400_ADDRESS:
-                return X400Address::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_SEQUENCE));
-            // directoryName
-            case self::TAG_DIRECTORY_NAME:
-                // because Name is a CHOICE, albeit having only one option,
-                // explicit tagging must be used
-                // (see X.680 07/2002 30.6.c)
-                return DirectoryName::fromChosenASN1($el->asExplicit());
-            // ediPartyName
-            case self::TAG_EDI_PARTY_NAME:
-                return EDIPartyName::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_SEQUENCE));
-            // uniformResourceIdentifier
-            case self::TAG_URI:
-                return UniformResourceIdentifier::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_IA5_STRING));
-            // iPAddress
-            case self::TAG_IP_ADDRESS:
-                return IPAddress::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_OCTET_STRING));
-            // registeredID
-            case self::TAG_REGISTERED_ID:
-                return RegisteredID::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_OBJECT_IDENTIFIER));
-        }
-        throw new \UnexpectedValueException(
-            "GeneralName type " . $el->tag() . " not supported.");
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param TaggedType $el
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromASN1(TaggedType $el): self
+	{
+		switch ($el->tag()) {
+			// otherName
+			case self::TAG_OTHER_NAME:
+				return OtherName::fromChosenASN1(
+					$el->asImplicit(Element::TYPE_SEQUENCE));
+			// rfc822Name
+			case self::TAG_RFC822_NAME:
+				return RFC822Name::fromChosenASN1(
+					$el->asImplicit(Element::TYPE_IA5_STRING));
+			// dNSName
+			case self::TAG_DNS_NAME:
+				return DNSName::fromChosenASN1(
+					$el->asImplicit(Element::TYPE_IA5_STRING));
+			// x400Address
+			case self::TAG_X400_ADDRESS:
+				return X400Address::fromChosenASN1(
+					$el->asImplicit(Element::TYPE_SEQUENCE));
+			// directoryName
+			case self::TAG_DIRECTORY_NAME:
+				// because Name is a CHOICE, albeit having only one option,
+				// explicit tagging must be used
+				// (see X.680 07/2002 30.6.c)
+				return DirectoryName::fromChosenASN1($el->asExplicit());
+			// ediPartyName
+			case self::TAG_EDI_PARTY_NAME:
+				return EDIPartyName::fromChosenASN1(
+					$el->asImplicit(Element::TYPE_SEQUENCE));
+			// uniformResourceIdentifier
+			case self::TAG_URI:
+				return UniformResourceIdentifier::fromChosenASN1(
+					$el->asImplicit(Element::TYPE_IA5_STRING));
+			// iPAddress
+			case self::TAG_IP_ADDRESS:
+				return IPAddress::fromChosenASN1(
+					$el->asImplicit(Element::TYPE_OCTET_STRING));
+			// registeredID
+			case self::TAG_REGISTERED_ID:
+				return RegisteredID::fromChosenASN1(
+					$el->asImplicit(Element::TYPE_OBJECT_IDENTIFIER));
+		}
+		throw new \UnexpectedValueException(
+			"GeneralName type " . $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 element.
-     *
-     * @return Element
-     */
-    public function toASN1(): Element
-    {
-        return $this->_choiceASN1();
-    }
+	/**
+	 * Generate ASN.1 element.
+	 *
+	 * @return Element
+	 */
+	public function toASN1(): Element
+	{
+		return $this->_choiceASN1();
+	}
     
-    /**
-     * Check whether GeneralName is equal to other.
-     *
-     * @param GeneralName $other GeneralName to compare to
-     * @return boolean True if names are equal
-     */
-    public function equals(GeneralName $other): bool
-    {
-        if ($this->_tag != $other->_tag) {
-            return false;
-        }
-        if ($this->_choiceASN1()->toDER() != $other->_choiceASN1()->toDER()) {
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Check whether GeneralName is equal to other.
+	 *
+	 * @param GeneralName $other GeneralName to compare to
+	 * @return boolean True if names are equal
+	 */
+	public function equals(GeneralName $other): bool
+	{
+		if ($this->_tag != $other->_tag) {
+			return false;
+		}
+		if ($this->_choiceASN1()->toDER() != $other->_choiceASN1()->toDER()) {
+			return false;
+		}
+		return true;
+	}
     
-    /**
-     * Get general name as a string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->string();
-    }
+	/**
+	 * Get general name as a string.
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->string();
+	}
 }

lib/X509/GeneralName/RFC822Name.php

Indentation +50 added lines, -50 removed lines

@@ -16,59 +16,59 @@
  */
 class RFC822Name extends GeneralName
 {
-    /**
-     * Email.
-     *
-     * @var string $_email
-     */
-    protected $_email;
+	/**
+	 * Email.
+	 *
+	 * @var string $_email
+	 */
+	protected $_email;
     
-    /**
-     * Constructor.
-     *
-     * @param string $email
-     */
-    public function __construct(string $email)
-    {
-        $this->_tag = self::TAG_RFC822_NAME;
-        $this->_email = $email;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $email
+	 */
+	public function __construct(string $email)
+	{
+		$this->_tag = self::TAG_RFC822_NAME;
+		$this->_email = $email;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el): self
-    {
-        return new self($el->asIA5String()->string());
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el): self
+	{
+		return new self($el->asIA5String()->string());
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function string(): string
-    {
-        return $this->_email;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string(): string
+	{
+		return $this->_email;
+	}
     
-    /**
-     * Get email.
-     *
-     * @return string
-     */
-    public function email(): string
-    {
-        return $this->_email;
-    }
+	/**
+	 * Get email.
+	 *
+	 * @return string
+	 */
+	public function email(): string
+	{
+		return $this->_email;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1(): TaggedType
-    {
-        return new ImplicitlyTaggedType($this->_tag, new IA5String($this->_email));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1(): TaggedType
+	{
+		return new ImplicitlyTaggedType($this->_tag, new IA5String($this->_email));
+	}
 }

lib/X509/GeneralName/EDIPartyName.php

Indentation +39 added lines, -39 removed lines

@@ -18,47 +18,47 @@
  */
 class EDIPartyName extends GeneralName
 {
-    /**
-     *
-     * @var \ASN1\Element
-     */
-    protected $_element;
+	/**
+	 *
+	 * @var \ASN1\Element
+	 */
+	protected $_element;
     
-    /**
-     * Constructor.
-     */
-    protected function __construct()
-    {
-        $this->_tag = self::TAG_EDI_PARTY_NAME;
-    }
+	/**
+	 * Constructor.
+	 */
+	protected function __construct()
+	{
+		$this->_tag = self::TAG_EDI_PARTY_NAME;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el): self
-    {
-        $obj = new self();
-        $obj->_element = $el->asSequence();
-        return $obj;
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el): self
+	{
+		$obj = new self();
+		$obj->_element = $el->asSequence();
+		return $obj;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function string(): string
-    {
-        return bin2hex($this->_element->toDER());
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string(): string
+	{
+		return bin2hex($this->_element->toDER());
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1(): TaggedType
-    {
-        return new ImplicitlyTaggedType($this->_tag, $this->_element);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1(): TaggedType
+	{
+		return new ImplicitlyTaggedType($this->_tag, $this->_element);
+	}
 }

lib/X509/GeneralName/IPv4Address.php

Indentation +37 added lines, -37 removed lines

@@ -6,42 +6,42 @@
 
 class IPv4Address extends IPAddress
 {
-    /**
-     * Initialize from octets.
-     *
-     * @param string $octets
-     * @throws \InvalidArgumentException
-     * @return self
-     */
-    public static function fromOctets(string $octets): self
-    {
-        $mask = null;
-        $bytes = unpack("C*", $octets);
-        switch (count($bytes)) {
-            case 4:
-                $ip = implode(".", $bytes);
-                break;
-            case 8:
-                $ip = implode(".", array_slice($bytes, 0, 4));
-                $mask = implode(".", array_slice($bytes, 4, 4));
-                break;
-            default:
-                throw new \UnexpectedValueException("Invalid IPv4 octet length.");
-        }
-        return new self($ip, $mask);
-    }
+	/**
+	 * Initialize from octets.
+	 *
+	 * @param string $octets
+	 * @throws \InvalidArgumentException
+	 * @return self
+	 */
+	public static function fromOctets(string $octets): self
+	{
+		$mask = null;
+		$bytes = unpack("C*", $octets);
+		switch (count($bytes)) {
+			case 4:
+				$ip = implode(".", $bytes);
+				break;
+			case 8:
+				$ip = implode(".", array_slice($bytes, 0, 4));
+				$mask = implode(".", array_slice($bytes, 4, 4));
+				break;
+			default:
+				throw new \UnexpectedValueException("Invalid IPv4 octet length.");
+		}
+		return new self($ip, $mask);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _octets(): string
-    {
-        $bytes = array_map("intval", explode(".", $this->_ip));
-        if (isset($this->_mask)) {
-            $bytes = array_merge($bytes,
-                array_map("intval", explode(".", $this->_mask)));
-        }
-        return pack("C*", ...$bytes);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _octets(): string
+	{
+		$bytes = array_map("intval", explode(".", $this->_ip));
+		if (isset($this->_mask)) {
+			$bytes = array_merge($bytes,
+				array_map("intval", explode(".", $this->_mask)));
+		}
+		return pack("C*", ...$bytes);
+	}
 }