sop / x509

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

Indentation +74 added lines, -74 removed lines

@@ -14,85 +14,85 @@
  */
 abstract class PolicyQualifierInfo
 {
-    /**
-     * OID for the CPS Pointer qualifier.
-     *
-     * @var string
-     */
-    const OID_CPS = "1.3.6.1.5.5.7.2.1";
+	/**
+	 * OID for the CPS Pointer qualifier.
+	 *
+	 * @var string
+	 */
+	const OID_CPS = "1.3.6.1.5.5.7.2.1";
     
-    /**
-     * OID for the user notice qualifier.
-     *
-     * @var string
-     */
-    const OID_UNOTICE = "1.3.6.1.5.5.7.2.2";
+	/**
+	 * OID for the user notice qualifier.
+	 *
+	 * @var string
+	 */
+	const OID_UNOTICE = "1.3.6.1.5.5.7.2.2";
     
-    /**
-     * Qualifier identifier.
-     *
-     * @var string $_oid
-     */
-    protected $_oid;
+	/**
+	 * Qualifier identifier.
+	 *
+	 * @var string $_oid
+	 */
+	protected $_oid;
     
-    /**
-     * Generate ASN.1 for the 'qualifier' field.
-     *
-     * @return Element
-     */
-    abstract protected function _qualifierASN1();
+	/**
+	 * Generate ASN.1 for the 'qualifier' field.
+	 *
+	 * @return Element
+	 */
+	abstract protected function _qualifierASN1();
     
-    /**
-     * Initialize from qualifier ASN.1 element.
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromQualifierASN1(UnspecifiedType $el)
-    {
-        throw new \BadMethodCallException(
-            __FUNCTION__ . " must be implemented in the derived class.");
-    }
+	/**
+	 * Initialize from qualifier ASN.1 element.
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromQualifierASN1(UnspecifiedType $el)
+	{
+		throw new \BadMethodCallException(
+			__FUNCTION__ . " must be implemented in the derived class.");
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq)
-    {
-        $oid = $seq->at(0)
-            ->asObjectIdentifier()
-            ->oid();
-        switch ($oid) {
-            case self::OID_CPS:
-                return CPSQualifier::fromQualifierASN1($seq->at(1));
-            case self::OID_UNOTICE:
-                return UserNoticeQualifier::fromQualifierASN1($seq->at(1));
-        }
-        throw new \UnexpectedValueException("Qualifier $oid not supported.");
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq)
+	{
+		$oid = $seq->at(0)
+			->asObjectIdentifier()
+			->oid();
+		switch ($oid) {
+			case self::OID_CPS:
+				return CPSQualifier::fromQualifierASN1($seq->at(1));
+			case self::OID_UNOTICE:
+				return UserNoticeQualifier::fromQualifierASN1($seq->at(1));
+		}
+		throw new \UnexpectedValueException("Qualifier $oid not supported.");
+	}
     
-    /**
-     * Get qualifier identifier.
-     *
-     * @return string
-     */
-    public function oid()
-    {
-        return $this->_oid;
-    }
+	/**
+	 * Get qualifier identifier.
+	 *
+	 * @return string
+	 */
+	public function oid()
+	{
+		return $this->_oid;
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1()
-    {
-        return new Sequence(new ObjectIdentifier($this->_oid),
-            $this->_qualifierASN1());
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1()
+	{
+		return new Sequence(new ObjectIdentifier($this->_oid),
+			$this->_qualifierASN1());
+	}
 }

Switch Indentation +4 added lines, -4 removed lines

@@ -67,10 +67,10 @@
             ->asObjectIdentifier()
             ->oid();
         switch ($oid) {
-            case self::OID_CPS:
-                return CPSQualifier::fromQualifierASN1($seq->at(1));
-            case self::OID_UNOTICE:
-                return UserNoticeQualifier::fromQualifierASN1($seq->at(1));
+        case self::OID_CPS:
+            return CPSQualifier::fromQualifierASN1($seq->at(1));
+        case self::OID_UNOTICE:
+            return UserNoticeQualifier::fromQualifierASN1($seq->at(1));
         }
         throw new \UnexpectedValueException("Qualifier $oid not supported.");
     }

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

Indentation +203 added lines, -203 removed lines

@@ -14,207 +14,207 @@
  */
 class PolicyInformation implements \Countable, \IteratorAggregate
 {
-    /**
-     * Wildcard policy.
-     *
-     * @var string
-     */
-    const OID_ANY_POLICY = "2.5.29.32.0";
-    
-    /**
-     * Policy identifier.
-     *
-     * @var string $_oid
-     */
-    protected $_oid;
-    
-    /**
-     * Policy qualifiers.
-     *
-     * @var PolicyQualifierInfo[] $_qualifiers
-     */
-    protected $_qualifiers;
-    
-    /**
-     * Constructor.
-     *
-     * @param string $oid
-     * @param PolicyQualifierInfo ...$qualifiers
-     */
-    public function __construct($oid, PolicyQualifierInfo ...$qualifiers)
-    {
-        $this->_oid = $oid;
-        $this->_qualifiers = array();
-        foreach ($qualifiers as $qual) {
-            $this->_qualifiers[$qual->oid()] = $qual;
-        }
-    }
-    
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq)
-    {
-        $oid = $seq->at(0)
-            ->asObjectIdentifier()
-            ->oid();
-        $qualifiers = array();
-        if (count($seq) > 1) {
-            $qualifiers = array_map(
-                function (UnspecifiedType $el) {
-                    return PolicyQualifierInfo::fromASN1($el->asSequence());
-                },
-                $seq->at(1)
-                    ->asSequence()
-                    ->elements());
-        }
-        return new self($oid, ...$qualifiers);
-    }
-    
-    /**
-     * Get policy identifier.
-     *
-     * @return string
-     */
-    public function oid()
-    {
-        return $this->_oid;
-    }
-    
-    /**
-     * Check whether this policy is anyPolicy.
-     *
-     * @return bool
-     */
-    public function isAnyPolicy()
-    {
-        return self::OID_ANY_POLICY == $this->_oid;
-    }
-    
-    /**
-     * Get policy qualifiers.
-     *
-     * @return PolicyQualifierInfo[]
-     */
-    public function qualifiers()
-    {
-        return array_values($this->_qualifiers);
-    }
-    
-    /**
-     * Check whether qualifier is present.
-     *
-     * @param string $oid
-     * @return boolean
-     */
-    public function has($oid)
-    {
-        return isset($this->_qualifiers[$oid]);
-    }
-    
-    /**
-     * Get qualifier by OID.
-     *
-     * @param string $oid
-     * @throws \OutOfBoundsException
-     * @return PolicyQualifierInfo
-     */
-    public function get($oid)
-    {
-        if (!$this->has($oid)) {
-            throw new \LogicException("No $oid qualifier.");
-        }
-        return $this->_qualifiers[$oid];
-    }
-    
-    /**
-     * Check whether CPS qualifier is present.
-     *
-     * @return bool
-     */
-    public function hasCPSQualifier()
-    {
-        return $this->has(PolicyQualifierInfo::OID_CPS);
-    }
-    
-    /**
-     * Get CPS qualifier.
-     *
-     * @throws \LogicException
-     * @return CPSQualifier
-     */
-    public function CPSQualifier()
-    {
-        if (!$this->hasCPSQualifier()) {
-            throw new \LogicException("CPS qualifier not set.");
-        }
-        return $this->get(PolicyQualifierInfo::OID_CPS);
-    }
-    
-    /**
-     * Check whether user notice qualifier is present.
-     *
-     * @return bool
-     */
-    public function hasUserNoticeQualifier()
-    {
-        return $this->has(PolicyQualifierInfo::OID_UNOTICE);
-    }
-    
-    /**
-     * Get user notice qualifier.
-     *
-     * @throws \LogicException
-     * @return UserNoticeQualifier
-     */
-    public function userNoticeQualifier()
-    {
-        if (!$this->hasUserNoticeQualifier()) {
-            throw new \LogicException("User notice qualifier not set.");
-        }
-        return $this->get(PolicyQualifierInfo::OID_UNOTICE);
-    }
-    
-    /**
-     * Get ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1()
-    {
-        $elements = array(new ObjectIdentifier($this->_oid));
-        if (count($this->_qualifiers)) {
-            $qualifiers = array_map(
-                function (PolicyQualifierInfo $pqi) {
-                    return $pqi->toASN1();
-                }, array_values($this->_qualifiers));
-            $elements[] = new Sequence(...$qualifiers);
-        }
-        return new Sequence(...$elements);
-    }
-    
-    /**
-     * Get number of qualifiers.
-     *
-     * @see \Countable::count()
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_qualifiers);
-    }
-    
-    /**
-     * Get iterator for qualifiers.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->_qualifiers);
-    }
+	/**
+	 * Wildcard policy.
+	 *
+	 * @var string
+	 */
+	const OID_ANY_POLICY = "2.5.29.32.0";
+    
+	/**
+	 * Policy identifier.
+	 *
+	 * @var string $_oid
+	 */
+	protected $_oid;
+    
+	/**
+	 * Policy qualifiers.
+	 *
+	 * @var PolicyQualifierInfo[] $_qualifiers
+	 */
+	protected $_qualifiers;
+    
+	/**
+	 * Constructor.
+	 *
+	 * @param string $oid
+	 * @param PolicyQualifierInfo ...$qualifiers
+	 */
+	public function __construct($oid, PolicyQualifierInfo ...$qualifiers)
+	{
+		$this->_oid = $oid;
+		$this->_qualifiers = array();
+		foreach ($qualifiers as $qual) {
+			$this->_qualifiers[$qual->oid()] = $qual;
+		}
+	}
+    
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq)
+	{
+		$oid = $seq->at(0)
+			->asObjectIdentifier()
+			->oid();
+		$qualifiers = array();
+		if (count($seq) > 1) {
+			$qualifiers = array_map(
+				function (UnspecifiedType $el) {
+					return PolicyQualifierInfo::fromASN1($el->asSequence());
+				},
+				$seq->at(1)
+					->asSequence()
+					->elements());
+		}
+		return new self($oid, ...$qualifiers);
+	}
+    
+	/**
+	 * Get policy identifier.
+	 *
+	 * @return string
+	 */
+	public function oid()
+	{
+		return $this->_oid;
+	}
+    
+	/**
+	 * Check whether this policy is anyPolicy.
+	 *
+	 * @return bool
+	 */
+	public function isAnyPolicy()
+	{
+		return self::OID_ANY_POLICY == $this->_oid;
+	}
+    
+	/**
+	 * Get policy qualifiers.
+	 *
+	 * @return PolicyQualifierInfo[]
+	 */
+	public function qualifiers()
+	{
+		return array_values($this->_qualifiers);
+	}
+    
+	/**
+	 * Check whether qualifier is present.
+	 *
+	 * @param string $oid
+	 * @return boolean
+	 */
+	public function has($oid)
+	{
+		return isset($this->_qualifiers[$oid]);
+	}
+    
+	/**
+	 * Get qualifier by OID.
+	 *
+	 * @param string $oid
+	 * @throws \OutOfBoundsException
+	 * @return PolicyQualifierInfo
+	 */
+	public function get($oid)
+	{
+		if (!$this->has($oid)) {
+			throw new \LogicException("No $oid qualifier.");
+		}
+		return $this->_qualifiers[$oid];
+	}
+    
+	/**
+	 * Check whether CPS qualifier is present.
+	 *
+	 * @return bool
+	 */
+	public function hasCPSQualifier()
+	{
+		return $this->has(PolicyQualifierInfo::OID_CPS);
+	}
+    
+	/**
+	 * Get CPS qualifier.
+	 *
+	 * @throws \LogicException
+	 * @return CPSQualifier
+	 */
+	public function CPSQualifier()
+	{
+		if (!$this->hasCPSQualifier()) {
+			throw new \LogicException("CPS qualifier not set.");
+		}
+		return $this->get(PolicyQualifierInfo::OID_CPS);
+	}
+    
+	/**
+	 * Check whether user notice qualifier is present.
+	 *
+	 * @return bool
+	 */
+	public function hasUserNoticeQualifier()
+	{
+		return $this->has(PolicyQualifierInfo::OID_UNOTICE);
+	}
+    
+	/**
+	 * Get user notice qualifier.
+	 *
+	 * @throws \LogicException
+	 * @return UserNoticeQualifier
+	 */
+	public function userNoticeQualifier()
+	{
+		if (!$this->hasUserNoticeQualifier()) {
+			throw new \LogicException("User notice qualifier not set.");
+		}
+		return $this->get(PolicyQualifierInfo::OID_UNOTICE);
+	}
+    
+	/**
+	 * Get ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1()
+	{
+		$elements = array(new ObjectIdentifier($this->_oid));
+		if (count($this->_qualifiers)) {
+			$qualifiers = array_map(
+				function (PolicyQualifierInfo $pqi) {
+					return $pqi->toASN1();
+				}, array_values($this->_qualifiers));
+			$elements[] = new Sequence(...$qualifiers);
+		}
+		return new Sequence(...$elements);
+	}
+    
+	/**
+	 * Get number of qualifiers.
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->_qualifiers);
+	}
+    
+	/**
+	 * Get iterator for qualifiers.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator()
+	{
+		return new \ArrayIterator($this->_qualifiers);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
         $qualifiers = array();
         if (count($seq) > 1) {
             $qualifiers = array_map(
-                function (UnspecifiedType $el) {
+                function(UnspecifiedType $el) {
                     return PolicyQualifierInfo::fromASN1($el->asSequence());
                 },
                 $seq->at(1)
@@ -188,7 +188,7 @@ 
         $elements = array(new ObjectIdentifier($this->_oid));
         if (count($this->_qualifiers)) {
             $qualifiers = array_map(
-                function (PolicyQualifierInfo $pqi) {
+                function(PolicyQualifierInfo $pqi) {
                     return $pqi->toASN1();
                 }, array_values($this->_qualifiers));
             $elements[] = new Sequence(...$qualifiers);

lib/X509/Certificate/Extension/SubjectKeyIdentifierExtension.php

Indentation +44 added lines, -44 removed lines

@@ -11,52 +11,52 @@
  */
 class SubjectKeyIdentifierExtension extends Extension
 {
-    /**
-     * Key identifier.
-     *
-     * @var string $_keyIdentifier
-     */
-    protected $_keyIdentifier;
+	/**
+	 * Key identifier.
+	 *
+	 * @var string $_keyIdentifier
+	 */
+	protected $_keyIdentifier;
     
-    /**
-     * Constructor.
-     *
-     * @param bool $critical
-     * @param string $keyIdentifier
-     */
-    public function __construct($critical, $keyIdentifier)
-    {
-        parent::__construct(self::OID_SUBJECT_KEY_IDENTIFIER, $critical);
-        $this->_keyIdentifier = $keyIdentifier;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool $critical
+	 * @param string $keyIdentifier
+	 */
+	public function __construct($critical, $keyIdentifier)
+	{
+		parent::__construct(self::OID_SUBJECT_KEY_IDENTIFIER, $critical);
+		$this->_keyIdentifier = $keyIdentifier;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _fromDER($data, $critical)
-    {
-        return new self($critical, OctetString::fromDER($data)->string());
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _fromDER($data, $critical)
+	{
+		return new self($critical, OctetString::fromDER($data)->string());
+	}
     
-    /**
-     * Get key identifier.
-     *
-     * @return string
-     */
-    public function keyIdentifier()
-    {
-        return $this->_keyIdentifier;
-    }
+	/**
+	 * Get key identifier.
+	 *
+	 * @return string
+	 */
+	public function keyIdentifier()
+	{
+		return $this->_keyIdentifier;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return OctetString
-     */
-    protected function _valueASN1()
-    {
-        return new OctetString($this->_keyIdentifier);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return OctetString
+	 */
+	protected function _valueASN1()
+	{
+		return new OctetString($this->_keyIdentifier);
+	}
 }

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;
+	}
 }

Switch Indentation +7 added lines, -7 removed lines

@@ -58,13 +58,13 @@
     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.");
+        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.");

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);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
     public static function fromASN1(Sequence $seq)
     {
         $targets = array_map(
-            function (UnspecifiedType $el) {
+            function(UnspecifiedType $el) {
                 return Target::fromASN1($el->asTagged());
             }, $seq->elements());
         return new self(...$targets);
@@ -64,7 +64,7 @@ 
     {
         return array_values(
             array_filter($this->_targets,
-                function (Target $target) use ($type) {
+                function(Target $target) use ($type) {
                     return $target->type() == $type;
                 }));
     }
@@ -113,7 +113,7 @@ 
     public function toASN1()
     {
         $elements = array_map(
-            function (Target $target) {
+            function(Target $target) {
                 return $target->toASN1();
             }, $this->_targets);
         return new Sequence(...$elements);

lib/X509/Certificate/TBSCertificate.php

Indentation +607 added lines, -607 removed lines

@@ -25,611 +25,611 @@
  */
 class TBSCertificate
 {
-    // Certificate version enumerations
-    const VERSION_1 = 0;
-    const VERSION_2 = 1;
-    const VERSION_3 = 2;
-    
-    /**
-     * Certificate version.
-     *
-     * @var int
-     */
-    protected $_version;
-    
-    /**
-     * Serial number.
-     *
-     * @var int|string
-     */
-    protected $_serialNumber;
-    
-    /**
-     * Signature algorithm.
-     *
-     * @var SignatureAlgorithmIdentifier
-     */
-    protected $_signature;
-    
-    /**
-     * Certificate issuer.
-     *
-     * @var Name $_issuer
-     */
-    protected $_issuer;
-    
-    /**
-     * Certificate validity period.
-     *
-     * @var Validity $_validity
-     */
-    protected $_validity;
-    
-    /**
-     * Certificate subject.
-     *
-     * @var Name $_subject
-     */
-    protected $_subject;
-    
-    /**
-     * Subject public key.
-     *
-     * @var PublicKeyInfo $_subjectPublicKeyInfo
-     */
-    protected $_subjectPublicKeyInfo;
-    
-    /**
-     * Issuer unique identifier.
-     *
-     * @var UniqueIdentifier|null $_issuerUniqueID
-     */
-    protected $_issuerUniqueID;
-    
-    /**
-     * Subject unique identifier.
-     *
-     * @var UniqueIdentifier|null $_subjectUniqueID
-     */
-    protected $_subjectUniqueID;
-    
-    /**
-     * Extensions.
-     *
-     * @var Extensions $_extensions
-     */
-    protected $_extensions;
-    
-    /**
-     * Constructor.
-     *
-     * @param Name $subject Certificate subject
-     * @param PublicKeyInfo $pki Subject public key
-     * @param Name $issuer Certificate issuer
-     * @param Validity $validity Validity period
-     */
-    public function __construct(Name $subject, PublicKeyInfo $pki, Name $issuer,
-        Validity $validity)
-    {
-        $this->_subject = $subject;
-        $this->_subjectPublicKeyInfo = $pki;
-        $this->_issuer = $issuer;
-        $this->_validity = $validity;
-        $this->_extensions = new Extensions();
-    }
-    
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq)
-    {
-        $idx = 0;
-        if ($seq->hasTagged(0)) {
-            $idx++;
-            $version = intval(
-                $seq->getTagged(0)
-                    ->asExplicit()
-                    ->asInteger()
-                    ->number());
-        } else {
-            $version = self::VERSION_1;
-        }
-        $serial = $seq->at($idx++)
-            ->asInteger()
-            ->number();
-        $algo = AlgorithmIdentifier::fromASN1($seq->at($idx++)->asSequence());
-        if (!$algo instanceof SignatureAlgorithmIdentifier) {
-            throw new \UnexpectedValueException(
-                "Unsupported signature algorithm " . $algo->name() . ".");
-        }
-        $issuer = Name::fromASN1($seq->at($idx++)->asSequence());
-        $validity = Validity::fromASN1($seq->at($idx++)->asSequence());
-        $subject = Name::fromASN1($seq->at($idx++)->asSequence());
-        $pki = PublicKeyInfo::fromASN1($seq->at($idx++)->asSequence());
-        $tbs_cert = new self($subject, $pki, $issuer, $validity);
-        $tbs_cert->_version = $version;
-        $tbs_cert->_serialNumber = $serial;
-        $tbs_cert->_signature = $algo;
-        if ($seq->hasTagged(1)) {
-            $tbs_cert->_issuerUniqueID = UniqueIdentifier::fromASN1(
-                $seq->getTagged(1)
-                    ->asImplicit(Element::TYPE_BIT_STRING)
-                    ->asBitString());
-        }
-        if ($seq->hasTagged(2)) {
-            $tbs_cert->_subjectUniqueID = UniqueIdentifier::fromASN1(
-                $seq->getTagged(2)
-                    ->asImplicit(Element::TYPE_BIT_STRING)
-                    ->asBitString());
-        }
-        if ($seq->hasTagged(3)) {
-            $tbs_cert->_extensions = Extensions::fromASN1(
-                $seq->getTagged(3)
-                    ->asExplicit()
-                    ->asSequence());
-        }
-        return $tbs_cert;
-    }
-    
-    /**
-     * Initialize from certification request.
-     *
-     * Note that signature is not verified and must be done by the caller.
-     *
-     * @param CertificationRequest $cr
-     * @return self
-     */
-    public static function fromCSR(CertificationRequest $cr)
-    {
-        $cri = $cr->certificationRequestInfo();
-        $tbs_cert = new self($cri->subject(), $cri->subjectPKInfo(), new Name(),
-            Validity::fromStrings(null, null));
-        // if CSR has Extension Request attribute
-        if ($cri->hasAttributes()) {
-            $attribs = $cri->attributes();
-            if ($attribs->hasExtensionRequest()) {
-                $tbs_cert = $tbs_cert->withExtensions(
-                    $attribs->extensionRequest()
-                        ->extensions());
-            }
-        }
-        // add Subject Key Identifier extension
-        $tbs_cert = $tbs_cert->withAdditionalExtensions(
-            new SubjectKeyIdentifierExtension(false,
-                $cri->subjectPKInfo()
-                    ->keyIdentifier()));
-        return $tbs_cert;
-    }
-    
-    /**
-     * Get self with fields set from the issuer's certificate.
-     *
-     * Issuer shall be set to issuing certificate's subject.
-     * Authority key identifier extensions shall be added with a key identifier
-     * set to issuing certificate's public key identifier.
-     *
-     * @param Certificate $cert Issuing party's certificate
-     * @return self
-     */
-    public function withIssuerCertificate(Certificate $cert)
-    {
-        $obj = clone $this;
-        // set issuer DN from cert's subject
-        $obj->_issuer = $cert->tbsCertificate()->subject();
-        // add authority key identifier extension
-        $key_id = $cert->tbsCertificate()
-            ->subjectPublicKeyInfo()
-            ->keyIdentifier();
-        $obj->_extensions = $obj->_extensions->withExtensions(
-            new AuthorityKeyIdentifierExtension(false, $key_id));
-        return $obj;
-    }
-    
-    /**
-     * Get self with given version.
-     *
-     * If version is not set, appropriate version is automatically
-     * determined during signing.
-     *
-     * @param int $version
-     * @return self
-     */
-    public function withVersion($version)
-    {
-        $obj = clone $this;
-        $obj->_version = $version;
-        return $obj;
-    }
-    
-    /**
-     * Get self with given serial number.
-     *
-     * @param int|string $serial Base 10 number
-     * @return self
-     */
-    public function withSerialNumber($serial)
-    {
-        $obj = clone $this;
-        $obj->_serialNumber = $serial;
-        return $obj;
-    }
-    
-    /**
-     * Get self with random positive serial number.
-     *
-     * @param int $size Number of random bytes
-     * @return self
-     */
-    public function withRandomSerialNumber($size = 16)
-    {
-        // ensure that first byte is always non-zero and having first bit unset
-        $num = gmp_init(mt_rand(1, 0x7f), 10);
-        for ($i = 1; $i < $size; ++$i) {
-            $num <<= 8;
-            $num += mt_rand(0, 0xff);
-        }
-        return $this->withSerialNumber(gmp_strval($num, 10));
-    }
-    
-    /**
-     * Get self with given signature algorithm.
-     *
-     * @param SignatureAlgorithmIdentifier $algo
-     * @return self
-     */
-    public function withSignature(SignatureAlgorithmIdentifier $algo)
-    {
-        $obj = clone $this;
-        $obj->_signature = $algo;
-        return $obj;
-    }
-    
-    /**
-     * Get self with given issuer.
-     *
-     * @param Name $issuer
-     * @return self
-     */
-    public function withIssuer(Name $issuer)
-    {
-        $obj = clone $this;
-        $obj->_issuer = $issuer;
-        return $obj;
-    }
-    
-    /**
-     * Get self with given validity.
-     *
-     * @param Validity $validity
-     * @return self
-     */
-    public function withValidity(Validity $validity)
-    {
-        $obj = clone $this;
-        $obj->_validity = $validity;
-        return $obj;
-    }
-    
-    /**
-     * Get self with given subject.
-     *
-     * @param Name $subject
-     * @return self
-     */
-    public function withSubject(Name $subject)
-    {
-        $obj = clone $this;
-        $obj->_subject = $subject;
-        return $obj;
-    }
-    
-    /**
-     * Get self with given subject public key info.
-     *
-     * @param PublicKeyInfo $pub_key_info
-     * @return self
-     */
-    public function withSubjectPublicKeyInfo(PublicKeyInfo $pub_key_info)
-    {
-        $obj = clone $this;
-        $obj->_subjectPublicKeyInfo = $pub_key_info;
-        return $obj;
-    }
-    
-    /**
-     * Get self with issuer unique ID.
-     *
-     * @param UniqueIdentifier $id
-     * @return self
-     */
-    public function withIssuerUniqueID(UniqueIdentifier $id)
-    {
-        $obj = clone $this;
-        $obj->_issuerUniqueID = $id;
-        return $obj;
-    }
-    
-    /**
-     * Get self with subject unique ID.
-     *
-     * @param UniqueIdentifier $id
-     * @return self
-     */
-    public function withSubjectUniqueID(UniqueIdentifier $id)
-    {
-        $obj = clone $this;
-        $obj->_subjectUniqueID = $id;
-        return $obj;
-    }
-    
-    /**
-     * Get self with given extensions.
-     *
-     * @param Extensions $extensions
-     * @return self
-     */
-    public function withExtensions(Extensions $extensions)
-    {
-        $obj = clone $this;
-        $obj->_extensions = $extensions;
-        return $obj;
-    }
-    
-    /**
-     * Get self with extensions added.
-     *
-     * @param Extension ...$exts One or more Extension objects
-     * @return self
-     */
-    public function withAdditionalExtensions(Extension ...$exts)
-    {
-        $obj = clone $this;
-        $obj->_extensions = $obj->_extensions->withExtensions(...$exts);
-        return $obj;
-    }
-    
-    /**
-     * Check whether version is set.
-     *
-     * @return bool
-     */
-    public function hasVersion()
-    {
-        return isset($this->_version);
-    }
-    
-    /**
-     * Get certificate version.
-     *
-     * @return int
-     */
-    public function version()
-    {
-        if (!$this->hasVersion()) {
-            throw new \LogicException("version not set.");
-        }
-        return $this->_version;
-    }
-    
-    /**
-     * Check whether serial number is set.
-     *
-     * @return bool
-     */
-    public function hasSerialNumber()
-    {
-        return isset($this->_serialNumber);
-    }
-    
-    /**
-     * Get serial number.
-     *
-     * @return int|string Base 10 integer
-     */
-    public function serialNumber()
-    {
-        if (!$this->hasSerialNumber()) {
-            throw new \LogicException("serialNumber not set.");
-        }
-        return $this->_serialNumber;
-    }
-    
-    /**
-     * Check whether signature algorithm is set.
-     *
-     * @return bool
-     */
-    public function hasSignature()
-    {
-        return isset($this->_signature);
-    }
-    
-    /**
-     * Get signature algorithm.
-     *
-     * @return SignatureAlgorithmIdentifier
-     */
-    public function signature()
-    {
-        if (!$this->hasSignature()) {
-            throw new \LogicException("signature not set.");
-        }
-        return $this->_signature;
-    }
-    
-    /**
-     * Get issuer.
-     *
-     * @return Name
-     */
-    public function issuer()
-    {
-        return $this->_issuer;
-    }
-    
-    /**
-     * Get validity period.
-     *
-     * @return Validity
-     */
-    public function validity()
-    {
-        return $this->_validity;
-    }
-    
-    /**
-     * Get subject.
-     *
-     * @return Name
-     */
-    public function subject()
-    {
-        return $this->_subject;
-    }
-    
-    /**
-     * Get subject public key.
-     *
-     * @return PublicKeyInfo
-     */
-    public function subjectPublicKeyInfo()
-    {
-        return $this->_subjectPublicKeyInfo;
-    }
-    
-    /**
-     * Whether issuer unique identifier is present.
-     *
-     * @return bool
-     */
-    public function hasIssuerUniqueID()
-    {
-        return isset($this->_issuerUniqueID);
-    }
-    
-    /**
-     * Get issuerUniqueID.
-     *
-     * @return UniqueIdentifier
-     */
-    public function issuerUniqueID()
-    {
-        if (!$this->hasIssuerUniqueID()) {
-            throw new \LogicException("issuerUniqueID not set.");
-        }
-        return $this->_issuerUniqueID;
-    }
-    
-    /**
-     * Whether subject unique identifier is present.
-     *
-     * @return bool
-     */
-    public function hasSubjectUniqueID()
-    {
-        return isset($this->_subjectUniqueID);
-    }
-    
-    /**
-     * Get subjectUniqueID.
-     *
-     * @return UniqueIdentifier
-     */
-    public function subjectUniqueID()
-    {
-        if (!$this->hasSubjectUniqueID()) {
-            throw new \LogicException("subjectUniqueID not set.");
-        }
-        return $this->_subjectUniqueID;
-    }
-    
-    /**
-     * Get extensions.
-     *
-     * @return Extensions
-     */
-    public function extensions()
-    {
-        return $this->_extensions;
-    }
-    
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1()
-    {
-        $elements = array();
-        $version = $this->version();
-        // if version is not default
-        if ($version != self::VERSION_1) {
-            $elements[] = new ExplicitlyTaggedType(0, new Integer($version));
-        }
-        $serial = $this->serialNumber();
-        $signature = $this->signature();
-        // add required elements
-        array_push($elements, new Integer($serial), $signature->toASN1(),
-            $this->_issuer->toASN1(), $this->_validity->toASN1(),
-            $this->_subject->toASN1(), $this->_subjectPublicKeyInfo->toASN1());
-        if (isset($this->_issuerUniqueID)) {
-            $elements[] = new ImplicitlyTaggedType(1,
-                $this->_issuerUniqueID->toASN1());
-        }
-        if (isset($this->_subjectUniqueID)) {
-            $elements[] = new ImplicitlyTaggedType(2,
-                $this->_subjectUniqueID->toASN1());
-        }
-        if (count($this->_extensions)) {
-            $elements[] = new ExplicitlyTaggedType(3,
-                $this->_extensions->toASN1());
-        }
-        return new Sequence(...$elements);
-    }
-    
-    /**
-     * Create signed certificate.
-     *
-     * @param SignatureAlgorithmIdentifier $algo Algorithm used for signing
-     * @param PrivateKeyInfo $privkey_info Private key used for signing
-     * @param Crypto|null $crypto Crypto engine, use default if not set
-     * @return Certificate
-     */
-    public function sign(SignatureAlgorithmIdentifier $algo,
-        PrivateKeyInfo $privkey_info, Crypto $crypto = null)
-    {
-        $crypto = $crypto ?: Crypto::getDefault();
-        $tbs_cert = clone $this;
-        if (!isset($tbs_cert->_version)) {
-            $tbs_cert->_version = $tbs_cert->_determineVersion();
-        }
-        if (!isset($tbs_cert->_serialNumber)) {
-            $tbs_cert->_serialNumber = 0;
-        }
-        $tbs_cert->_signature = $algo;
-        $data = $tbs_cert->toASN1()->toDER();
-        $signature = $crypto->sign($data, $privkey_info, $algo);
-        return new Certificate($tbs_cert, $algo, $signature);
-    }
-    
-    /**
-     * Determine minimum version for the certificate.
-     *
-     * @return int
-     */
-    protected function _determineVersion()
-    {
-        // if extensions are present
-        if (count($this->_extensions)) {
-            return self::VERSION_3;
-        }
-        // if UniqueIdentifier is present
-        if (isset($this->_issuerUniqueID) || isset($this->_subjectUniqueID)) {
-            return self::VERSION_2;
-        }
-        return self::VERSION_1;
-    }
+	// Certificate version enumerations
+	const VERSION_1 = 0;
+	const VERSION_2 = 1;
+	const VERSION_3 = 2;
+    
+	/**
+	 * Certificate version.
+	 *
+	 * @var int
+	 */
+	protected $_version;
+    
+	/**
+	 * Serial number.
+	 *
+	 * @var int|string
+	 */
+	protected $_serialNumber;
+    
+	/**
+	 * Signature algorithm.
+	 *
+	 * @var SignatureAlgorithmIdentifier
+	 */
+	protected $_signature;
+    
+	/**
+	 * Certificate issuer.
+	 *
+	 * @var Name $_issuer
+	 */
+	protected $_issuer;
+    
+	/**
+	 * Certificate validity period.
+	 *
+	 * @var Validity $_validity
+	 */
+	protected $_validity;
+    
+	/**
+	 * Certificate subject.
+	 *
+	 * @var Name $_subject
+	 */
+	protected $_subject;
+    
+	/**
+	 * Subject public key.
+	 *
+	 * @var PublicKeyInfo $_subjectPublicKeyInfo
+	 */
+	protected $_subjectPublicKeyInfo;
+    
+	/**
+	 * Issuer unique identifier.
+	 *
+	 * @var UniqueIdentifier|null $_issuerUniqueID
+	 */
+	protected $_issuerUniqueID;
+    
+	/**
+	 * Subject unique identifier.
+	 *
+	 * @var UniqueIdentifier|null $_subjectUniqueID
+	 */
+	protected $_subjectUniqueID;
+    
+	/**
+	 * Extensions.
+	 *
+	 * @var Extensions $_extensions
+	 */
+	protected $_extensions;
+    
+	/**
+	 * Constructor.
+	 *
+	 * @param Name $subject Certificate subject
+	 * @param PublicKeyInfo $pki Subject public key
+	 * @param Name $issuer Certificate issuer
+	 * @param Validity $validity Validity period
+	 */
+	public function __construct(Name $subject, PublicKeyInfo $pki, Name $issuer,
+		Validity $validity)
+	{
+		$this->_subject = $subject;
+		$this->_subjectPublicKeyInfo = $pki;
+		$this->_issuer = $issuer;
+		$this->_validity = $validity;
+		$this->_extensions = new Extensions();
+	}
+    
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq)
+	{
+		$idx = 0;
+		if ($seq->hasTagged(0)) {
+			$idx++;
+			$version = intval(
+				$seq->getTagged(0)
+					->asExplicit()
+					->asInteger()
+					->number());
+		} else {
+			$version = self::VERSION_1;
+		}
+		$serial = $seq->at($idx++)
+			->asInteger()
+			->number();
+		$algo = AlgorithmIdentifier::fromASN1($seq->at($idx++)->asSequence());
+		if (!$algo instanceof SignatureAlgorithmIdentifier) {
+			throw new \UnexpectedValueException(
+				"Unsupported signature algorithm " . $algo->name() . ".");
+		}
+		$issuer = Name::fromASN1($seq->at($idx++)->asSequence());
+		$validity = Validity::fromASN1($seq->at($idx++)->asSequence());
+		$subject = Name::fromASN1($seq->at($idx++)->asSequence());
+		$pki = PublicKeyInfo::fromASN1($seq->at($idx++)->asSequence());
+		$tbs_cert = new self($subject, $pki, $issuer, $validity);
+		$tbs_cert->_version = $version;
+		$tbs_cert->_serialNumber = $serial;
+		$tbs_cert->_signature = $algo;
+		if ($seq->hasTagged(1)) {
+			$tbs_cert->_issuerUniqueID = UniqueIdentifier::fromASN1(
+				$seq->getTagged(1)
+					->asImplicit(Element::TYPE_BIT_STRING)
+					->asBitString());
+		}
+		if ($seq->hasTagged(2)) {
+			$tbs_cert->_subjectUniqueID = UniqueIdentifier::fromASN1(
+				$seq->getTagged(2)
+					->asImplicit(Element::TYPE_BIT_STRING)
+					->asBitString());
+		}
+		if ($seq->hasTagged(3)) {
+			$tbs_cert->_extensions = Extensions::fromASN1(
+				$seq->getTagged(3)
+					->asExplicit()
+					->asSequence());
+		}
+		return $tbs_cert;
+	}
+    
+	/**
+	 * Initialize from certification request.
+	 *
+	 * Note that signature is not verified and must be done by the caller.
+	 *
+	 * @param CertificationRequest $cr
+	 * @return self
+	 */
+	public static function fromCSR(CertificationRequest $cr)
+	{
+		$cri = $cr->certificationRequestInfo();
+		$tbs_cert = new self($cri->subject(), $cri->subjectPKInfo(), new Name(),
+			Validity::fromStrings(null, null));
+		// if CSR has Extension Request attribute
+		if ($cri->hasAttributes()) {
+			$attribs = $cri->attributes();
+			if ($attribs->hasExtensionRequest()) {
+				$tbs_cert = $tbs_cert->withExtensions(
+					$attribs->extensionRequest()
+						->extensions());
+			}
+		}
+		// add Subject Key Identifier extension
+		$tbs_cert = $tbs_cert->withAdditionalExtensions(
+			new SubjectKeyIdentifierExtension(false,
+				$cri->subjectPKInfo()
+					->keyIdentifier()));
+		return $tbs_cert;
+	}
+    
+	/**
+	 * Get self with fields set from the issuer's certificate.
+	 *
+	 * Issuer shall be set to issuing certificate's subject.
+	 * Authority key identifier extensions shall be added with a key identifier
+	 * set to issuing certificate's public key identifier.
+	 *
+	 * @param Certificate $cert Issuing party's certificate
+	 * @return self
+	 */
+	public function withIssuerCertificate(Certificate $cert)
+	{
+		$obj = clone $this;
+		// set issuer DN from cert's subject
+		$obj->_issuer = $cert->tbsCertificate()->subject();
+		// add authority key identifier extension
+		$key_id = $cert->tbsCertificate()
+			->subjectPublicKeyInfo()
+			->keyIdentifier();
+		$obj->_extensions = $obj->_extensions->withExtensions(
+			new AuthorityKeyIdentifierExtension(false, $key_id));
+		return $obj;
+	}
+    
+	/**
+	 * Get self with given version.
+	 *
+	 * If version is not set, appropriate version is automatically
+	 * determined during signing.
+	 *
+	 * @param int $version
+	 * @return self
+	 */
+	public function withVersion($version)
+	{
+		$obj = clone $this;
+		$obj->_version = $version;
+		return $obj;
+	}
+    
+	/**
+	 * Get self with given serial number.
+	 *
+	 * @param int|string $serial Base 10 number
+	 * @return self
+	 */
+	public function withSerialNumber($serial)
+	{
+		$obj = clone $this;
+		$obj->_serialNumber = $serial;
+		return $obj;
+	}
+    
+	/**
+	 * Get self with random positive serial number.
+	 *
+	 * @param int $size Number of random bytes
+	 * @return self
+	 */
+	public function withRandomSerialNumber($size = 16)
+	{
+		// ensure that first byte is always non-zero and having first bit unset
+		$num = gmp_init(mt_rand(1, 0x7f), 10);
+		for ($i = 1; $i < $size; ++$i) {
+			$num <<= 8;
+			$num += mt_rand(0, 0xff);
+		}
+		return $this->withSerialNumber(gmp_strval($num, 10));
+	}
+    
+	/**
+	 * Get self with given signature algorithm.
+	 *
+	 * @param SignatureAlgorithmIdentifier $algo
+	 * @return self
+	 */
+	public function withSignature(SignatureAlgorithmIdentifier $algo)
+	{
+		$obj = clone $this;
+		$obj->_signature = $algo;
+		return $obj;
+	}
+    
+	/**
+	 * Get self with given issuer.
+	 *
+	 * @param Name $issuer
+	 * @return self
+	 */
+	public function withIssuer(Name $issuer)
+	{
+		$obj = clone $this;
+		$obj->_issuer = $issuer;
+		return $obj;
+	}
+    
+	/**
+	 * Get self with given validity.
+	 *
+	 * @param Validity $validity
+	 * @return self
+	 */
+	public function withValidity(Validity $validity)
+	{
+		$obj = clone $this;
+		$obj->_validity = $validity;
+		return $obj;
+	}
+    
+	/**
+	 * Get self with given subject.
+	 *
+	 * @param Name $subject
+	 * @return self
+	 */
+	public function withSubject(Name $subject)
+	{
+		$obj = clone $this;
+		$obj->_subject = $subject;
+		return $obj;
+	}
+    
+	/**
+	 * Get self with given subject public key info.
+	 *
+	 * @param PublicKeyInfo $pub_key_info
+	 * @return self
+	 */
+	public function withSubjectPublicKeyInfo(PublicKeyInfo $pub_key_info)
+	{
+		$obj = clone $this;
+		$obj->_subjectPublicKeyInfo = $pub_key_info;
+		return $obj;
+	}
+    
+	/**
+	 * Get self with issuer unique ID.
+	 *
+	 * @param UniqueIdentifier $id
+	 * @return self
+	 */
+	public function withIssuerUniqueID(UniqueIdentifier $id)
+	{
+		$obj = clone $this;
+		$obj->_issuerUniqueID = $id;
+		return $obj;
+	}
+    
+	/**
+	 * Get self with subject unique ID.
+	 *
+	 * @param UniqueIdentifier $id
+	 * @return self
+	 */
+	public function withSubjectUniqueID(UniqueIdentifier $id)
+	{
+		$obj = clone $this;
+		$obj->_subjectUniqueID = $id;
+		return $obj;
+	}
+    
+	/**
+	 * Get self with given extensions.
+	 *
+	 * @param Extensions $extensions
+	 * @return self
+	 */
+	public function withExtensions(Extensions $extensions)
+	{
+		$obj = clone $this;
+		$obj->_extensions = $extensions;
+		return $obj;
+	}
+    
+	/**
+	 * Get self with extensions added.
+	 *
+	 * @param Extension ...$exts One or more Extension objects
+	 * @return self
+	 */
+	public function withAdditionalExtensions(Extension ...$exts)
+	{
+		$obj = clone $this;
+		$obj->_extensions = $obj->_extensions->withExtensions(...$exts);
+		return $obj;
+	}
+    
+	/**
+	 * Check whether version is set.
+	 *
+	 * @return bool
+	 */
+	public function hasVersion()
+	{
+		return isset($this->_version);
+	}
+    
+	/**
+	 * Get certificate version.
+	 *
+	 * @return int
+	 */
+	public function version()
+	{
+		if (!$this->hasVersion()) {
+			throw new \LogicException("version not set.");
+		}
+		return $this->_version;
+	}
+    
+	/**
+	 * Check whether serial number is set.
+	 *
+	 * @return bool
+	 */
+	public function hasSerialNumber()
+	{
+		return isset($this->_serialNumber);
+	}
+    
+	/**
+	 * Get serial number.
+	 *
+	 * @return int|string Base 10 integer
+	 */
+	public function serialNumber()
+	{
+		if (!$this->hasSerialNumber()) {
+			throw new \LogicException("serialNumber not set.");
+		}
+		return $this->_serialNumber;
+	}
+    
+	/**
+	 * Check whether signature algorithm is set.
+	 *
+	 * @return bool
+	 */
+	public function hasSignature()
+	{
+		return isset($this->_signature);
+	}
+    
+	/**
+	 * Get signature algorithm.
+	 *
+	 * @return SignatureAlgorithmIdentifier
+	 */
+	public function signature()
+	{
+		if (!$this->hasSignature()) {
+			throw new \LogicException("signature not set.");
+		}
+		return $this->_signature;
+	}
+    
+	/**
+	 * Get issuer.
+	 *
+	 * @return Name
+	 */
+	public function issuer()
+	{
+		return $this->_issuer;
+	}
+    
+	/**
+	 * Get validity period.
+	 *
+	 * @return Validity
+	 */
+	public function validity()
+	{
+		return $this->_validity;
+	}
+    
+	/**
+	 * Get subject.
+	 *
+	 * @return Name
+	 */
+	public function subject()
+	{
+		return $this->_subject;
+	}
+    
+	/**
+	 * Get subject public key.
+	 *
+	 * @return PublicKeyInfo
+	 */
+	public function subjectPublicKeyInfo()
+	{
+		return $this->_subjectPublicKeyInfo;
+	}
+    
+	/**
+	 * Whether issuer unique identifier is present.
+	 *
+	 * @return bool
+	 */
+	public function hasIssuerUniqueID()
+	{
+		return isset($this->_issuerUniqueID);
+	}
+    
+	/**
+	 * Get issuerUniqueID.
+	 *
+	 * @return UniqueIdentifier
+	 */
+	public function issuerUniqueID()
+	{
+		if (!$this->hasIssuerUniqueID()) {
+			throw new \LogicException("issuerUniqueID not set.");
+		}
+		return $this->_issuerUniqueID;
+	}
+    
+	/**
+	 * Whether subject unique identifier is present.
+	 *
+	 * @return bool
+	 */
+	public function hasSubjectUniqueID()
+	{
+		return isset($this->_subjectUniqueID);
+	}
+    
+	/**
+	 * Get subjectUniqueID.
+	 *
+	 * @return UniqueIdentifier
+	 */
+	public function subjectUniqueID()
+	{
+		if (!$this->hasSubjectUniqueID()) {
+			throw new \LogicException("subjectUniqueID not set.");
+		}
+		return $this->_subjectUniqueID;
+	}
+    
+	/**
+	 * Get extensions.
+	 *
+	 * @return Extensions
+	 */
+	public function extensions()
+	{
+		return $this->_extensions;
+	}
+    
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1()
+	{
+		$elements = array();
+		$version = $this->version();
+		// if version is not default
+		if ($version != self::VERSION_1) {
+			$elements[] = new ExplicitlyTaggedType(0, new Integer($version));
+		}
+		$serial = $this->serialNumber();
+		$signature = $this->signature();
+		// add required elements
+		array_push($elements, new Integer($serial), $signature->toASN1(),
+			$this->_issuer->toASN1(), $this->_validity->toASN1(),
+			$this->_subject->toASN1(), $this->_subjectPublicKeyInfo->toASN1());
+		if (isset($this->_issuerUniqueID)) {
+			$elements[] = new ImplicitlyTaggedType(1,
+				$this->_issuerUniqueID->toASN1());
+		}
+		if (isset($this->_subjectUniqueID)) {
+			$elements[] = new ImplicitlyTaggedType(2,
+				$this->_subjectUniqueID->toASN1());
+		}
+		if (count($this->_extensions)) {
+			$elements[] = new ExplicitlyTaggedType(3,
+				$this->_extensions->toASN1());
+		}
+		return new Sequence(...$elements);
+	}
+    
+	/**
+	 * Create signed certificate.
+	 *
+	 * @param SignatureAlgorithmIdentifier $algo Algorithm used for signing
+	 * @param PrivateKeyInfo $privkey_info Private key used for signing
+	 * @param Crypto|null $crypto Crypto engine, use default if not set
+	 * @return Certificate
+	 */
+	public function sign(SignatureAlgorithmIdentifier $algo,
+		PrivateKeyInfo $privkey_info, Crypto $crypto = null)
+	{
+		$crypto = $crypto ?: Crypto::getDefault();
+		$tbs_cert = clone $this;
+		if (!isset($tbs_cert->_version)) {
+			$tbs_cert->_version = $tbs_cert->_determineVersion();
+		}
+		if (!isset($tbs_cert->_serialNumber)) {
+			$tbs_cert->_serialNumber = 0;
+		}
+		$tbs_cert->_signature = $algo;
+		$data = $tbs_cert->toASN1()->toDER();
+		$signature = $crypto->sign($data, $privkey_info, $algo);
+		return new Certificate($tbs_cert, $algo, $signature);
+	}
+    
+	/**
+	 * Determine minimum version for the certificate.
+	 *
+	 * @return int
+	 */
+	protected function _determineVersion()
+	{
+		// if extensions are present
+		if (count($this->_extensions)) {
+			return self::VERSION_3;
+		}
+		// if UniqueIdentifier is present
+		if (isset($this->_issuerUniqueID) || isset($this->_subjectUniqueID)) {
+			return self::VERSION_2;
+		}
+		return self::VERSION_1;
+	}
 }

lib/X509/Certificate/Time.php

Indentation +93 added lines, -93 removed lines

@@ -15,105 +15,105 @@
  */
 class Time
 {
-    use DateTimeHelper;
+	use DateTimeHelper;
     
-    /**
-     * Datetime.
-     *
-     * @var \DateTimeImmutable $_dt
-     */
-    protected $_dt;
+	/**
+	 * Datetime.
+	 *
+	 * @var \DateTimeImmutable $_dt
+	 */
+	protected $_dt;
     
-    /**
-     * Time ASN.1 type tag.
-     *
-     * @var int $_type
-     */
-    protected $_type;
+	/**
+	 * Time ASN.1 type tag.
+	 *
+	 * @var int $_type
+	 */
+	protected $_type;
     
-    /**
-     * Constructor.
-     *
-     * @param \DateTimeImmutable $dt
-     */
-    public function __construct(\DateTimeImmutable $dt)
-    {
-        $this->_dt = $dt;
-        $this->_type = self::_determineType($dt);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param \DateTimeImmutable $dt
+	 */
+	public function __construct(\DateTimeImmutable $dt)
+	{
+		$this->_dt = $dt;
+		$this->_type = self::_determineType($dt);
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param TimeType $el
-     * @return self
-     */
-    public static function fromASN1(TimeType $el)
-    {
-        $obj = new self($el->dateTime());
-        $obj->_type = $el->tag();
-        return $obj;
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param TimeType $el
+	 * @return self
+	 */
+	public static function fromASN1(TimeType $el)
+	{
+		$obj = new self($el->dateTime());
+		$obj->_type = $el->tag();
+		return $obj;
+	}
     
-    /**
-     * Initialize from date string.
-     *
-     * @param string|null $time
-     * @param string|null $tz
-     * @return self
-     */
-    public static function fromString($time, $tz = null)
-    {
-        return new self(self::_createDateTime($time, $tz));
-    }
+	/**
+	 * Initialize from date string.
+	 *
+	 * @param string|null $time
+	 * @param string|null $tz
+	 * @return self
+	 */
+	public static function fromString($time, $tz = null)
+	{
+		return new self(self::_createDateTime($time, $tz));
+	}
     
-    /**
-     * Get datetime.
-     *
-     * @return \DateTimeImmutable
-     */
-    public function dateTime()
-    {
-        return $this->_dt;
-    }
+	/**
+	 * Get datetime.
+	 *
+	 * @return \DateTimeImmutable
+	 */
+	public function dateTime()
+	{
+		return $this->_dt;
+	}
     
-    /**
-     * Generate ASN.1.
-     *
-     * @throws \UnexpectedValueException
-     * @return TimeType
-     */
-    public function toASN1()
-    {
-        $dt = $this->_dt;
-        switch ($this->_type) {
-            case Element::TYPE_UTC_TIME:
-                return new UTCTime($dt);
-            case Element::TYPE_GENERALIZED_TIME:
-                // GeneralizedTime must not contain fractional seconds
-                // (rfc5280 4.1.2.5.2)
-                if ($dt->format("u") != 0) {
-                    // remove fractional seconds (round down)
-                    $dt = \DateTimeImmutable::createFromFormat("Y-m-d H:i:s",
-                        $dt->format("Y-m-d H:i:s"), $dt->getTimezone());
-                }
-                return new GeneralizedTime($dt);
-        }
-        throw new \UnexpectedValueException(
-            "Time type " . Element::tagToName($this->_type) . " not supported.");
-    }
+	/**
+	 * Generate ASN.1.
+	 *
+	 * @throws \UnexpectedValueException
+	 * @return TimeType
+	 */
+	public function toASN1()
+	{
+		$dt = $this->_dt;
+		switch ($this->_type) {
+			case Element::TYPE_UTC_TIME:
+				return new UTCTime($dt);
+			case Element::TYPE_GENERALIZED_TIME:
+				// GeneralizedTime must not contain fractional seconds
+				// (rfc5280 4.1.2.5.2)
+				if ($dt->format("u") != 0) {
+					// remove fractional seconds (round down)
+					$dt = \DateTimeImmutable::createFromFormat("Y-m-d H:i:s",
+						$dt->format("Y-m-d H:i:s"), $dt->getTimezone());
+				}
+				return new GeneralizedTime($dt);
+		}
+		throw new \UnexpectedValueException(
+			"Time type " . Element::tagToName($this->_type) . " not supported.");
+	}
     
-    /**
-     * Determine whether to use UTCTime or GeneralizedTime ASN.1 type.
-     *
-     * @param \DateTimeImmutable $dt
-     * @return int Type tag
-     */
-    protected static function _determineType(\DateTimeImmutable $dt)
-    {
-        if ($dt->format("Y") >= 2050) {
-            return Element::TYPE_GENERALIZED_TIME;
-        }
-        return Element::TYPE_UTC_TIME;
-    }
+	/**
+	 * Determine whether to use UTCTime or GeneralizedTime ASN.1 type.
+	 *
+	 * @param \DateTimeImmutable $dt
+	 * @return int Type tag
+	 */
+	protected static function _determineType(\DateTimeImmutable $dt)
+	{
+		if ($dt->format("Y") >= 2050) {
+			return Element::TYPE_GENERALIZED_TIME;
+		}
+		return Element::TYPE_UTC_TIME;
+	}
 }

Switch Indentation +11 added lines, -11 removed lines

@@ -87,17 +87,17 @@
     {
         $dt = $this->_dt;
         switch ($this->_type) {
-            case Element::TYPE_UTC_TIME:
-                return new UTCTime($dt);
-            case Element::TYPE_GENERALIZED_TIME:
-                // GeneralizedTime must not contain fractional seconds
-                // (rfc5280 4.1.2.5.2)
-                if ($dt->format("u") != 0) {
-                    // remove fractional seconds (round down)
-                    $dt = \DateTimeImmutable::createFromFormat("Y-m-d H:i:s",
-                        $dt->format("Y-m-d H:i:s"), $dt->getTimezone());
-                }
-                return new GeneralizedTime($dt);
+        case Element::TYPE_UTC_TIME:
+            return new UTCTime($dt);
+        case Element::TYPE_GENERALIZED_TIME:
+            // GeneralizedTime must not contain fractional seconds
+            // (rfc5280 4.1.2.5.2)
+            if ($dt->format("u") != 0) {
+                // remove fractional seconds (round down)
+                $dt = \DateTimeImmutable::createFromFormat("Y-m-d H:i:s",
+                    $dt->format("Y-m-d H:i:s"), $dt->getTimezone());
+            }
+            return new GeneralizedTime($dt);
         }
         throw new \UnexpectedValueException(
             "Time type " . Element::tagToName($this->_type) . " not supported.");