sop / x509

lib/X509/GeneralName/DirectoryName.php

Indentation +61 added lines, -61 removed lines

@@ -16,71 +16,71 @@
  */
 class DirectoryName extends GeneralName
 {
-    /**
-     * Directory name.
-     *
-     * @var Name
-     */
-    protected $_dn;
+	/**
+	 * Directory name.
+	 *
+	 * @var Name
+	 */
+	protected $_dn;
 
-    /**
-     * Constructor.
-     *
-     * @param Name $dn
-     */
-    public function __construct(Name $dn)
-    {
-        $this->_tag = self::TAG_DIRECTORY_NAME;
-        $this->_dn = $dn;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Name $dn
+	 */
+	public function __construct(Name $dn)
+	{
+		$this->_tag = self::TAG_DIRECTORY_NAME;
+		$this->_dn = $dn;
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el): GeneralName
-    {
-        return new self(Name::fromASN1($el->asSequence()));
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el): GeneralName
+	{
+		return new self(Name::fromASN1($el->asSequence()));
+	}
 
-    /**
-     * Initialize from distinguished name string.
-     *
-     * @param string $str
-     *
-     * @return self
-     */
-    public static function fromDNString(string $str): self
-    {
-        return new self(Name::fromString($str));
-    }
+	/**
+	 * Initialize from distinguished name string.
+	 *
+	 * @param string $str
+	 *
+	 * @return self
+	 */
+	public static function fromDNString(string $str): self
+	{
+		return new self(Name::fromString($str));
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function string(): string
-    {
-        return $this->_dn->toString();
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function string(): string
+	{
+		return $this->_dn->toString();
+	}
 
-    /**
-     * Get directory name.
-     *
-     * @return Name
-     */
-    public function dn(): Name
-    {
-        return $this->_dn;
-    }
+	/**
+	 * Get directory name.
+	 *
+	 * @return Name
+	 */
+	public function dn(): Name
+	{
+		return $this->_dn;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1(): TaggedType
-    {
-        // Name type is itself a CHOICE, so explicit tagging must be
-        // employed to avoid ambiguities
-        return new ExplicitlyTaggedType($this->_tag, $this->_dn->toASN1());
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1(): TaggedType
+	{
+		// Name type is itself a CHOICE, so explicit tagging must be
+		// employed to avoid ambiguities
+		return new ExplicitlyTaggedType($this->_tag, $this->_dn->toASN1());
+	}
 }

lib/X509/GeneralName/X400Address.php

Indentation +40 added lines, -40 removed lines

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

lib/X509/GeneralName/RFC822Name.php

Indentation +48 added lines, -48 removed lines

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

lib/X509/Certificate/Validity.php

Indentation +77 added lines, -77 removed lines

@@ -13,88 +13,88 @@
  */
 class Validity
 {
-    /**
-     * Not before time.
-     *
-     * @var Time
-     */
-    protected $_notBefore;
+	/**
+	 * Not before time.
+	 *
+	 * @var Time
+	 */
+	protected $_notBefore;
 
-    /**
-     * Not after time.
-     *
-     * @var Time
-     */
-    protected $_notAfter;
+	/**
+	 * Not after time.
+	 *
+	 * @var Time
+	 */
+	protected $_notAfter;
 
-    /**
-     * Constructor.
-     *
-     * @param Time $not_before
-     * @param Time $not_after
-     */
-    public function __construct(Time $not_before, Time $not_after)
-    {
-        $this->_notBefore = $not_before;
-        $this->_notAfter = $not_after;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Time $not_before
+	 * @param Time $not_after
+	 */
+	public function __construct(Time $not_before, Time $not_after)
+	{
+		$this->_notBefore = $not_before;
+		$this->_notAfter = $not_after;
+	}
 
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        $nb = Time::fromASN1($seq->at(0)->asTime());
-        $na = Time::fromASN1($seq->at(1)->asTime());
-        return new self($nb, $na);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		$nb = Time::fromASN1($seq->at(0)->asTime());
+		$na = Time::fromASN1($seq->at(1)->asTime());
+		return new self($nb, $na);
+	}
 
-    /**
-     * Initialize from date strings.
-     *
-     * @param null|string $nb_date Not before date
-     * @param null|string $na_date Not after date
-     * @param null|string $tz      Timezone string
-     *
-     * @return self
-     */
-    public static function fromStrings(?string $nb_date, ?string $na_date,
-        ?string $tz = null): self
-    {
-        return new self(Time::fromString($nb_date, $tz),
-            Time::fromString($na_date, $tz));
-    }
+	/**
+	 * Initialize from date strings.
+	 *
+	 * @param null|string $nb_date Not before date
+	 * @param null|string $na_date Not after date
+	 * @param null|string $tz      Timezone string
+	 *
+	 * @return self
+	 */
+	public static function fromStrings(?string $nb_date, ?string $na_date,
+		?string $tz = null): self
+	{
+		return new self(Time::fromString($nb_date, $tz),
+			Time::fromString($na_date, $tz));
+	}
 
-    /**
-     * Get not before time.
-     *
-     * @return Time
-     */
-    public function notBefore(): Time
-    {
-        return $this->_notBefore;
-    }
+	/**
+	 * Get not before time.
+	 *
+	 * @return Time
+	 */
+	public function notBefore(): Time
+	{
+		return $this->_notBefore;
+	}
 
-    /**
-     * Get not after time.
-     *
-     * @return Time
-     */
-    public function notAfter(): Time
-    {
-        return $this->_notAfter;
-    }
+	/**
+	 * Get not after time.
+	 *
+	 * @return Time
+	 */
+	public function notAfter(): Time
+	{
+		return $this->_notAfter;
+	}
 
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        return new Sequence($this->_notBefore->toASN1(),
-            $this->_notAfter->toASN1());
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		return new Sequence($this->_notBefore->toASN1(),
+			$this->_notAfter->toASN1());
+	}
 }

lib/X509/Certificate/UniqueIdentifier.php

Indentation +64 added lines, -64 removed lines

@@ -13,74 +13,74 @@
  */
 class UniqueIdentifier
 {
-    /**
-     * Identifier.
-     *
-     * @var BitString
-     */
-    protected $_uid;
+	/**
+	 * Identifier.
+	 *
+	 * @var BitString
+	 */
+	protected $_uid;
 
-    /**
-     * Constructor.
-     *
-     * @param BitString $bs
-     */
-    public function __construct(BitString $bs)
-    {
-        $this->_uid = $bs;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param BitString $bs
+	 */
+	public function __construct(BitString $bs)
+	{
+		$this->_uid = $bs;
+	}
 
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param BitString $bs
-     *
-     * @return self
-     */
-    public static function fromASN1(BitString $bs): UniqueIdentifier
-    {
-        return new self($bs);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param BitString $bs
+	 *
+	 * @return self
+	 */
+	public static function fromASN1(BitString $bs): UniqueIdentifier
+	{
+		return new self($bs);
+	}
 
-    /**
-     * Initialize from string.
-     *
-     * @param string $str
-     *
-     * @return self
-     */
-    public static function fromString(string $str): UniqueIdentifier
-    {
-        return new self(new BitString($str));
-    }
+	/**
+	 * Initialize from string.
+	 *
+	 * @param string $str
+	 *
+	 * @return self
+	 */
+	public static function fromString(string $str): UniqueIdentifier
+	{
+		return new self(new BitString($str));
+	}
 
-    /**
-     * Get unique identifier as a string.
-     *
-     * @return string
-     */
-    public function string(): string
-    {
-        return $this->_uid->string();
-    }
+	/**
+	 * Get unique identifier as a string.
+	 *
+	 * @return string
+	 */
+	public function string(): string
+	{
+		return $this->_uid->string();
+	}
 
-    /**
-     * Get unique identifier as a bit string.
-     *
-     * @return BitString
-     */
-    public function bitString(): BitString
-    {
-        return $this->_uid;
-    }
+	/**
+	 * Get unique identifier as a bit string.
+	 *
+	 * @return BitString
+	 */
+	public function bitString(): BitString
+	{
+		return $this->_uid;
+	}
 
-    /**
-     * Get ASN.1 element.
-     *
-     * @return BitString
-     */
-    public function toASN1(): BitString
-    {
-        return $this->_uid;
-    }
+	/**
+	 * Get ASN.1 element.
+	 *
+	 * @return BitString
+	 */
+	public function toASN1(): BitString
+	{
+		return $this->_uid;
+	}
 }

lib/X509/Certificate/Extensions.php

Indentation +401 added lines, -401 removed lines

@@ -31,405 +31,405 @@
  */
 class Extensions implements \Countable, \IteratorAggregate
 {
-    /**
-     * Extensions.
-     *
-     * @var Extension[]
-     */
-    protected $_extensions;
-
-    /**
-     * Constructor.
-     *
-     * @param Extension ...$extensions Extension objects
-     */
-    public function __construct(Extension ...$extensions)
-    {
-        $this->_extensions = [];
-        foreach ($extensions as $ext) {
-            $this->_extensions[$ext->oid()] = $ext;
-        }
-    }
-
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     *
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): Extensions
-    {
-        $extensions = array_map(
-            function (UnspecifiedType $el) {
-                return Extension::fromASN1($el->asSequence());
-            }, $seq->elements());
-        return new self(...$extensions);
-    }
-
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $elements = array_values(
-            array_map(
-                function ($ext) {
-                    return $ext->toASN1();
-                }, $this->_extensions));
-        return new Sequence(...$elements);
-    }
-
-    /**
-     * Get self with extensions added.
-     *
-     * @param Extension ...$exts One or more extensions to add
-     *
-     * @return self
-     */
-    public function withExtensions(Extension ...$exts): Extensions
-    {
-        $obj = clone $this;
-        foreach ($exts as $ext) {
-            $obj->_extensions[$ext->oid()] = $ext;
-        }
-        return $obj;
-    }
-
-    /**
-     * Check whether extension is present.
-     *
-     * @param string $oid Extensions OID
-     *
-     * @return bool
-     */
-    public function has(string $oid): bool
-    {
-        return isset($this->_extensions[$oid]);
-    }
-
-    /**
-     * Get extension by OID.
-     *
-     * @param string $oid
-     *
-     * @throws \LogicException If extension is not present
-     *
-     * @return Extension
-     */
-    public function get(string $oid): Extension
-    {
-        if (!$this->has($oid)) {
-            throw new \LogicException("No extension by OID {$oid}.");
-        }
-        return $this->_extensions[$oid];
-    }
-
-    /**
-     * Check whether 'Authority Key Identifier' extension is present.
-     *
-     * @return bool
-     */
-    public function hasAuthorityKeyIdentifier(): bool
-    {
-        return $this->has(Extension::OID_AUTHORITY_KEY_IDENTIFIER);
-    }
-
-    /**
-     * Get 'Authority Key Identifier' extension.
-     *
-     * @throws \LogicException If extension is not present
-     *
-     * @return AuthorityKeyIdentifierExtension
-     */
-    public function authorityKeyIdentifier(): AuthorityKeyIdentifierExtension
-    {
-        return $this->get(Extension::OID_AUTHORITY_KEY_IDENTIFIER);
-    }
-
-    /**
-     * Check whether 'Subject Key Identifier' extension is present.
-     *
-     * @return bool
-     */
-    public function hasSubjectKeyIdentifier(): bool
-    {
-        return $this->has(Extension::OID_SUBJECT_KEY_IDENTIFIER);
-    }
-
-    /**
-     * Get 'Subject Key Identifier' extension.
-     *
-     * @throws \LogicException If extension is not present
-     *
-     * @return SubjectKeyIdentifierExtension
-     */
-    public function subjectKeyIdentifier(): SubjectKeyIdentifierExtension
-    {
-        return $this->get(Extension::OID_SUBJECT_KEY_IDENTIFIER);
-    }
-
-    /**
-     * Check whether 'Key Usage' extension is present.
-     *
-     * @return bool
-     */
-    public function hasKeyUsage(): bool
-    {
-        return $this->has(Extension::OID_KEY_USAGE);
-    }
-
-    /**
-     * Get 'Key Usage' extension.
-     *
-     * @throws \LogicException If extension is not present
-     *
-     * @return KeyUsageExtension
-     */
-    public function keyUsage(): KeyUsageExtension
-    {
-        return $this->get(Extension::OID_KEY_USAGE);
-    }
-
-    /**
-     * Check whether 'Certificate Policies' extension is present.
-     *
-     * @return bool
-     */
-    public function hasCertificatePolicies(): bool
-    {
-        return $this->has(Extension::OID_CERTIFICATE_POLICIES);
-    }
-
-    /**
-     * Get 'Certificate Policies' extension.
-     *
-     * @throws \LogicException If extension is not present
-     *
-     * @return CertificatePoliciesExtension
-     */
-    public function certificatePolicies(): CertificatePoliciesExtension
-    {
-        return $this->get(Extension::OID_CERTIFICATE_POLICIES);
-    }
-
-    /**
-     * Check whether 'Policy Mappings' extension is present.
-     *
-     * @return bool
-     */
-    public function hasPolicyMappings(): bool
-    {
-        return $this->has(Extension::OID_POLICY_MAPPINGS);
-    }
-
-    /**
-     * Get 'Policy Mappings' extension.
-     *
-     * @throws \LogicException If extension is not present
-     *
-     * @return PolicyMappingsExtension
-     */
-    public function policyMappings(): PolicyMappingsExtension
-    {
-        return $this->get(Extension::OID_POLICY_MAPPINGS);
-    }
-
-    /**
-     * Check whether 'Subject Alternative Name' extension is present.
-     *
-     * @return bool
-     */
-    public function hasSubjectAlternativeName(): bool
-    {
-        return $this->has(Extension::OID_SUBJECT_ALT_NAME);
-    }
-
-    /**
-     * Get 'Subject Alternative Name' extension.
-     *
-     * @throws \LogicException If extension is not present
-     *
-     * @return SubjectAlternativeNameExtension
-     */
-    public function subjectAlternativeName(): SubjectAlternativeNameExtension
-    {
-        return $this->get(Extension::OID_SUBJECT_ALT_NAME);
-    }
-
-    /**
-     * Check whether 'Issuer Alternative Name' extension is present.
-     *
-     * @return bool
-     */
-    public function hasIssuerAlternativeName(): bool
-    {
-        return $this->has(Extension::OID_ISSUER_ALT_NAME);
-    }
-
-    /**
-     * Get 'Issuer Alternative Name' extension.
-     *
-     * @return IssuerAlternativeNameExtension
-     */
-    public function issuerAlternativeName(): IssuerAlternativeNameExtension
-    {
-        return $this->get(Extension::OID_ISSUER_ALT_NAME);
-    }
-
-    /**
-     * Check whether 'Basic Constraints' extension is present.
-     *
-     * @return bool
-     */
-    public function hasBasicConstraints(): bool
-    {
-        return $this->has(Extension::OID_BASIC_CONSTRAINTS);
-    }
-
-    /**
-     * Get 'Basic Constraints' extension.
-     *
-     * @throws \LogicException If extension is not present
-     *
-     * @return BasicConstraintsExtension
-     */
-    public function basicConstraints(): BasicConstraintsExtension
-    {
-        return $this->get(Extension::OID_BASIC_CONSTRAINTS);
-    }
-
-    /**
-     * Check whether 'Name Constraints' extension is present.
-     *
-     * @return bool
-     */
-    public function hasNameConstraints(): bool
-    {
-        return $this->has(Extension::OID_NAME_CONSTRAINTS);
-    }
-
-    /**
-     * Get 'Name Constraints' extension.
-     *
-     * @throws \LogicException If extension is not present
-     *
-     * @return NameConstraintsExtension
-     */
-    public function nameConstraints(): NameConstraintsExtension
-    {
-        return $this->get(Extension::OID_NAME_CONSTRAINTS);
-    }
-
-    /**
-     * Check whether 'Policy Constraints' extension is present.
-     *
-     * @return bool
-     */
-    public function hasPolicyConstraints(): bool
-    {
-        return $this->has(Extension::OID_POLICY_CONSTRAINTS);
-    }
-
-    /**
-     * Get 'Policy Constraints' extension.
-     *
-     * @throws \LogicException If extension is not present
-     *
-     * @return PolicyConstraintsExtension
-     */
-    public function policyConstraints(): PolicyConstraintsExtension
-    {
-        return $this->get(Extension::OID_POLICY_CONSTRAINTS);
-    }
-
-    /**
-     * Check whether 'Extended Key Usage' extension is present.
-     *
-     * @return bool
-     */
-    public function hasExtendedKeyUsage(): bool
-    {
-        return $this->has(Extension::OID_EXT_KEY_USAGE);
-    }
-
-    /**
-     * Get 'Extended Key Usage' extension.
-     *
-     * @throws \LogicException If extension is not present
-     *
-     * @return ExtendedKeyUsageExtension
-     */
-    public function extendedKeyUsage(): ExtendedKeyUsageExtension
-    {
-        return $this->get(Extension::OID_EXT_KEY_USAGE);
-    }
-
-    /**
-     * Check whether 'CRL Distribution Points' extension is present.
-     *
-     * @return bool
-     */
-    public function hasCRLDistributionPoints(): bool
-    {
-        return $this->has(Extension::OID_CRL_DISTRIBUTION_POINTS);
-    }
-
-    /**
-     * Get 'CRL Distribution Points' extension.
-     *
-     * @throws \LogicException If extension is not present
-     *
-     * @return CRLDistributionPointsExtension
-     */
-    public function crlDistributionPoints(): CRLDistributionPointsExtension
-    {
-        return $this->get(Extension::OID_CRL_DISTRIBUTION_POINTS);
-    }
-
-    /**
-     * Check whether 'Inhibit anyPolicy' extension is present.
-     *
-     * @return bool
-     */
-    public function hasInhibitAnyPolicy(): bool
-    {
-        return $this->has(Extension::OID_INHIBIT_ANY_POLICY);
-    }
-
-    /**
-     * Get 'Inhibit anyPolicy' extension.
-     *
-     * @throws \LogicException If extension is not present
-     *
-     * @return InhibitAnyPolicyExtension
-     */
-    public function inhibitAnyPolicy(): InhibitAnyPolicyExtension
-    {
-        return $this->get(Extension::OID_INHIBIT_ANY_POLICY);
-    }
-
-    /**
-     * @see \Countable::count()
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_extensions);
-    }
-
-    /**
-     * Get iterator for extensions.
-     *
-     * @see \IteratorAggregate::getIterator()
-     *
-     * @return \Traversable
-     */
-    public function getIterator(): \Traversable
-    {
-        return new \ArrayIterator($this->_extensions);
-    }
+	/**
+	 * Extensions.
+	 *
+	 * @var Extension[]
+	 */
+	protected $_extensions;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param Extension ...$extensions Extension objects
+	 */
+	public function __construct(Extension ...$extensions)
+	{
+		$this->_extensions = [];
+		foreach ($extensions as $ext) {
+			$this->_extensions[$ext->oid()] = $ext;
+		}
+	}
+
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 *
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): Extensions
+	{
+		$extensions = array_map(
+			function (UnspecifiedType $el) {
+				return Extension::fromASN1($el->asSequence());
+			}, $seq->elements());
+		return new self(...$extensions);
+	}
+
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$elements = array_values(
+			array_map(
+				function ($ext) {
+					return $ext->toASN1();
+				}, $this->_extensions));
+		return new Sequence(...$elements);
+	}
+
+	/**
+	 * Get self with extensions added.
+	 *
+	 * @param Extension ...$exts One or more extensions to add
+	 *
+	 * @return self
+	 */
+	public function withExtensions(Extension ...$exts): Extensions
+	{
+		$obj = clone $this;
+		foreach ($exts as $ext) {
+			$obj->_extensions[$ext->oid()] = $ext;
+		}
+		return $obj;
+	}
+
+	/**
+	 * Check whether extension is present.
+	 *
+	 * @param string $oid Extensions OID
+	 *
+	 * @return bool
+	 */
+	public function has(string $oid): bool
+	{
+		return isset($this->_extensions[$oid]);
+	}
+
+	/**
+	 * Get extension by OID.
+	 *
+	 * @param string $oid
+	 *
+	 * @throws \LogicException If extension is not present
+	 *
+	 * @return Extension
+	 */
+	public function get(string $oid): Extension
+	{
+		if (!$this->has($oid)) {
+			throw new \LogicException("No extension by OID {$oid}.");
+		}
+		return $this->_extensions[$oid];
+	}
+
+	/**
+	 * Check whether 'Authority Key Identifier' extension is present.
+	 *
+	 * @return bool
+	 */
+	public function hasAuthorityKeyIdentifier(): bool
+	{
+		return $this->has(Extension::OID_AUTHORITY_KEY_IDENTIFIER);
+	}
+
+	/**
+	 * Get 'Authority Key Identifier' extension.
+	 *
+	 * @throws \LogicException If extension is not present
+	 *
+	 * @return AuthorityKeyIdentifierExtension
+	 */
+	public function authorityKeyIdentifier(): AuthorityKeyIdentifierExtension
+	{
+		return $this->get(Extension::OID_AUTHORITY_KEY_IDENTIFIER);
+	}
+
+	/**
+	 * Check whether 'Subject Key Identifier' extension is present.
+	 *
+	 * @return bool
+	 */
+	public function hasSubjectKeyIdentifier(): bool
+	{
+		return $this->has(Extension::OID_SUBJECT_KEY_IDENTIFIER);
+	}
+
+	/**
+	 * Get 'Subject Key Identifier' extension.
+	 *
+	 * @throws \LogicException If extension is not present
+	 *
+	 * @return SubjectKeyIdentifierExtension
+	 */
+	public function subjectKeyIdentifier(): SubjectKeyIdentifierExtension
+	{
+		return $this->get(Extension::OID_SUBJECT_KEY_IDENTIFIER);
+	}
+
+	/**
+	 * Check whether 'Key Usage' extension is present.
+	 *
+	 * @return bool
+	 */
+	public function hasKeyUsage(): bool
+	{
+		return $this->has(Extension::OID_KEY_USAGE);
+	}
+
+	/**
+	 * Get 'Key Usage' extension.
+	 *
+	 * @throws \LogicException If extension is not present
+	 *
+	 * @return KeyUsageExtension
+	 */
+	public function keyUsage(): KeyUsageExtension
+	{
+		return $this->get(Extension::OID_KEY_USAGE);
+	}
+
+	/**
+	 * Check whether 'Certificate Policies' extension is present.
+	 *
+	 * @return bool
+	 */
+	public function hasCertificatePolicies(): bool
+	{
+		return $this->has(Extension::OID_CERTIFICATE_POLICIES);
+	}
+
+	/**
+	 * Get 'Certificate Policies' extension.
+	 *
+	 * @throws \LogicException If extension is not present
+	 *
+	 * @return CertificatePoliciesExtension
+	 */
+	public function certificatePolicies(): CertificatePoliciesExtension
+	{
+		return $this->get(Extension::OID_CERTIFICATE_POLICIES);
+	}
+
+	/**
+	 * Check whether 'Policy Mappings' extension is present.
+	 *
+	 * @return bool
+	 */
+	public function hasPolicyMappings(): bool
+	{
+		return $this->has(Extension::OID_POLICY_MAPPINGS);
+	}
+
+	/**
+	 * Get 'Policy Mappings' extension.
+	 *
+	 * @throws \LogicException If extension is not present
+	 *
+	 * @return PolicyMappingsExtension
+	 */
+	public function policyMappings(): PolicyMappingsExtension
+	{
+		return $this->get(Extension::OID_POLICY_MAPPINGS);
+	}
+
+	/**
+	 * Check whether 'Subject Alternative Name' extension is present.
+	 *
+	 * @return bool
+	 */
+	public function hasSubjectAlternativeName(): bool
+	{
+		return $this->has(Extension::OID_SUBJECT_ALT_NAME);
+	}
+
+	/**
+	 * Get 'Subject Alternative Name' extension.
+	 *
+	 * @throws \LogicException If extension is not present
+	 *
+	 * @return SubjectAlternativeNameExtension
+	 */
+	public function subjectAlternativeName(): SubjectAlternativeNameExtension
+	{
+		return $this->get(Extension::OID_SUBJECT_ALT_NAME);
+	}
+
+	/**
+	 * Check whether 'Issuer Alternative Name' extension is present.
+	 *
+	 * @return bool
+	 */
+	public function hasIssuerAlternativeName(): bool
+	{
+		return $this->has(Extension::OID_ISSUER_ALT_NAME);
+	}
+
+	/**
+	 * Get 'Issuer Alternative Name' extension.
+	 *
+	 * @return IssuerAlternativeNameExtension
+	 */
+	public function issuerAlternativeName(): IssuerAlternativeNameExtension
+	{
+		return $this->get(Extension::OID_ISSUER_ALT_NAME);
+	}
+
+	/**
+	 * Check whether 'Basic Constraints' extension is present.
+	 *
+	 * @return bool
+	 */
+	public function hasBasicConstraints(): bool
+	{
+		return $this->has(Extension::OID_BASIC_CONSTRAINTS);
+	}
+
+	/**
+	 * Get 'Basic Constraints' extension.
+	 *
+	 * @throws \LogicException If extension is not present
+	 *
+	 * @return BasicConstraintsExtension
+	 */
+	public function basicConstraints(): BasicConstraintsExtension
+	{
+		return $this->get(Extension::OID_BASIC_CONSTRAINTS);
+	}
+
+	/**
+	 * Check whether 'Name Constraints' extension is present.
+	 *
+	 * @return bool
+	 */
+	public function hasNameConstraints(): bool
+	{
+		return $this->has(Extension::OID_NAME_CONSTRAINTS);
+	}
+
+	/**
+	 * Get 'Name Constraints' extension.
+	 *
+	 * @throws \LogicException If extension is not present
+	 *
+	 * @return NameConstraintsExtension
+	 */
+	public function nameConstraints(): NameConstraintsExtension
+	{
+		return $this->get(Extension::OID_NAME_CONSTRAINTS);
+	}
+
+	/**
+	 * Check whether 'Policy Constraints' extension is present.
+	 *
+	 * @return bool
+	 */
+	public function hasPolicyConstraints(): bool
+	{
+		return $this->has(Extension::OID_POLICY_CONSTRAINTS);
+	}
+
+	/**
+	 * Get 'Policy Constraints' extension.
+	 *
+	 * @throws \LogicException If extension is not present
+	 *
+	 * @return PolicyConstraintsExtension
+	 */
+	public function policyConstraints(): PolicyConstraintsExtension
+	{
+		return $this->get(Extension::OID_POLICY_CONSTRAINTS);
+	}
+
+	/**
+	 * Check whether 'Extended Key Usage' extension is present.
+	 *
+	 * @return bool
+	 */
+	public function hasExtendedKeyUsage(): bool
+	{
+		return $this->has(Extension::OID_EXT_KEY_USAGE);
+	}
+
+	/**
+	 * Get 'Extended Key Usage' extension.
+	 *
+	 * @throws \LogicException If extension is not present
+	 *
+	 * @return ExtendedKeyUsageExtension
+	 */
+	public function extendedKeyUsage(): ExtendedKeyUsageExtension
+	{
+		return $this->get(Extension::OID_EXT_KEY_USAGE);
+	}
+
+	/**
+	 * Check whether 'CRL Distribution Points' extension is present.
+	 *
+	 * @return bool
+	 */
+	public function hasCRLDistributionPoints(): bool
+	{
+		return $this->has(Extension::OID_CRL_DISTRIBUTION_POINTS);
+	}
+
+	/**
+	 * Get 'CRL Distribution Points' extension.
+	 *
+	 * @throws \LogicException If extension is not present
+	 *
+	 * @return CRLDistributionPointsExtension
+	 */
+	public function crlDistributionPoints(): CRLDistributionPointsExtension
+	{
+		return $this->get(Extension::OID_CRL_DISTRIBUTION_POINTS);
+	}
+
+	/**
+	 * Check whether 'Inhibit anyPolicy' extension is present.
+	 *
+	 * @return bool
+	 */
+	public function hasInhibitAnyPolicy(): bool
+	{
+		return $this->has(Extension::OID_INHIBIT_ANY_POLICY);
+	}
+
+	/**
+	 * Get 'Inhibit anyPolicy' extension.
+	 *
+	 * @throws \LogicException If extension is not present
+	 *
+	 * @return InhibitAnyPolicyExtension
+	 */
+	public function inhibitAnyPolicy(): InhibitAnyPolicyExtension
+	{
+		return $this->get(Extension::OID_INHIBIT_ANY_POLICY);
+	}
+
+	/**
+	 * @see \Countable::count()
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_extensions);
+	}
+
+	/**
+	 * Get iterator for extensions.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 *
+	 * @return \Traversable
+	 */
+	public function getIterator(): \Traversable
+	{
+		return new \ArrayIterator($this->_extensions);
+	}
 }

lib/X509/Certificate/Extension/KeyUsageExtension.php

Indentation +149 added lines, -149 removed lines

@@ -15,153 +15,153 @@
  */
 class KeyUsageExtension extends Extension
 {
-    const DIGITAL_SIGNATURE = 0x100;
-    const NON_REPUDIATION = 0x080;
-    const KEY_ENCIPHERMENT = 0x040;
-    const DATA_ENCIPHERMENT = 0x020;
-    const KEY_AGREEMENT = 0x010;
-    const KEY_CERT_SIGN = 0x008;
-    const CRL_SIGN = 0x004;
-    const ENCIPHER_ONLY = 0x002;
-    const DECIPHER_ONLY = 0x001;
-
-    /**
-     * Key usage flags.
-     *
-     * @var int
-     */
-    protected $_keyUsage;
-
-    /**
-     * Constructor.
-     *
-     * @param bool $critical
-     * @param int  $keyUsage
-     */
-    public function __construct(bool $critical, int $keyUsage)
-    {
-        parent::__construct(self::OID_KEY_USAGE, $critical);
-        $this->_keyUsage = $keyUsage;
-    }
-
-    /**
-     * Check whether digitalSignature flag is set.
-     *
-     * @return bool
-     */
-    public function isDigitalSignature(): bool
-    {
-        return $this->_flagSet(self::DIGITAL_SIGNATURE);
-    }
-
-    /**
-     * Check whether nonRepudiation/contentCommitment flag is set.
-     *
-     * @return bool
-     */
-    public function isNonRepudiation(): bool
-    {
-        return $this->_flagSet(self::NON_REPUDIATION);
-    }
-
-    /**
-     * Check whether keyEncipherment flag is set.
-     *
-     * @return bool
-     */
-    public function isKeyEncipherment(): bool
-    {
-        return $this->_flagSet(self::KEY_ENCIPHERMENT);
-    }
-
-    /**
-     * Check whether dataEncipherment flag is set.
-     *
-     * @return bool
-     */
-    public function isDataEncipherment(): bool
-    {
-        return $this->_flagSet(self::DATA_ENCIPHERMENT);
-    }
-
-    /**
-     * Check whether keyAgreement flag is set.
-     *
-     * @return bool
-     */
-    public function isKeyAgreement(): bool
-    {
-        return $this->_flagSet(self::KEY_AGREEMENT);
-    }
-
-    /**
-     * Check whether keyCertSign flag is set.
-     *
-     * @return bool
-     */
-    public function isKeyCertSign(): bool
-    {
-        return $this->_flagSet(self::KEY_CERT_SIGN);
-    }
-
-    /**
-     * Check whether cRLSign flag is set.
-     *
-     * @return bool
-     */
-    public function isCRLSign(): bool
-    {
-        return $this->_flagSet(self::CRL_SIGN);
-    }
-
-    /**
-     * Check whether encipherOnly flag is set.
-     *
-     * @return bool
-     */
-    public function isEncipherOnly(): bool
-    {
-        return $this->_flagSet(self::ENCIPHER_ONLY);
-    }
-
-    /**
-     * Check whether decipherOnly flag is set.
-     *
-     * @return bool
-     */
-    public function isDecipherOnly(): bool
-    {
-        return $this->_flagSet(self::DECIPHER_ONLY);
-    }
-
-    /**
-     * Check whether given flag is set.
-     *
-     * @param int $flag
-     *
-     * @return bool
-     */
-    protected function _flagSet(int $flag): bool
-    {
-        return (bool) ($this->_keyUsage & $flag);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected static function _fromDER(string $data, bool $critical): Extension
-    {
-        return new self($critical,
-            Flags::fromBitString(
-                UnspecifiedType::fromDER($data)->asBitString(), 9)->intNumber());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function _valueASN1(): Element
-    {
-        $flags = new Flags($this->_keyUsage, 9);
-        return $flags->bitString()->withoutTrailingZeroes();
-    }
+	const DIGITAL_SIGNATURE = 0x100;
+	const NON_REPUDIATION = 0x080;
+	const KEY_ENCIPHERMENT = 0x040;
+	const DATA_ENCIPHERMENT = 0x020;
+	const KEY_AGREEMENT = 0x010;
+	const KEY_CERT_SIGN = 0x008;
+	const CRL_SIGN = 0x004;
+	const ENCIPHER_ONLY = 0x002;
+	const DECIPHER_ONLY = 0x001;
+
+	/**
+	 * Key usage flags.
+	 *
+	 * @var int
+	 */
+	protected $_keyUsage;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param bool $critical
+	 * @param int  $keyUsage
+	 */
+	public function __construct(bool $critical, int $keyUsage)
+	{
+		parent::__construct(self::OID_KEY_USAGE, $critical);
+		$this->_keyUsage = $keyUsage;
+	}
+
+	/**
+	 * Check whether digitalSignature flag is set.
+	 *
+	 * @return bool
+	 */
+	public function isDigitalSignature(): bool
+	{
+		return $this->_flagSet(self::DIGITAL_SIGNATURE);
+	}
+
+	/**
+	 * Check whether nonRepudiation/contentCommitment flag is set.
+	 *
+	 * @return bool
+	 */
+	public function isNonRepudiation(): bool
+	{
+		return $this->_flagSet(self::NON_REPUDIATION);
+	}
+
+	/**
+	 * Check whether keyEncipherment flag is set.
+	 *
+	 * @return bool
+	 */
+	public function isKeyEncipherment(): bool
+	{
+		return $this->_flagSet(self::KEY_ENCIPHERMENT);
+	}
+
+	/**
+	 * Check whether dataEncipherment flag is set.
+	 *
+	 * @return bool
+	 */
+	public function isDataEncipherment(): bool
+	{
+		return $this->_flagSet(self::DATA_ENCIPHERMENT);
+	}
+
+	/**
+	 * Check whether keyAgreement flag is set.
+	 *
+	 * @return bool
+	 */
+	public function isKeyAgreement(): bool
+	{
+		return $this->_flagSet(self::KEY_AGREEMENT);
+	}
+
+	/**
+	 * Check whether keyCertSign flag is set.
+	 *
+	 * @return bool
+	 */
+	public function isKeyCertSign(): bool
+	{
+		return $this->_flagSet(self::KEY_CERT_SIGN);
+	}
+
+	/**
+	 * Check whether cRLSign flag is set.
+	 *
+	 * @return bool
+	 */
+	public function isCRLSign(): bool
+	{
+		return $this->_flagSet(self::CRL_SIGN);
+	}
+
+	/**
+	 * Check whether encipherOnly flag is set.
+	 *
+	 * @return bool
+	 */
+	public function isEncipherOnly(): bool
+	{
+		return $this->_flagSet(self::ENCIPHER_ONLY);
+	}
+
+	/**
+	 * Check whether decipherOnly flag is set.
+	 *
+	 * @return bool
+	 */
+	public function isDecipherOnly(): bool
+	{
+		return $this->_flagSet(self::DECIPHER_ONLY);
+	}
+
+	/**
+	 * Check whether given flag is set.
+	 *
+	 * @param int $flag
+	 *
+	 * @return bool
+	 */
+	protected function _flagSet(int $flag): bool
+	{
+		return (bool) ($this->_keyUsage & $flag);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected static function _fromDER(string $data, bool $critical): Extension
+	{
+		return new self($critical,
+			Flags::fromBitString(
+				UnspecifiedType::fromDER($data)->asBitString(), 9)->intNumber());
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _valueASN1(): Element
+	{
+		$flags = new Flags($this->_keyUsage, 9);
+		return $flags->bitString()->withoutTrailingZeroes();
+	}
 }

lib/X509/Certificate/Extension/NoRevocationAvailableExtension.php

Indentation +24 added lines, -24 removed lines

@@ -14,30 +14,30 @@
  */
 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}
-     */
-    protected static function _fromDER(string $data, bool $critical): Extension
-    {
-        NullType::fromDER($data);
-        return new self($critical);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected static function _fromDER(string $data, bool $critical): Extension
+	{
+		NullType::fromDER($data);
+		return new self($critical);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _valueASN1(): Element
-    {
-        return new NullType();
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _valueASN1(): Element
+	{
+		return new NullType();
+	}
 }

lib/X509/Certificate/Extension/DistributionPoint/RelativeName.php

Indentation +32 added lines, -32 removed lines

@@ -16,39 +16,39 @@
  */
 class RelativeName extends DistributionPointName
 {
-    /**
-     * Relative distinguished name.
-     *
-     * @var RDN
-     */
-    protected $_rdn;
+	/**
+	 * Relative distinguished name.
+	 *
+	 * @var RDN
+	 */
+	protected $_rdn;
 
-    /**
-     * Constructor.
-     *
-     * @param RDN $rdn
-     */
-    public function __construct(RDN $rdn)
-    {
-        $this->_tag = self::TAG_RDN;
-        $this->_rdn = $rdn;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param RDN $rdn
+	 */
+	public function __construct(RDN $rdn)
+	{
+		$this->_tag = self::TAG_RDN;
+		$this->_rdn = $rdn;
+	}
 
-    /**
-     * Get RDN.
-     *
-     * @return RDN
-     */
-    public function rdn(): RDN
-    {
-        return $this->_rdn;
-    }
+	/**
+	 * Get RDN.
+	 *
+	 * @return RDN
+	 */
+	public function rdn(): RDN
+	{
+		return $this->_rdn;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _valueASN1(): Element
-    {
-        return $this->_rdn->toASN1();
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _valueASN1(): Element
+	{
+		return $this->_rdn->toASN1();
+	}
 }