sop / x509

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

Indentation +51 added lines, -51 removed lines

@@ -15,60 +15,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): self
-    {
-        return new self(GeneralName::fromASN1($el));
-    }
+	/**
+	 *
+	 * @param TaggedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(TaggedType $el): self
+	{
+		return new self(GeneralName::fromASN1($el));
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function string(): string
-    {
-        return $this->_name->string();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string(): string
+	{
+		return $this->_name->string();
+	}
     
-    /**
-     * Get name.
-     *
-     * @return GeneralName
-     */
-    public function name(): GeneralName
-    {
-        return $this->_name;
-    }
+	/**
+	 * Get name.
+	 *
+	 * @return GeneralName
+	 */
+	public function name(): GeneralName
+	{
+		return $this->_name;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return ExplicitlyTaggedType
-     */
-    public function toASN1(): TaggedType
-    {
-        return new ExplicitlyTaggedType($this->_type, $this->_name->toASN1());
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return ExplicitlyTaggedType
+	 */
+	public function toASN1(): TaggedType
+	{
+		return new ExplicitlyTaggedType($this->_type, $this->_name->toASN1());
+	}
 }

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

Indentation +82 added lines, -82 removed lines

@@ -19,93 +19,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(string $text, int $tag)
-    {
-        $this->_text = $text;
-        $this->_tag = $tag;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $text
+	 * @param int $tag
+	 */
+	public function __construct(string $text, int $tag)
+	{
+		$this->_text = $text;
+		$this->_tag = $tag;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param StringType $el
-     * @return self
-     */
-    public static function fromASN1(StringType $el): self
-    {
-        return new self($el->string(), $el->tag());
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param StringType $el
+	 * @return self
+	 */
+	public static function fromASN1(StringType $el): self
+	{
+		return new self($el->string(), $el->tag());
+	}
     
-    /**
-     * Initialize from a UTF-8 string.
-     *
-     * @param string $str
-     * @return self
-     */
-    public static function fromString(string $str): self
-    {
-        return new self($str, Element::TYPE_UTF8_STRING);
-    }
+	/**
+	 * Initialize from a UTF-8 string.
+	 *
+	 * @param string $str
+	 * @return self
+	 */
+	public static function fromString(string $str): self
+	{
+		return new self($str, Element::TYPE_UTF8_STRING);
+	}
     
-    /**
-     * Get the text.
-     *
-     * @return string
-     */
-    public function string(): string
-    {
-        return $this->_text;
-    }
+	/**
+	 * Get the text.
+	 *
+	 * @return string
+	 */
+	public function string(): string
+	{
+		return $this->_text;
+	}
     
-    /**
-     * Generate ASN.1 element.
-     *
-     * @throws \UnexpectedValueException
-     * @return StringType
-     */
-    public function toASN1(): StringType
-    {
-        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(): StringType
+	{
+		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();
+	}
 }

Switch Indentation +11 added lines, -11 removed lines

@@ -86,17 +86,17 @@
     public function toASN1(): StringType
     {
         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.");
+        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.");
         }
     }
     

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

Indentation +43 added lines, -43 removed lines

@@ -15,51 +15,51 @@
  */
 class CPSQualifier extends PolicyQualifierInfo
 {
-    /**
-     * URI.
-     *
-     * @var string $_uri
-     */
-    protected $_uri;
+	/**
+	 * URI.
+	 *
+	 * @var string $_uri
+	 */
+	protected $_uri;
     
-    /**
-     * Constructor.
-     *
-     * @param string $uri
-     */
-    public function __construct(string $uri)
-    {
-        $this->_oid = self::OID_CPS;
-        $this->_uri = $uri;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $uri
+	 */
+	public function __construct(string $uri)
+	{
+		$this->_oid = self::OID_CPS;
+		$this->_uri = $uri;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromQualifierASN1(UnspecifiedType $el): self
-    {
-        return new self($el->asString()->string());
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromQualifierASN1(UnspecifiedType $el): self
+	{
+		return new self($el->asString()->string());
+	}
     
-    /**
-     * Get URI.
-     *
-     * @return string
-     */
-    public function uri(): string
-    {
-        return $this->_uri;
-    }
+	/**
+	 * Get URI.
+	 *
+	 * @return string
+	 */
+	public function uri(): string
+	{
+		return $this->_uri;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return IA5String
-     */
-    protected function _qualifierASN1(): IA5String
-    {
-        return new IA5String($this->_uri);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return IA5String
+	 */
+	protected function _qualifierASN1(): IA5String
+	{
+		return new IA5String($this->_uri);
+	}
 }

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

Indentation +102 added lines, -102 removed lines

@@ -16,114 +16,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): self
-    {
-        $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): self
+	{
+		$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(): bool
-    {
-        return isset($this->_text);
-    }
+	/**
+	 * Whether explicit text is present.
+	 *
+	 * @return bool
+	 */
+	public function hasExplicitText(): bool
+	{
+		return isset($this->_text);
+	}
     
-    /**
-     * Get explicit text.
-     *
-     * @return DisplayText
-     */
-    public function explicitText(): DisplayText
-    {
-        if (!$this->hasExplicitText()) {
-            throw new \LogicException("explicitText not set.");
-        }
-        return $this->_text;
-    }
+	/**
+	 * Get explicit text.
+	 *
+	 * @return DisplayText
+	 */
+	public function explicitText(): DisplayText
+	{
+		if (!$this->hasExplicitText()) {
+			throw new \LogicException("explicitText not set.");
+		}
+		return $this->_text;
+	}
     
-    /**
-     * Whether notice reference is present.
-     *
-     * @return bool
-     */
-    public function hasNoticeRef(): bool
-    {
-        return isset($this->_ref);
-    }
+	/**
+	 * Whether notice reference is present.
+	 *
+	 * @return bool
+	 */
+	public function hasNoticeRef(): bool
+	{
+		return isset($this->_ref);
+	}
     
-    /**
-     * Get notice reference.
-     *
-     * @throws \RuntimeException
-     * @return NoticeReference
-     */
-    public function noticeRef(): NoticeReference
-    {
-        if (!$this->hasNoticeRef()) {
-            throw new \LogicException("noticeRef not set.");
-        }
-        return $this->_ref;
-    }
+	/**
+	 * Get notice reference.
+	 *
+	 * @throws \RuntimeException
+	 * @return NoticeReference
+	 */
+	public function noticeRef(): NoticeReference
+	{
+		if (!$this->hasNoticeRef()) {
+			throw new \LogicException("noticeRef not set.");
+		}
+		return $this->_ref;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return Sequence
-     */
-    protected function _qualifierASN1(): Sequence
-    {
-        $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(): Sequence
+	{
+		$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/NoticeReference.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
     {
         $org = DisplayText::fromASN1($seq->at(0)->asString());
         $numbers = array_map(
-            function (UnspecifiedType $el) {
+            function(UnspecifiedType $el) {
                 return $el->asInteger()->intNumber();
             },
             $seq->at(1)
@@ -90,7 +90,7 @@ 
     {
         $org = $this->_organization->toASN1();
         $nums = array_map(
-            function ($number) {
+            function($number) {
                 return new Integer($number);
             }, $this->_numbers);
         return new Sequence($org, new Sequence(...$nums));

Indentation +73 added lines, -73 removed lines

@@ -16,83 +16,83 @@
  */
 class NoticeReference
 {
-    /**
-     * Organization.
-     *
-     * @var DisplayText $_organization
-     */
-    protected $_organization;
+	/**
+	 * Organization.
+	 *
+	 * @var DisplayText $_organization
+	 */
+	protected $_organization;
     
-    /**
-     * Notification reference numbers.
-     *
-     * @var int[] $_numbers
-     */
-    protected $_numbers;
+	/**
+	 * Notification reference numbers.
+	 *
+	 * @var int[] $_numbers
+	 */
+	protected $_numbers;
     
-    /**
-     * Constructor.
-     *
-     * @param DisplayText $organization
-     * @param int ...$numbers
-     */
-    public function __construct(DisplayText $organization, int ...$numbers)
-    {
-        $this->_organization = $organization;
-        $this->_numbers = $numbers;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param DisplayText $organization
+	 * @param int ...$numbers
+	 */
+	public function __construct(DisplayText $organization, int ...$numbers)
+	{
+		$this->_organization = $organization;
+		$this->_numbers = $numbers;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        $org = DisplayText::fromASN1($seq->at(0)->asString());
-        $numbers = array_map(
-            function (UnspecifiedType $el) {
-                return $el->asInteger()->intNumber();
-            },
-            $seq->at(1)
-                ->asSequence()
-                ->elements());
-        return new self($org, ...$numbers);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		$org = DisplayText::fromASN1($seq->at(0)->asString());
+		$numbers = array_map(
+			function (UnspecifiedType $el) {
+				return $el->asInteger()->intNumber();
+			},
+			$seq->at(1)
+				->asSequence()
+				->elements());
+		return new self($org, ...$numbers);
+	}
     
-    /**
-     * Get reference organization.
-     *
-     * @return DisplayText
-     */
-    public function organization(): DisplayText
-    {
-        return $this->_organization;
-    }
+	/**
+	 * Get reference organization.
+	 *
+	 * @return DisplayText
+	 */
+	public function organization(): DisplayText
+	{
+		return $this->_organization;
+	}
     
-    /**
-     * Get reference numbers.
-     *
-     * @return int[]
-     */
-    public function numbers(): array
-    {
-        return $this->_numbers;
-    }
+	/**
+	 * Get reference numbers.
+	 *
+	 * @return int[]
+	 */
+	public function numbers(): array
+	{
+		return $this->_numbers;
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $org = $this->_organization->toASN1();
-        $nums = array_map(
-            function ($number) {
-                return new Integer($number);
-            }, $this->_numbers);
-        return new Sequence($org, new Sequence(...$nums));
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$org = $this->_organization->toASN1();
+		$nums = array_map(
+			function ($number) {
+				return new Integer($number);
+			}, $this->_numbers);
+		return new Sequence($org, new Sequence(...$nums));
+	}
 }

lib/X509/Certificate/Extension/NoRevocationAvailableExtension.php

Indentation +28 added lines, -28 removed lines

@@ -13,34 +13,34 @@
  */
 class NoRevocationAvailableExtension extends Extension
 {
-    /**
-     * Constructor.
-     *
-     * @param bool $critical
-     */
-    public function __construct(bool $critical)
-    {
-        parent::__construct(self::OID_NO_REV_AVAIL, $critical);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool $critical
+	 */
+	public function __construct(bool $critical)
+	{
+		parent::__construct(self::OID_NO_REV_AVAIL, $critical);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _fromDER(string $data, bool $critical): self
-    {
-        NullType::fromDER($data);
-        return new self($critical);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _fromDER(string $data, bool $critical): self
+	{
+		NullType::fromDER($data);
+		return new self($critical);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return NullType
-     */
-    protected function _valueASN1(): NullType
-    {
-        return new NullType();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return NullType
+	 */
+	protected function _valueASN1(): NullType
+	{
+		return new NullType();
+	}
 }

lib/X509/Certificate/Extension/AuthorityKeyIdentifierExtension.php

Indentation +156 added lines, -156 removed lines

@@ -18,170 +18,170 @@
  */
 class AuthorityKeyIdentifierExtension extends Extension
 {
-    /**
-     * Key identifier.
-     *
-     * @var string|null $_keyIdentifier
-     */
-    protected $_keyIdentifier;
+	/**
+	 * Key identifier.
+	 *
+	 * @var string|null $_keyIdentifier
+	 */
+	protected $_keyIdentifier;
     
-    /**
-     * Issuer name.
-     *
-     * @var GeneralNames|null $_authorityCertIssuer
-     */
-    protected $_authorityCertIssuer;
+	/**
+	 * Issuer name.
+	 *
+	 * @var GeneralNames|null $_authorityCertIssuer
+	 */
+	protected $_authorityCertIssuer;
     
-    /**
-     * Issuer serial number.
-     *
-     * @var string|null $_authorityCertSerialNumber
-     */
-    protected $_authorityCertSerialNumber;
+	/**
+	 * Issuer serial number.
+	 *
+	 * @var string|null $_authorityCertSerialNumber
+	 */
+	protected $_authorityCertSerialNumber;
     
-    /**
-     * Constructor.
-     *
-     * @param bool $critical Conforming CA's must mark as non-critical (false)
-     * @param string|null $keyIdentifier
-     * @param GeneralNames|null $issuer
-     * @param string|null $serial
-     */
-    public function __construct(bool $critical, $keyIdentifier,
-        GeneralNames $issuer = null, $serial = null)
-    {
-        parent::__construct(self::OID_AUTHORITY_KEY_IDENTIFIER, $critical);
-        $this->_keyIdentifier = $keyIdentifier;
-        $this->_authorityCertIssuer = $issuer;
-        $this->_authorityCertSerialNumber = isset($serial) ? strval($serial) : null;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool $critical Conforming CA's must mark as non-critical (false)
+	 * @param string|null $keyIdentifier
+	 * @param GeneralNames|null $issuer
+	 * @param string|null $serial
+	 */
+	public function __construct(bool $critical, $keyIdentifier,
+		GeneralNames $issuer = null, $serial = null)
+	{
+		parent::__construct(self::OID_AUTHORITY_KEY_IDENTIFIER, $critical);
+		$this->_keyIdentifier = $keyIdentifier;
+		$this->_authorityCertIssuer = $issuer;
+		$this->_authorityCertSerialNumber = isset($serial) ? strval($serial) : null;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _fromDER(string $data, bool $critical): self
-    {
-        $seq = Sequence::fromDER($data);
-        $keyIdentifier = null;
-        $issuer = null;
-        $serial = null;
-        if ($seq->hasTagged(0)) {
-            $keyIdentifier = $seq->getTagged(0)
-                ->asImplicit(Element::TYPE_OCTET_STRING)
-                ->asOctetString()
-                ->string();
-        }
-        if ($seq->hasTagged(1) || $seq->hasTagged(2)) {
-            if (!$seq->hasTagged(1) || !$seq->hasTagged(2)) {
-                throw new \UnexpectedValueException(
-                    "AuthorityKeyIdentifier must have both" .
-                         " authorityCertIssuer and authorityCertSerialNumber" .
-                         " present or both absent.");
-            }
-            $issuer = GeneralNames::fromASN1(
-                $seq->getTagged(1)
-                    ->asImplicit(Element::TYPE_SEQUENCE)
-                    ->asSequence());
-            $serial = $seq->getTagged(2)
-                ->asImplicit(Element::TYPE_INTEGER)
-                ->asInteger()
-                ->number();
-        }
-        return new self($critical, $keyIdentifier, $issuer, $serial);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _fromDER(string $data, bool $critical): self
+	{
+		$seq = Sequence::fromDER($data);
+		$keyIdentifier = null;
+		$issuer = null;
+		$serial = null;
+		if ($seq->hasTagged(0)) {
+			$keyIdentifier = $seq->getTagged(0)
+				->asImplicit(Element::TYPE_OCTET_STRING)
+				->asOctetString()
+				->string();
+		}
+		if ($seq->hasTagged(1) || $seq->hasTagged(2)) {
+			if (!$seq->hasTagged(1) || !$seq->hasTagged(2)) {
+				throw new \UnexpectedValueException(
+					"AuthorityKeyIdentifier must have both" .
+						 " authorityCertIssuer and authorityCertSerialNumber" .
+						 " present or both absent.");
+			}
+			$issuer = GeneralNames::fromASN1(
+				$seq->getTagged(1)
+					->asImplicit(Element::TYPE_SEQUENCE)
+					->asSequence());
+			$serial = $seq->getTagged(2)
+				->asImplicit(Element::TYPE_INTEGER)
+				->asInteger()
+				->number();
+		}
+		return new self($critical, $keyIdentifier, $issuer, $serial);
+	}
     
-    /**
-     * Whether key identifier is present.
-     *
-     * @return bool
-     */
-    public function hasKeyIdentifier(): bool
-    {
-        return isset($this->_keyIdentifier);
-    }
+	/**
+	 * Whether key identifier is present.
+	 *
+	 * @return bool
+	 */
+	public function hasKeyIdentifier(): bool
+	{
+		return isset($this->_keyIdentifier);
+	}
     
-    /**
-     * Get key identifier.
-     *
-     * @throws \LogicException
-     * @return string
-     */
-    public function keyIdentifier(): string
-    {
-        if (!$this->hasKeyIdentifier()) {
-            throw new \LogicException("keyIdentifier not set.");
-        }
-        return $this->_keyIdentifier;
-    }
+	/**
+	 * Get key identifier.
+	 *
+	 * @throws \LogicException
+	 * @return string
+	 */
+	public function keyIdentifier(): string
+	{
+		if (!$this->hasKeyIdentifier()) {
+			throw new \LogicException("keyIdentifier not set.");
+		}
+		return $this->_keyIdentifier;
+	}
     
-    /**
-     * Whether issuer is present.
-     *
-     * @return bool
-     */
-    public function hasIssuer(): bool
-    {
-        return isset($this->_authorityCertIssuer);
-    }
+	/**
+	 * Whether issuer is present.
+	 *
+	 * @return bool
+	 */
+	public function hasIssuer(): bool
+	{
+		return isset($this->_authorityCertIssuer);
+	}
     
-    /**
-     * Get issuer.
-     *
-     * @throws \LogicException
-     * @return GeneralNames
-     */
-    public function issuer(): GeneralNames
-    {
-        if (!$this->hasIssuer()) {
-            throw new \LogicException("authorityCertIssuer not set.");
-        }
-        return $this->_authorityCertIssuer;
-    }
+	/**
+	 * Get issuer.
+	 *
+	 * @throws \LogicException
+	 * @return GeneralNames
+	 */
+	public function issuer(): GeneralNames
+	{
+		if (!$this->hasIssuer()) {
+			throw new \LogicException("authorityCertIssuer not set.");
+		}
+		return $this->_authorityCertIssuer;
+	}
     
-    /**
-     * Get serial number.
-     *
-     * @throws \LogicException
-     * @return string Base 10 integer string
-     */
-    public function serial(): string
-    {
-        // both issuer and serial must be present or both absent
-        if (!$this->hasIssuer()) {
-            throw new \LogicException("authorityCertSerialNumber not set.");
-        }
-        return $this->_authorityCertSerialNumber;
-    }
+	/**
+	 * Get serial number.
+	 *
+	 * @throws \LogicException
+	 * @return string Base 10 integer string
+	 */
+	public function serial(): string
+	{
+		// both issuer and serial must be present or both absent
+		if (!$this->hasIssuer()) {
+			throw new \LogicException("authorityCertSerialNumber not set.");
+		}
+		return $this->_authorityCertSerialNumber;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return Sequence
-     */
-    protected function _valueASN1(): Sequence
-    {
-        $elements = array();
-        if (isset($this->_keyIdentifier)) {
-            $elements[] = new ImplicitlyTaggedType(0,
-                new OctetString($this->_keyIdentifier));
-        }
-        // if either issuer or serial is set, both must be set
-        if (isset($this->_authorityCertIssuer) ||
-             isset($this->_authorityCertSerialNumber)) {
-            if (!isset($this->_authorityCertIssuer,
-                $this->_authorityCertSerialNumber)) {
-                throw new \LogicException(
-                    "AuthorityKeyIdentifier must have both" .
-                     " authorityCertIssuer and authorityCertSerialNumber" .
-                     " present or both absent.");
-            }
-            $elements[] = new ImplicitlyTaggedType(1,
-                $this->_authorityCertIssuer->toASN1());
-            $elements[] = new ImplicitlyTaggedType(2,
-                new Integer($this->_authorityCertSerialNumber));
-        }
-        return new Sequence(...$elements);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return Sequence
+	 */
+	protected function _valueASN1(): Sequence
+	{
+		$elements = array();
+		if (isset($this->_keyIdentifier)) {
+			$elements[] = new ImplicitlyTaggedType(0,
+				new OctetString($this->_keyIdentifier));
+		}
+		// if either issuer or serial is set, both must be set
+		if (isset($this->_authorityCertIssuer) ||
+			 isset($this->_authorityCertSerialNumber)) {
+			if (!isset($this->_authorityCertIssuer,
+				$this->_authorityCertSerialNumber)) {
+				throw new \LogicException(
+					"AuthorityKeyIdentifier must have both" .
+					 " authorityCertIssuer and authorityCertSerialNumber" .
+					 " present or both absent.");
+			}
+			$elements[] = new ImplicitlyTaggedType(1,
+				$this->_authorityCertIssuer->toASN1());
+			$elements[] = new ImplicitlyTaggedType(2,
+				new Integer($this->_authorityCertSerialNumber));
+		}
+		return new Sequence(...$elements);
+	}
 }

lib/X509/Certificate/Extension/IssuerAlternativeNameExtension.php

Indentation +45 added lines, -45 removed lines

@@ -14,53 +14,53 @@
  */
 class IssuerAlternativeNameExtension extends Extension
 {
-    /**
-     * Names.
-     *
-     * @var GeneralNames
-     */
-    protected $_names;
+	/**
+	 * Names.
+	 *
+	 * @var GeneralNames
+	 */
+	protected $_names;
     
-    /**
-     * Constructor.
-     *
-     * @param bool $critical
-     * @param GeneralNames $names
-     */
-    public function __construct(bool $critical, GeneralNames $names)
-    {
-        parent::__construct(self::OID_ISSUER_ALT_NAME, $critical);
-        $this->_names = $names;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool $critical
+	 * @param GeneralNames $names
+	 */
+	public function __construct(bool $critical, GeneralNames $names)
+	{
+		parent::__construct(self::OID_ISSUER_ALT_NAME, $critical);
+		$this->_names = $names;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _fromDER(string $data, bool $critical)
-    {
-        return new self($critical,
-            GeneralNames::fromASN1(Sequence::fromDER($data)));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _fromDER(string $data, bool $critical)
+	{
+		return new self($critical,
+			GeneralNames::fromASN1(Sequence::fromDER($data)));
+	}
     
-    /**
-     * Get names.
-     *
-     * @return GeneralNames
-     */
-    public function names(): GeneralNames
-    {
-        return $this->_names;
-    }
+	/**
+	 * Get names.
+	 *
+	 * @return GeneralNames
+	 */
+	public function names(): GeneralNames
+	{
+		return $this->_names;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return Sequence
-     */
-    protected function _valueASN1(): Sequence
-    {
-        return $this->_names->toASN1();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return Sequence
+	 */
+	protected function _valueASN1(): Sequence
+	{
+		return $this->_names->toASN1();
+	}
 }

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

Indentation +67 added lines, -67 removed lines

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