sop / x509

lib/X509/GeneralName/GeneralName.php

Indentation +134 added lines, -134 removed lines

@@ -13,147 +13,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();
+	/**
+	 * Get string value of the type.
+	 *
+	 * @return string
+	 */
+	abstract public function string();
     
-    /**
-     * Get ASN.1 value in GeneralName CHOICE context.
-     *
-     * @return TaggedType
-     */
-    abstract protected function _choiceASN1();
+	/**
+	 * Get ASN.1 value in GeneralName CHOICE context.
+	 *
+	 * @return TaggedType
+	 */
+	abstract protected function _choiceASN1();
     
-    /**
-     * 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)
-    {
-        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)
+	{
+		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()
-    {
-        return $this->_tag;
-    }
+	/**
+	 * Get type tag.
+	 *
+	 * @return int
+	 */
+	public function tag()
+	{
+		return $this->_tag;
+	}
     
-    /**
-     * Generate ASN.1 element.
-     *
-     * @return Element
-     */
-    public function toASN1()
-    {
-        return $this->_choiceASN1();
-    }
+	/**
+	 * Generate ASN.1 element.
+	 *
+	 * @return Element
+	 */
+	public function toASN1()
+	{
+		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)
-    {
-        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)
+	{
+		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/Certificate/Extension/NameConstraints/GeneralSubtree.php

Indentation +81 added lines, -81 removed lines

@@ -16,91 +16,91 @@
  */
 class GeneralSubtree
 {
-    /**
-     * Constraint.
-     *
-     * @var GeneralName
-     */
-    protected $_base;
+	/**
+	 * Constraint.
+	 *
+	 * @var GeneralName
+	 */
+	protected $_base;
     
-    /**
-     * Not used, must be zero.
-     *
-     * @var int $_min
-     */
-    protected $_min;
+	/**
+	 * Not used, must be zero.
+	 *
+	 * @var int $_min
+	 */
+	protected $_min;
     
-    /**
-     * Not used, must be null.
-     *
-     * @var int|null $_max
-     */
-    protected $_max;
+	/**
+	 * Not used, must be null.
+	 *
+	 * @var int|null $_max
+	 */
+	protected $_max;
     
-    /**
-     * Constructor.
-     *
-     * @param GeneralName $base
-     * @param int $min
-     * @param int|null $max
-     */
-    public function __construct(GeneralName $base, $min = 0, $max = null)
-    {
-        $this->_base = $base;
-        $this->_min = $min;
-        $this->_max = $max;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param GeneralName $base
+	 * @param int $min
+	 * @param int|null $max
+	 */
+	public function __construct(GeneralName $base, $min = 0, $max = null)
+	{
+		$this->_base = $base;
+		$this->_min = $min;
+		$this->_max = $max;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq)
-    {
-        $base = GeneralName::fromASN1($seq->at(0)->asTagged());
-        $min = 0;
-        $max = null;
-        if ($seq->hasTagged(0)) {
-            $min = $seq->getTagged(0)
-                ->asImplicit(Element::TYPE_INTEGER)
-                ->asInteger()
-                ->number();
-        }
-        if ($seq->hasTagged(1)) {
-            $max = $seq->getTagged(1)
-                ->asImplicit(Element::TYPE_INTEGER)
-                ->asInteger()
-                ->number();
-        }
-        return new self($base, $min, $max);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq)
+	{
+		$base = GeneralName::fromASN1($seq->at(0)->asTagged());
+		$min = 0;
+		$max = null;
+		if ($seq->hasTagged(0)) {
+			$min = $seq->getTagged(0)
+				->asImplicit(Element::TYPE_INTEGER)
+				->asInteger()
+				->number();
+		}
+		if ($seq->hasTagged(1)) {
+			$max = $seq->getTagged(1)
+				->asImplicit(Element::TYPE_INTEGER)
+				->asInteger()
+				->number();
+		}
+		return new self($base, $min, $max);
+	}
     
-    /**
-     * Get constraint.
-     *
-     * @return GeneralName
-     */
-    public function base()
-    {
-        return $this->_base;
-    }
+	/**
+	 * Get constraint.
+	 *
+	 * @return GeneralName
+	 */
+	public function base()
+	{
+		return $this->_base;
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1()
-    {
-        $elements = array($this->_base->toASN1());
-        if (isset($this->_min) && $this->_min != 0) {
-            $elements[] = new ImplicitlyTaggedType(0, new Integer($this->_min));
-        }
-        if (isset($this->_max)) {
-            $elements[] = new ImplicitlyTaggedType(1, new Integer($this->_max));
-        }
-        return new Sequence(...$elements);
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1()
+	{
+		$elements = array($this->_base->toASN1());
+		if (isset($this->_min) && $this->_min != 0) {
+			$elements[] = new ImplicitlyTaggedType(0, new Integer($this->_min));
+		}
+		if (isset($this->_max)) {
+			$elements[] = new ImplicitlyTaggedType(1, new Integer($this->_max));
+		}
+		return new Sequence(...$elements);
+	}
 }

lib/X509/Certificate/Extension/CertificatePolicy/UserNoticeQualifier.php

Indentation +102 added lines, -102 removed lines

@@ -14,114 +14,114 @@
  */
 class UserNoticeQualifier extends PolicyQualifierInfo
 {
-    /**
-     * Explicit notice text.
-     *
-     * @var DisplayText $_text
-     */
-    protected $_text;
+	/**
+	 * Explicit notice text.
+	 *
+	 * @var DisplayText $_text
+	 */
+	protected $_text;
     
-    /**
-     * Notice reference.
-     *
-     * @var NoticeReference $_ref
-     */
-    protected $_ref;
+	/**
+	 * Notice reference.
+	 *
+	 * @var NoticeReference $_ref
+	 */
+	protected $_ref;
     
-    /**
-     * Constructor.
-     *
-     * @param DisplayText|null $text
-     * @param NoticeReference|null $ref
-     */
-    public function __construct(DisplayText $text = null, NoticeReference $ref = null)
-    {
-        $this->_oid = self::OID_UNOTICE;
-        $this->_text = $text;
-        $this->_ref = $ref;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param DisplayText|null $text
+	 * @param NoticeReference|null $ref
+	 */
+	public function __construct(DisplayText $text = null, NoticeReference $ref = null)
+	{
+		$this->_oid = self::OID_UNOTICE;
+		$this->_text = $text;
+		$this->_ref = $ref;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromQualifierASN1(UnspecifiedType $el)
-    {
-        $seq = $el->asSequence();
-        $ref = null;
-        $text = null;
-        $idx = 0;
-        if ($seq->has($idx, Element::TYPE_SEQUENCE)) {
-            $ref = NoticeReference::fromASN1($seq->at($idx++)->asSequence());
-        }
-        if ($seq->has($idx, Element::TYPE_STRING)) {
-            $text = DisplayText::fromASN1($seq->at($idx)->asString());
-        }
-        return new self($text, $ref);
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromQualifierASN1(UnspecifiedType $el)
+	{
+		$seq = $el->asSequence();
+		$ref = null;
+		$text = null;
+		$idx = 0;
+		if ($seq->has($idx, Element::TYPE_SEQUENCE)) {
+			$ref = NoticeReference::fromASN1($seq->at($idx++)->asSequence());
+		}
+		if ($seq->has($idx, Element::TYPE_STRING)) {
+			$text = DisplayText::fromASN1($seq->at($idx)->asString());
+		}
+		return new self($text, $ref);
+	}
     
-    /**
-     * Whether explicit text is present.
-     *
-     * @return bool
-     */
-    public function hasExplicitText()
-    {
-        return isset($this->_text);
-    }
+	/**
+	 * Whether explicit text is present.
+	 *
+	 * @return bool
+	 */
+	public function hasExplicitText()
+	{
+		return isset($this->_text);
+	}
     
-    /**
-     * Get explicit text.
-     *
-     * @return DisplayText
-     */
-    public function explicitText()
-    {
-        if (!$this->hasExplicitText()) {
-            throw new \LogicException("explicitText not set.");
-        }
-        return $this->_text;
-    }
+	/**
+	 * Get explicit text.
+	 *
+	 * @return DisplayText
+	 */
+	public function explicitText()
+	{
+		if (!$this->hasExplicitText()) {
+			throw new \LogicException("explicitText not set.");
+		}
+		return $this->_text;
+	}
     
-    /**
-     * Whether notice reference is present.
-     *
-     * @return bool
-     */
-    public function hasNoticeRef()
-    {
-        return isset($this->_ref);
-    }
+	/**
+	 * Whether notice reference is present.
+	 *
+	 * @return bool
+	 */
+	public function hasNoticeRef()
+	{
+		return isset($this->_ref);
+	}
     
-    /**
-     * Get notice reference.
-     *
-     * @throws \RuntimeException
-     * @return NoticeReference
-     */
-    public function noticeRef()
-    {
-        if (!$this->hasNoticeRef()) {
-            throw new \LogicException("noticeRef not set.");
-        }
-        return $this->_ref;
-    }
+	/**
+	 * Get notice reference.
+	 *
+	 * @throws \RuntimeException
+	 * @return NoticeReference
+	 */
+	public function noticeRef()
+	{
+		if (!$this->hasNoticeRef()) {
+			throw new \LogicException("noticeRef not set.");
+		}
+		return $this->_ref;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return Sequence
-     */
-    protected function _qualifierASN1()
-    {
-        $elements = array();
-        if (isset($this->_ref)) {
-            $elements[] = $this->_ref->toASN1();
-        }
-        if (isset($this->_text)) {
-            $elements[] = $this->_text->toASN1();
-        }
-        return new Sequence(...$elements);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return Sequence
+	 */
+	protected function _qualifierASN1()
+	{
+		$elements = array();
+		if (isset($this->_ref)) {
+			$elements[] = $this->_ref->toASN1();
+		}
+		if (isset($this->_text)) {
+			$elements[] = $this->_text->toASN1();
+		}
+		return new Sequence(...$elements);
+	}
 }

lib/X509/Certificate/Extension/CertificatePolicy/DisplayText.php

Indentation +82 added lines, -82 removed lines

@@ -17,93 +17,93 @@
  */
 class DisplayText
 {
-    /**
-     * Text.
-     *
-     * @var string $_text
-     */
-    protected $_text;
+	/**
+	 * Text.
+	 *
+	 * @var string $_text
+	 */
+	protected $_text;
     
-    /**
-     * Element tag.
-     *
-     * @var int $_tag
-     */
-    protected $_tag;
+	/**
+	 * Element tag.
+	 *
+	 * @var int $_tag
+	 */
+	protected $_tag;
     
-    /**
-     * Constructor.
-     *
-     * @param string $text
-     * @param int $tag
-     */
-    public function __construct($text, $tag)
-    {
-        $this->_text = $text;
-        $this->_tag = $tag;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $text
+	 * @param int $tag
+	 */
+	public function __construct($text, $tag)
+	{
+		$this->_text = $text;
+		$this->_tag = $tag;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param StringType $el
-     * @return self
-     */
-    public static function fromASN1(StringType $el)
-    {
-        return new self($el->string(), $el->tag());
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param StringType $el
+	 * @return self
+	 */
+	public static function fromASN1(StringType $el)
+	{
+		return new self($el->string(), $el->tag());
+	}
     
-    /**
-     * Initialize from a UTF-8 string.
-     *
-     * @param string $str
-     * @return self
-     */
-    public static function fromString($str)
-    {
-        return new self($str, Element::TYPE_UTF8_STRING);
-    }
+	/**
+	 * Initialize from a UTF-8 string.
+	 *
+	 * @param string $str
+	 * @return self
+	 */
+	public static function fromString($str)
+	{
+		return new self($str, Element::TYPE_UTF8_STRING);
+	}
     
-    /**
-     * Get the text.
-     *
-     * @return string
-     */
-    public function string()
-    {
-        return $this->_text;
-    }
+	/**
+	 * Get the text.
+	 *
+	 * @return string
+	 */
+	public function string()
+	{
+		return $this->_text;
+	}
     
-    /**
-     * Generate ASN.1 element.
-     *
-     * @throws \UnexpectedValueException
-     * @return StringType
-     */
-    public function toASN1()
-    {
-        switch ($this->_tag) {
-            case Element::TYPE_IA5_STRING:
-                return new IA5String($this->_text);
-            case Element::TYPE_VISIBLE_STRING:
-                return new VisibleString($this->_text);
-            case Element::TYPE_BMP_STRING:
-                return new BMPString($this->_text);
-            case Element::TYPE_UTF8_STRING:
-                return new UTF8String($this->_text);
-            default:
-                throw new \UnexpectedValueException(
-                    "Type " . Element::tagToName($this->_tag) . " not supported.");
-        }
-    }
+	/**
+	 * Generate ASN.1 element.
+	 *
+	 * @throws \UnexpectedValueException
+	 * @return StringType
+	 */
+	public function toASN1()
+	{
+		switch ($this->_tag) {
+			case Element::TYPE_IA5_STRING:
+				return new IA5String($this->_text);
+			case Element::TYPE_VISIBLE_STRING:
+				return new VisibleString($this->_text);
+			case Element::TYPE_BMP_STRING:
+				return new BMPString($this->_text);
+			case Element::TYPE_UTF8_STRING:
+				return new UTF8String($this->_text);
+			default:
+				throw new \UnexpectedValueException(
+					"Type " . Element::tagToName($this->_tag) . " not supported.");
+		}
+	}
     
-    /**
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->string();
-    }
+	/**
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->string();
+	}
 }

lib/X509/Certificate/Extension/Target/TargetGroup.php

Indentation +51 added lines, -51 removed lines

@@ -13,60 +13,60 @@
  */
 class TargetGroup extends Target
 {
-    /**
-     * Group name.
-     *
-     * @var GeneralName $_name
-     */
-    protected $_name;
+	/**
+	 * Group name.
+	 *
+	 * @var GeneralName $_name
+	 */
+	protected $_name;
     
-    /**
-     * Constructor.
-     *
-     * @param GeneralName $name
-     */
-    public function __construct(GeneralName $name)
-    {
-        $this->_name = $name;
-        $this->_type = self::TYPE_GROUP;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param GeneralName $name
+	 */
+	public function __construct(GeneralName $name)
+	{
+		$this->_name = $name;
+		$this->_type = self::TYPE_GROUP;
+	}
     
-    /**
-     *
-     * @param TaggedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(TaggedType $el)
-    {
-        return new self(GeneralName::fromASN1($el));
-    }
+	/**
+	 *
+	 * @param TaggedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(TaggedType $el)
+	{
+		return new self(GeneralName::fromASN1($el));
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function string()
-    {
-        return $this->_name->string();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string()
+	{
+		return $this->_name->string();
+	}
     
-    /**
-     * Get group name.
-     *
-     * @return GeneralName
-     */
-    public function name()
-    {
-        return $this->_name;
-    }
+	/**
+	 * Get group name.
+	 *
+	 * @return GeneralName
+	 */
+	public function name()
+	{
+		return $this->_name;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return ExplicitlyTaggedType
-     */
-    public function toASN1()
-    {
-        return new ExplicitlyTaggedType($this->_type, $this->_name->toASN1());
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return ExplicitlyTaggedType
+	 */
+	public function toASN1()
+	{
+		return new ExplicitlyTaggedType($this->_type, $this->_name->toASN1());
+	}
 }

lib/X509/Certificate/Extension/Target/TargetName.php

Indentation +51 added lines, -51 removed lines

@@ -13,60 +13,60 @@
  */
 class TargetName extends Target
 {
-    /**
-     * Name.
-     *
-     * @var GeneralName $_name
-     */
-    protected $_name;
+	/**
+	 * Name.
+	 *
+	 * @var GeneralName $_name
+	 */
+	protected $_name;
     
-    /**
-     * Constructor.
-     *
-     * @param GeneralName $name
-     */
-    public function __construct(GeneralName $name)
-    {
-        $this->_name = $name;
-        $this->_type = self::TYPE_NAME;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param GeneralName $name
+	 */
+	public function __construct(GeneralName $name)
+	{
+		$this->_name = $name;
+		$this->_type = self::TYPE_NAME;
+	}
     
-    /**
-     *
-     * @param TaggedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(TaggedType $el)
-    {
-        return new self(GeneralName::fromASN1($el));
-    }
+	/**
+	 *
+	 * @param TaggedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(TaggedType $el)
+	{
+		return new self(GeneralName::fromASN1($el));
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function string()
-    {
-        return $this->_name->string();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string()
+	{
+		return $this->_name->string();
+	}
     
-    /**
-     * Get name.
-     *
-     * @return GeneralName
-     */
-    public function name()
-    {
-        return $this->_name;
-    }
+	/**
+	 * Get name.
+	 *
+	 * @return GeneralName
+	 */
+	public function name()
+	{
+		return $this->_name;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return ExplicitlyTaggedType
-     */
-    public function toASN1()
-    {
-        return new ExplicitlyTaggedType($this->_type, $this->_name->toASN1());
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return ExplicitlyTaggedType
+	 */
+	public function toASN1()
+	{
+		return new ExplicitlyTaggedType($this->_type, $this->_name->toASN1());
+	}
 }

lib/X509/Certificate/Extension/Target/Target.php

Indentation +78 added lines, -78 removed lines

@@ -11,89 +11,89 @@
  */
 abstract class Target
 {
-    const TYPE_NAME = 0;
-    const TYPE_GROUP = 1;
-    const TYPE_CERT = 2;
+	const TYPE_NAME = 0;
+	const TYPE_GROUP = 1;
+	const TYPE_CERT = 2;
     
-    /**
-     * Type tag.
-     *
-     * @var int $_type
-     */
-    protected $_type;
+	/**
+	 * Type tag.
+	 *
+	 * @var int $_type
+	 */
+	protected $_type;
     
-    /**
-     * Generate ASN.1 element.
-     *
-     * @return \ASN1\Element
-     */
-    abstract public function toASN1();
+	/**
+	 * Generate ASN.1 element.
+	 *
+	 * @return \ASN1\Element
+	 */
+	abstract public function toASN1();
     
-    /**
-     * Get string value of the target.
-     *
-     * @return string
-     */
-    abstract public function string();
+	/**
+	 * Get string value of the target.
+	 *
+	 * @return string
+	 */
+	abstract public function string();
     
-    /**
-     * Initialize concrete object from the chosen ASN.1 element.
-     *
-     * @param TaggedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(TaggedType $el)
-    {
-        throw new \BadMethodCallException(
-            __FUNCTION__ . " must be implemented in the derived class.");
-    }
+	/**
+	 * Initialize concrete object from the chosen ASN.1 element.
+	 *
+	 * @param TaggedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(TaggedType $el)
+	{
+		throw new \BadMethodCallException(
+			__FUNCTION__ . " must be implemented in the derived class.");
+	}
     
-    /**
-     * Parse from ASN.1.
-     *
-     * @param TaggedType $el
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromASN1(TaggedType $el)
-    {
-        switch ($el->tag()) {
-            case self::TYPE_NAME:
-                return TargetName::fromChosenASN1($el->asExplicit()->asTagged());
-            case self::TYPE_GROUP:
-                return TargetGroup::fromChosenASN1(
-                    $el->asExplicit()->asTagged());
-            case self::TYPE_CERT:
-                throw new \RuntimeException("targetCert not supported.");
-        }
-        throw new \UnexpectedValueException(
-            "Target type " . $el->tag() . " not supported.");
-    }
+	/**
+	 * Parse from ASN.1.
+	 *
+	 * @param TaggedType $el
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromASN1(TaggedType $el)
+	{
+		switch ($el->tag()) {
+			case self::TYPE_NAME:
+				return TargetName::fromChosenASN1($el->asExplicit()->asTagged());
+			case self::TYPE_GROUP:
+				return TargetGroup::fromChosenASN1(
+					$el->asExplicit()->asTagged());
+			case self::TYPE_CERT:
+				throw new \RuntimeException("targetCert not supported.");
+		}
+		throw new \UnexpectedValueException(
+			"Target type " . $el->tag() . " not supported.");
+	}
     
-    /**
-     * Get type tag.
-     *
-     * @return int
-     */
-    public function type()
-    {
-        return $this->_type;
-    }
+	/**
+	 * Get type tag.
+	 *
+	 * @return int
+	 */
+	public function type()
+	{
+		return $this->_type;
+	}
     
-    /**
-     * Check whether target is equal to another.
-     *
-     * @param Target $other
-     * @return bool
-     */
-    public function equals(Target $other)
-    {
-        if ($this->_type != $other->_type) {
-            return false;
-        }
-        if ($this->toASN1()->toDER() != $other->toASN1()->toDER()) {
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Check whether target is equal to another.
+	 *
+	 * @param Target $other
+	 * @return bool
+	 */
+	public function equals(Target $other)
+	{
+		if ($this->_type != $other->_type) {
+			return false;
+		}
+		if ($this->toASN1()->toDER() != $other->toASN1()->toDER()) {
+			return false;
+		}
+		return true;
+	}
 }

lib/X509/Certificate/Extension/Target/Targets.php

Indentation +117 added lines, -117 removed lines

@@ -12,131 +12,131 @@
  */
 class Targets implements \Countable, \IteratorAggregate
 {
-    /**
-     * Target elements.
-     *
-     * @var Target[] $_targets
-     */
-    protected $_targets;
+	/**
+	 * Target elements.
+	 *
+	 * @var Target[] $_targets
+	 */
+	protected $_targets;
     
-    /**
-     * Constructor.
-     *
-     * @param Target ...$targets
-     */
-    public function __construct(Target ...$targets)
-    {
-        $this->_targets = $targets;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Target ...$targets
+	 */
+	public function __construct(Target ...$targets)
+	{
+		$this->_targets = $targets;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq)
-    {
-        $targets = array_map(
-            function (UnspecifiedType $el) {
-                return Target::fromASN1($el->asTagged());
-            }, $seq->elements());
-        return new self(...$targets);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq)
+	{
+		$targets = array_map(
+			function (UnspecifiedType $el) {
+				return Target::fromASN1($el->asTagged());
+			}, $seq->elements());
+		return new self(...$targets);
+	}
     
-    /**
-     * Get all targets.
-     *
-     * @return Target[]
-     */
-    public function all()
-    {
-        return $this->_targets;
-    }
+	/**
+	 * Get all targets.
+	 *
+	 * @return Target[]
+	 */
+	public function all()
+	{
+		return $this->_targets;
+	}
     
-    /**
-     * Get all targets of given type.
-     *
-     * @param int $type
-     * @return Target[]
-     */
-    protected function _allOfType($type)
-    {
-        return array_values(
-            array_filter($this->_targets,
-                function (Target $target) use ($type) {
-                    return $target->type() == $type;
-                }));
-    }
+	/**
+	 * Get all targets of given type.
+	 *
+	 * @param int $type
+	 * @return Target[]
+	 */
+	protected function _allOfType($type)
+	{
+		return array_values(
+			array_filter($this->_targets,
+				function (Target $target) use ($type) {
+					return $target->type() == $type;
+				}));
+	}
     
-    /**
-     * Get all name targets.
-     *
-     * @return Target[]
-     */
-    public function nameTargets()
-    {
-        return $this->_allOfType(Target::TYPE_NAME);
-    }
+	/**
+	 * Get all name targets.
+	 *
+	 * @return Target[]
+	 */
+	public function nameTargets()
+	{
+		return $this->_allOfType(Target::TYPE_NAME);
+	}
     
-    /**
-     * Get all group targets.
-     *
-     * @return Target[]
-     */
-    public function groupTargets()
-    {
-        return $this->_allOfType(Target::TYPE_GROUP);
-    }
+	/**
+	 * Get all group targets.
+	 *
+	 * @return Target[]
+	 */
+	public function groupTargets()
+	{
+		return $this->_allOfType(Target::TYPE_GROUP);
+	}
     
-    /**
-     * Check whether given target is present.
-     *
-     * @param Target $target
-     * @return boolean
-     */
-    public function hasTarget(Target $target)
-    {
-        foreach ($this->_allOfType($target->type()) as $t) {
-            if ($target->equals($t)) {
-                return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * Check whether given target is present.
+	 *
+	 * @param Target $target
+	 * @return boolean
+	 */
+	public function hasTarget(Target $target)
+	{
+		foreach ($this->_allOfType($target->type()) as $t) {
+			if ($target->equals($t)) {
+				return true;
+			}
+		}
+		return false;
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1()
-    {
-        $elements = array_map(
-            function (Target $target) {
-                return $target->toASN1();
-            }, $this->_targets);
-        return new Sequence(...$elements);
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1()
+	{
+		$elements = array_map(
+			function (Target $target) {
+				return $target->toASN1();
+			}, $this->_targets);
+		return new Sequence(...$elements);
+	}
     
-    /**
-     *
-     * @see \Countable::count()
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_targets);
-    }
+	/**
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->_targets);
+	}
     
-    /**
-     * Get iterator for targets.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->_targets);
-    }
+	/**
+	 * Get iterator for targets.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator()
+	{
+		return new \ArrayIterator($this->_targets);
+	}
 }

lib/X509/CertificationRequest/CertificationRequest.php

Indentation +154 added lines, -154 removed lines

@@ -16,172 +16,172 @@
  */
 class CertificationRequest
 {
-    /**
-     * Certification request info.
-     *
-     * @var CertificationRequestInfo $_certificationRequestInfo
-     */
-    protected $_certificationRequestInfo;
+	/**
+	 * Certification request info.
+	 *
+	 * @var CertificationRequestInfo $_certificationRequestInfo
+	 */
+	protected $_certificationRequestInfo;
     
-    /**
-     * Signature algorithm.
-     *
-     * @var SignatureAlgorithmIdentifier $_signatureAlgorithm
-     */
-    protected $_signatureAlgorithm;
+	/**
+	 * Signature algorithm.
+	 *
+	 * @var SignatureAlgorithmIdentifier $_signatureAlgorithm
+	 */
+	protected $_signatureAlgorithm;
     
-    /**
-     * Signature.
-     *
-     * @var Signature $_signature
-     */
-    protected $_signature;
+	/**
+	 * Signature.
+	 *
+	 * @var Signature $_signature
+	 */
+	protected $_signature;
     
-    /**
-     * Constructor.
-     *
-     * @param CertificationRequestInfo $info
-     * @param SignatureAlgorithmIdentifier $algo
-     * @param Signature $signature
-     */
-    public function __construct(CertificationRequestInfo $info,
-        SignatureAlgorithmIdentifier $algo, Signature $signature)
-    {
-        $this->_certificationRequestInfo = $info;
-        $this->_signatureAlgorithm = $algo;
-        $this->_signature = $signature;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param CertificationRequestInfo $info
+	 * @param SignatureAlgorithmIdentifier $algo
+	 * @param Signature $signature
+	 */
+	public function __construct(CertificationRequestInfo $info,
+		SignatureAlgorithmIdentifier $algo, Signature $signature)
+	{
+		$this->_certificationRequestInfo = $info;
+		$this->_signatureAlgorithm = $algo;
+		$this->_signature = $signature;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq)
-    {
-        $info = CertificationRequestInfo::fromASN1($seq->at(0)->asSequence());
-        $algo = AlgorithmIdentifier::fromASN1($seq->at(1)->asSequence());
-        if (!$algo instanceof SignatureAlgorithmIdentifier) {
-            throw new \UnexpectedValueException(
-                "Unsupported signature algorithm " . $algo->oid() . ".");
-        }
-        $signature = Signature::fromSignatureData(
-            $seq->at(2)
-                ->asBitString()
-                ->string(), $algo);
-        return new self($info, $algo, $signature);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq)
+	{
+		$info = CertificationRequestInfo::fromASN1($seq->at(0)->asSequence());
+		$algo = AlgorithmIdentifier::fromASN1($seq->at(1)->asSequence());
+		if (!$algo instanceof SignatureAlgorithmIdentifier) {
+			throw new \UnexpectedValueException(
+				"Unsupported signature algorithm " . $algo->oid() . ".");
+		}
+		$signature = Signature::fromSignatureData(
+			$seq->at(2)
+				->asBitString()
+				->string(), $algo);
+		return new self($info, $algo, $signature);
+	}
     
-    /**
-     * Initialize from DER.
-     *
-     * @param string $data
-     * @return self
-     */
-    public static function fromDER($data)
-    {
-        return self::fromASN1(Sequence::fromDER($data));
-    }
+	/**
+	 * Initialize from DER.
+	 *
+	 * @param string $data
+	 * @return self
+	 */
+	public static function fromDER($data)
+	{
+		return self::fromASN1(Sequence::fromDER($data));
+	}
     
-    /**
-     * Initialize from PEM.
-     *
-     * @param PEM $pem
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromPEM(PEM $pem)
-    {
-        if ($pem->type() !== PEM::TYPE_CERTIFICATE_REQUEST) {
-            throw new \UnexpectedValueException("Invalid PEM type.");
-        }
-        return self::fromDER($pem->data());
-    }
+	/**
+	 * Initialize from PEM.
+	 *
+	 * @param PEM $pem
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromPEM(PEM $pem)
+	{
+		if ($pem->type() !== PEM::TYPE_CERTIFICATE_REQUEST) {
+			throw new \UnexpectedValueException("Invalid PEM type.");
+		}
+		return self::fromDER($pem->data());
+	}
     
-    /**
-     * Get certification request info.
-     *
-     * @return CertificationRequestInfo
-     */
-    public function certificationRequestInfo()
-    {
-        return $this->_certificationRequestInfo;
-    }
+	/**
+	 * Get certification request info.
+	 *
+	 * @return CertificationRequestInfo
+	 */
+	public function certificationRequestInfo()
+	{
+		return $this->_certificationRequestInfo;
+	}
     
-    /**
-     * Get signature algorithm.
-     *
-     * @return SignatureAlgorithmIdentifier
-     */
-    public function signatureAlgorithm()
-    {
-        return $this->_signatureAlgorithm;
-    }
+	/**
+	 * Get signature algorithm.
+	 *
+	 * @return SignatureAlgorithmIdentifier
+	 */
+	public function signatureAlgorithm()
+	{
+		return $this->_signatureAlgorithm;
+	}
     
-    /**
-     * Get signature.
-     *
-     * @return Signature
-     */
-    public function signature()
-    {
-        return $this->_signature;
-    }
+	/**
+	 * Get signature.
+	 *
+	 * @return Signature
+	 */
+	public function signature()
+	{
+		return $this->_signature;
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1()
-    {
-        return new Sequence($this->_certificationRequestInfo->toASN1(),
-            $this->_signatureAlgorithm->toASN1(), $this->_signature->bitString());
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1()
+	{
+		return new Sequence($this->_certificationRequestInfo->toASN1(),
+			$this->_signatureAlgorithm->toASN1(), $this->_signature->bitString());
+	}
     
-    /**
-     * Get certification request as a DER.
-     *
-     * @return string
-     */
-    public function toDER()
-    {
-        return $this->toASN1()->toDER();
-    }
+	/**
+	 * Get certification request as a DER.
+	 *
+	 * @return string
+	 */
+	public function toDER()
+	{
+		return $this->toASN1()->toDER();
+	}
     
-    /**
-     * Get certification request as a PEM.
-     *
-     * @return PEM
-     */
-    public function toPEM()
-    {
-        return new PEM(PEM::TYPE_CERTIFICATE_REQUEST, $this->toDER());
-    }
+	/**
+	 * Get certification request as a PEM.
+	 *
+	 * @return PEM
+	 */
+	public function toPEM()
+	{
+		return new PEM(PEM::TYPE_CERTIFICATE_REQUEST, $this->toDER());
+	}
     
-    /**
-     * Verify certification request signature.
-     *
-     * @param Crypto|null $crypto Crypto engine, use default if not set
-     * @return bool True if signature matches
-     */
-    public function verify(Crypto $crypto = null)
-    {
-        $crypto = $crypto ?: Crypto::getDefault();
-        $data = $this->_certificationRequestInfo->toASN1()->toDER();
-        $pk_info = $this->_certificationRequestInfo->subjectPKInfo();
-        return $crypto->verify($data, $this->_signature, $pk_info,
-            $this->_signatureAlgorithm);
-    }
+	/**
+	 * Verify certification request signature.
+	 *
+	 * @param Crypto|null $crypto Crypto engine, use default if not set
+	 * @return bool True if signature matches
+	 */
+	public function verify(Crypto $crypto = null)
+	{
+		$crypto = $crypto ?: Crypto::getDefault();
+		$data = $this->_certificationRequestInfo->toASN1()->toDER();
+		$pk_info = $this->_certificationRequestInfo->subjectPKInfo();
+		return $crypto->verify($data, $this->_signature, $pk_info,
+			$this->_signatureAlgorithm);
+	}
     
-    /**
-     * Get certification request as a PEM formatted string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toPEM()->string();
-    }
+	/**
+	 * Get certification request as a PEM formatted string.
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->toPEM()->string();
+	}
 }