sop / x509

lib/X509/GeneralName/IPv6Address.php

Indentation +53 added lines, -53 removed lines

@@ -6,59 +6,59 @@
 
 class IPv6Address extends IPAddress
 {
-    /**
-     * Initialize from octets.
-     *
-     * @param string $octets
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return self
-     */
-    public static function fromOctets(string $octets): self
-    {
-        $mask = null;
-        $words = unpack('n*', $octets);
-        switch (count($words)) {
-            case 8:
-                $ip = self::_wordsToIPv6String($words);
-                break;
-            case 16:
-                $ip = self::_wordsToIPv6String(array_slice($words, 0, 8));
-                $mask = self::_wordsToIPv6String(array_slice($words, 8, 8));
-                break;
-            default:
-                throw new \UnexpectedValueException('Invalid IPv6 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;
+		$words = unpack('n*', $octets);
+		switch (count($words)) {
+			case 8:
+				$ip = self::_wordsToIPv6String($words);
+				break;
+			case 16:
+				$ip = self::_wordsToIPv6String(array_slice($words, 0, 8));
+				$mask = self::_wordsToIPv6String(array_slice($words, 8, 8));
+				break;
+			default:
+				throw new \UnexpectedValueException('Invalid IPv6 octet length.');
+		}
+		return new self($ip, $mask);
+	}
 
-    /**
-     * Convert an array of 16 bit words to an IPv6 string representation.
-     *
-     * @param int[] $words
-     *
-     * @return string
-     */
-    protected static function _wordsToIPv6String(array $words): string
-    {
-        $groups = array_map(
-            function ($word) {
-                return sprintf('%04x', $word);
-            }, $words);
-        return implode(':', $groups);
-    }
+	/**
+	 * Convert an array of 16 bit words to an IPv6 string representation.
+	 *
+	 * @param int[] $words
+	 *
+	 * @return string
+	 */
+	protected static function _wordsToIPv6String(array $words): string
+	{
+		$groups = array_map(
+			function ($word) {
+				return sprintf('%04x', $word);
+			}, $words);
+		return implode(':', $groups);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _octets(): string
-    {
-        $words = array_map('hexdec', explode(':', $this->_ip));
-        if (isset($this->_mask)) {
-            $words = array_merge($words,
-                array_map('hexdec', explode(':', $this->_mask)));
-        }
-        return pack('n*', ...$words);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _octets(): string
+	{
+		$words = array_map('hexdec', explode(':', $this->_ip));
+		if (isset($this->_mask)) {
+			$words = array_merge($words,
+				array_map('hexdec', explode(':', $this->_mask)));
+		}
+		return pack('n*', ...$words);
+	}
 }

lib/X509/GeneralName/IPAddress.php

Indentation +83 added lines, -83 removed lines

@@ -19,95 +19,95 @@
  */
 abstract class IPAddress extends GeneralName
 {
-    /**
-     * IP address.
-     *
-     * @var string
-     */
-    protected $_ip;
+	/**
+	 * IP address.
+	 *
+	 * @var string
+	 */
+	protected $_ip;
 
-    /**
-     * Subnet mask.
-     *
-     * @var null|string
-     */
-    protected $_mask;
+	/**
+	 * Subnet mask.
+	 *
+	 * @var null|string
+	 */
+	protected $_mask;
 
-    /**
-     * Constructor.
-     *
-     * @param string      $ip
-     * @param null|string $mask
-     */
-    public function __construct(string $ip, ?string $mask = null)
-    {
-        $this->_tag = self::TAG_IP_ADDRESS;
-        $this->_ip = $ip;
-        $this->_mask = $mask;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string      $ip
+	 * @param null|string $mask
+	 */
+	public function __construct(string $ip, ?string $mask = null)
+	{
+		$this->_tag = self::TAG_IP_ADDRESS;
+		$this->_ip = $ip;
+		$this->_mask = $mask;
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el): GeneralName
-    {
-        $octets = $el->asOctetString()->string();
-        switch (strlen($octets)) {
-            case 4:
-            case 8:
-                return IPv4Address::fromOctets($octets);
-            case 16:
-            case 32:
-                return IPv6Address::fromOctets($octets);
-            default:
-                throw new \UnexpectedValueException(
-                    'Invalid octet length for IP address.');
-        }
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el): GeneralName
+	{
+		$octets = $el->asOctetString()->string();
+		switch (strlen($octets)) {
+			case 4:
+			case 8:
+				return IPv4Address::fromOctets($octets);
+			case 16:
+			case 32:
+				return IPv6Address::fromOctets($octets);
+			default:
+				throw new \UnexpectedValueException(
+					'Invalid octet length for IP address.');
+		}
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function string(): string
-    {
-        return $this->_ip . (isset($this->_mask) ? '/' . $this->_mask : '');
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function string(): string
+	{
+		return $this->_ip . (isset($this->_mask) ? '/' . $this->_mask : '');
+	}
 
-    /**
-     * Get IP address as a string.
-     *
-     * @return string
-     */
-    public function address(): string
-    {
-        return $this->_ip;
-    }
+	/**
+	 * Get IP address as a string.
+	 *
+	 * @return string
+	 */
+	public function address(): string
+	{
+		return $this->_ip;
+	}
 
-    /**
-     * Get subnet mask as a string.
-     *
-     * @return string
-     */
-    public function mask(): string
-    {
-        return $this->_mask;
-    }
+	/**
+	 * Get subnet mask as a string.
+	 *
+	 * @return string
+	 */
+	public function mask(): string
+	{
+		return $this->_mask;
+	}
 
-    /**
-     * Get octet representation of the IP address.
-     *
-     * @return string
-     */
-    abstract protected function _octets(): string;
+	/**
+	 * Get octet representation of the IP address.
+	 *
+	 * @return string
+	 */
+	abstract protected function _octets(): string;
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1(): TaggedType
-    {
-        return new ImplicitlyTaggedType($this->_tag,
-            new OctetString($this->_octets()));
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1(): TaggedType
+	{
+		return new ImplicitlyTaggedType($this->_tag,
+			new OctetString($this->_octets()));
+	}
 }

lib/X509/GeneralName/RegisteredID.php

Indentation +49 added lines, -49 removed lines

@@ -16,58 +16,58 @@
  */
 class RegisteredID extends GeneralName
 {
-    /**
-     * Object identifier.
-     *
-     * @var string
-     */
-    protected $_oid;
+	/**
+	 * Object identifier.
+	 *
+	 * @var string
+	 */
+	protected $_oid;
 
-    /**
-     * Constructor.
-     *
-     * @param string $oid OID in dotted format
-     */
-    public function __construct(string $oid)
-    {
-        $this->_tag = self::TAG_REGISTERED_ID;
-        $this->_oid = $oid;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $oid OID in dotted format
+	 */
+	public function __construct(string $oid)
+	{
+		$this->_tag = self::TAG_REGISTERED_ID;
+		$this->_oid = $oid;
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el): GeneralName
-    {
-        return new self($el->asObjectIdentifier()->oid());
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el): GeneralName
+	{
+		return new self($el->asObjectIdentifier()->oid());
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function string(): string
-    {
-        return $this->_oid;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function string(): string
+	{
+		return $this->_oid;
+	}
 
-    /**
-     * Get object identifier in dotted format.
-     *
-     * @return string OID
-     */
-    public function oid(): string
-    {
-        return $this->_oid;
-    }
+	/**
+	 * Get object identifier in dotted format.
+	 *
+	 * @return string OID
+	 */
+	public function oid(): string
+	{
+		return $this->_oid;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1(): TaggedType
-    {
-        return new ImplicitlyTaggedType($this->_tag,
-            new ObjectIdentifier($this->_oid));
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1(): TaggedType
+	{
+		return new ImplicitlyTaggedType($this->_tag,
+			new ObjectIdentifier($this->_oid));
+	}
 }

lib/X509/GeneralName/GeneralNames.php

Indentation +186 added lines, -186 removed lines

@@ -18,190 +18,190 @@
  */
 class GeneralNames implements \Countable, \IteratorAggregate
 {
-    /**
-     * GeneralName objects.
-     *
-     * @var GeneralName[]
-     */
-    protected $_names;
-
-    /**
-     * Constructor.
-     *
-     * @param GeneralName ...$names One or more GeneralName objects
-     */
-    public function __construct(GeneralName ...$names)
-    {
-        $this->_names = $names;
-    }
-
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     *
-     * @throws \UnexpectedValueException
-     *
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): GeneralNames
-    {
-        if (!count($seq)) {
-            throw new \UnexpectedValueException(
-                'GeneralNames must have at least one GeneralName.');
-        }
-        $names = array_map(
-            function (UnspecifiedType $el) {
-                return GeneralName::fromASN1($el->asTagged());
-            }, $seq->elements());
-        return new self(...$names);
-    }
-
-    /**
-     * Check whether GeneralNames contains a GeneralName of given type.
-     *
-     * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
-     *
-     * @return bool
-     */
-    public function has(int $tag): bool
-    {
-        return null !== $this->_findFirst($tag);
-    }
-
-    /**
-     * Get first GeneralName of given type.
-     *
-     * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
-     *
-     * @throws \OutOfBoundsException
-     *
-     * @return GeneralName
-     */
-    public function firstOf(int $tag): GeneralName
-    {
-        $name = $this->_findFirst($tag);
-        if (!$name) {
-            throw new \UnexpectedValueException("No GeneralName by tag {$tag}.");
-        }
-        return $name;
-    }
-
-    /**
-     * Get all GeneralName objects of given type.
-     *
-     * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
-     *
-     * @return GeneralName[]
-     */
-    public function allOf(int $tag): array
-    {
-        $names = array_filter($this->_names,
-            function (GeneralName $name) use ($tag) {
-                return $name->tag() === $tag;
-            });
-        return array_values($names);
-    }
-
-    /**
-     * Get value of the first 'dNSName' type.
-     *
-     * @return string
-     */
-    public function firstDNS(): string
-    {
-        $gn = $this->firstOf(GeneralName::TAG_DNS_NAME);
-        if (!$gn instanceof DNSName) {
-            throw new \RuntimeException(
-                DNSName::class . ' expected, got ' . get_class($gn));
-        }
-        return $gn->name();
-    }
-
-    /**
-     * Get value of the first 'directoryName' type.
-     *
-     * @return Name
-     */
-    public function firstDN(): Name
-    {
-        $gn = $this->firstOf(GeneralName::TAG_DIRECTORY_NAME);
-        if (!$gn instanceof DirectoryName) {
-            throw new \RuntimeException(
-                DirectoryName::class . ' expected, got ' . get_class($gn));
-        }
-        return $gn->dn();
-    }
-
-    /**
-     * Get value of the first 'uniformResourceIdentifier' type.
-     *
-     * @return string
-     */
-    public function firstURI(): string
-    {
-        $gn = $this->firstOf(GeneralName::TAG_URI);
-        if (!$gn instanceof UniformResourceIdentifier) {
-            throw new \RuntimeException(
-                UniformResourceIdentifier::class . ' expected, got ' . get_class($gn));
-        }
-        return $gn->uri();
-    }
-
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        if (!count($this->_names)) {
-            throw new \LogicException(
-                'GeneralNames must have at least one GeneralName.');
-        }
-        $elements = array_map(
-            function (GeneralName $name) {
-                return $name->toASN1();
-            }, $this->_names);
-        return new Sequence(...$elements);
-    }
-
-    /**
-     * @see \Countable::count()
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_names);
-    }
-
-    /**
-     * Get iterator for GeneralName objects.
-     *
-     * @see \IteratorAggregate::getIterator()
-     *
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_names);
-    }
-
-    /**
-     * Find first GeneralName by given tag.
-     *
-     * @param int $tag
-     *
-     * @return null|GeneralName
-     */
-    protected function _findFirst(int $tag): ?GeneralName
-    {
-        foreach ($this->_names as $name) {
-            if ($name->tag() === $tag) {
-                return $name;
-            }
-        }
-        return null;
-    }
+	/**
+	 * GeneralName objects.
+	 *
+	 * @var GeneralName[]
+	 */
+	protected $_names;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param GeneralName ...$names One or more GeneralName objects
+	 */
+	public function __construct(GeneralName ...$names)
+	{
+		$this->_names = $names;
+	}
+
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 *
+	 * @throws \UnexpectedValueException
+	 *
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): GeneralNames
+	{
+		if (!count($seq)) {
+			throw new \UnexpectedValueException(
+				'GeneralNames must have at least one GeneralName.');
+		}
+		$names = array_map(
+			function (UnspecifiedType $el) {
+				return GeneralName::fromASN1($el->asTagged());
+			}, $seq->elements());
+		return new self(...$names);
+	}
+
+	/**
+	 * Check whether GeneralNames contains a GeneralName of given type.
+	 *
+	 * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
+	 *
+	 * @return bool
+	 */
+	public function has(int $tag): bool
+	{
+		return null !== $this->_findFirst($tag);
+	}
+
+	/**
+	 * Get first GeneralName of given type.
+	 *
+	 * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
+	 *
+	 * @throws \OutOfBoundsException
+	 *
+	 * @return GeneralName
+	 */
+	public function firstOf(int $tag): GeneralName
+	{
+		$name = $this->_findFirst($tag);
+		if (!$name) {
+			throw new \UnexpectedValueException("No GeneralName by tag {$tag}.");
+		}
+		return $name;
+	}
+
+	/**
+	 * Get all GeneralName objects of given type.
+	 *
+	 * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
+	 *
+	 * @return GeneralName[]
+	 */
+	public function allOf(int $tag): array
+	{
+		$names = array_filter($this->_names,
+			function (GeneralName $name) use ($tag) {
+				return $name->tag() === $tag;
+			});
+		return array_values($names);
+	}
+
+	/**
+	 * Get value of the first 'dNSName' type.
+	 *
+	 * @return string
+	 */
+	public function firstDNS(): string
+	{
+		$gn = $this->firstOf(GeneralName::TAG_DNS_NAME);
+		if (!$gn instanceof DNSName) {
+			throw new \RuntimeException(
+				DNSName::class . ' expected, got ' . get_class($gn));
+		}
+		return $gn->name();
+	}
+
+	/**
+	 * Get value of the first 'directoryName' type.
+	 *
+	 * @return Name
+	 */
+	public function firstDN(): Name
+	{
+		$gn = $this->firstOf(GeneralName::TAG_DIRECTORY_NAME);
+		if (!$gn instanceof DirectoryName) {
+			throw new \RuntimeException(
+				DirectoryName::class . ' expected, got ' . get_class($gn));
+		}
+		return $gn->dn();
+	}
+
+	/**
+	 * Get value of the first 'uniformResourceIdentifier' type.
+	 *
+	 * @return string
+	 */
+	public function firstURI(): string
+	{
+		$gn = $this->firstOf(GeneralName::TAG_URI);
+		if (!$gn instanceof UniformResourceIdentifier) {
+			throw new \RuntimeException(
+				UniformResourceIdentifier::class . ' expected, got ' . get_class($gn));
+		}
+		return $gn->uri();
+	}
+
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		if (!count($this->_names)) {
+			throw new \LogicException(
+				'GeneralNames must have at least one GeneralName.');
+		}
+		$elements = array_map(
+			function (GeneralName $name) {
+				return $name->toASN1();
+			}, $this->_names);
+		return new Sequence(...$elements);
+	}
+
+	/**
+	 * @see \Countable::count()
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_names);
+	}
+
+	/**
+	 * Get iterator for GeneralName objects.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 *
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_names);
+	}
+
+	/**
+	 * Find first GeneralName by given tag.
+	 *
+	 * @param int $tag
+	 *
+	 * @return null|GeneralName
+	 */
+	protected function _findFirst(int $tag): ?GeneralName
+	{
+		foreach ($this->_names as $name) {
+			if ($name->tag() === $tag) {
+				return $name;
+			}
+		}
+		return null;
+	}
 }

lib/X509/GeneralName/OtherName.php

Indentation +70 added lines, -70 removed lines

@@ -19,81 +19,81 @@
  */
 class OtherName extends GeneralName
 {
-    /**
-     * Type OID.
-     *
-     * @var string
-     */
-    protected $_type;
+	/**
+	 * Type OID.
+	 *
+	 * @var string
+	 */
+	protected $_type;
 
-    /**
-     * Value.
-     *
-     * @var Element
-     */
-    protected $_element;
+	/**
+	 * Value.
+	 *
+	 * @var Element
+	 */
+	protected $_element;
 
-    /**
-     * Constructor.
-     *
-     * @param string  $type_id OID
-     * @param Element $el
-     */
-    public function __construct(string $type_id, Element $el)
-    {
-        $this->_tag = self::TAG_OTHER_NAME;
-        $this->_type = $type_id;
-        $this->_element = $el;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string  $type_id OID
+	 * @param Element $el
+	 */
+	public function __construct(string $type_id, Element $el)
+	{
+		$this->_tag = self::TAG_OTHER_NAME;
+		$this->_type = $type_id;
+		$this->_element = $el;
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el): GeneralName
-    {
-        $seq = $el->asSequence();
-        $type_id = $seq->at(0)->asObjectIdentifier()->oid();
-        $value = $seq->getTagged(0)->asExplicit()->asElement();
-        return new self($type_id, $value);
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el): GeneralName
+	{
+		$seq = $el->asSequence();
+		$type_id = $seq->at(0)->asObjectIdentifier()->oid();
+		$value = $seq->getTagged(0)->asExplicit()->asElement();
+		return new self($type_id, $value);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function string(): string
-    {
-        return $this->_type . '/#' . bin2hex($this->_element->toDER());
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function string(): string
+	{
+		return $this->_type . '/#' . bin2hex($this->_element->toDER());
+	}
 
-    /**
-     * Get type OID.
-     *
-     * @return string
-     */
-    public function type(): string
-    {
-        return $this->_type;
-    }
+	/**
+	 * Get type OID.
+	 *
+	 * @return string
+	 */
+	public function type(): string
+	{
+		return $this->_type;
+	}
 
-    /**
-     * Get value element.
-     *
-     * @return Element
-     */
-    public function value(): Element
-    {
-        return $this->_element;
-    }
+	/**
+	 * Get value element.
+	 *
+	 * @return Element
+	 */
+	public function value(): Element
+	{
+		return $this->_element;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1(): TaggedType
-    {
-        return new ImplicitlyTaggedType($this->_tag,
-            new Sequence(new ObjectIdentifier($this->_type),
-                new ExplicitlyTaggedType(0, $this->_element)));
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1(): TaggedType
+	{
+		return new ImplicitlyTaggedType($this->_tag,
+			new Sequence(new ObjectIdentifier($this->_type),
+				new ExplicitlyTaggedType(0, $this->_element)));
+	}
 }

lib/X509/GeneralName/IPv4Address.php

Indentation +38 added lines, -38 removed lines

@@ -6,43 +6,43 @@
 
 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);
+	}
 }

lib/X509/GeneralName/UniformResourceIdentifier.php

Indentation +48 added lines, -48 removed lines

@@ -17,57 +17,57 @@
  */
 class UniformResourceIdentifier extends GeneralName
 {
-    /**
-     * URI.
-     *
-     * @var string
-     */
-    protected $_uri;
+	/**
+	 * URI.
+	 *
+	 * @var string
+	 */
+	protected $_uri;
 
-    /**
-     * Constructor.
-     *
-     * @param string $uri
-     */
-    public function __construct(string $uri)
-    {
-        $this->_tag = self::TAG_URI;
-        $this->_uri = $uri;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $uri
+	 */
+	public function __construct(string $uri)
+	{
+		$this->_tag = self::TAG_URI;
+		$this->_uri = $uri;
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el): GeneralName
-    {
-        return new self($el->asIA5String()->string());
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el): GeneralName
+	{
+		return new self($el->asIA5String()->string());
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function string(): string
-    {
-        return $this->_uri;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function string(): string
+	{
+		return $this->_uri;
+	}
 
-    /**
-     * Get URI.
-     *
-     * @return string
-     */
-    public function uri(): string
-    {
-        return $this->_uri;
-    }
+	/**
+	 * Get URI.
+	 *
+	 * @return string
+	 */
+	public function uri(): string
+	{
+		return $this->_uri;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1(): TaggedType
-    {
-        return new ImplicitlyTaggedType($this->_tag, new IA5String($this->_uri));
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1(): TaggedType
+	{
+		return new ImplicitlyTaggedType($this->_tag, new IA5String($this->_uri));
+	}
 }

lib/X509/GeneralName/GeneralName.php

Indentation +138 added lines, -138 removed lines

@@ -15,151 +15,151 @@
  */
 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
-     */
-    protected $_tag;
+	/**
+	 * Chosen tag.
+	 *
+	 * @var int
+	 */
+	protected $_tag;
 
-    /**
-     * Get general name as a string.
-     *
-     * @return string
-     */
-    public function __toString(): string
-    {
-        return $this->string();
-    }
+	/**
+	 * Get general name as a string.
+	 *
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return $this->string();
+	}
 
-    /**
-     * 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;
 
-    /**
-     * Initialize concrete object from the chosen ASN.1 element.
-     *
-     * @param UnspecifiedType $el
-     *
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el): GeneralName
-    {
-        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): GeneralName
+	{
+		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 bool 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 bool 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 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;
 }

lib/X509/GeneralName/EDIPartyName.php

Indentation +40 added lines, -40 removed lines

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