sop / x509

lib/X509/AttributeCertificate/Attributes.php

Indentation +196 added lines, -196 removed lines

@@ -26,200 +26,200 @@
  */
 class Attributes implements \Countable, \IteratorAggregate
 {
-    use AttributeContainer;
-    
-    /**
-     * Mapping from OID to attribute value class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_OID_TO_CLASS = array(
-        /* @formatter:off */
-        AccessIdentityAttributeValue::OID => AccessIdentityAttributeValue::class,
-        AuthenticationInfoAttributeValue::OID => AuthenticationInfoAttributeValue::class,
-        ChargingIdentityAttributeValue::OID => ChargingIdentityAttributeValue::class,
-        GroupAttributeValue::OID => GroupAttributeValue::class,
-        AttributeType::OID_ROLE => RoleAttributeValue::class
-        /* @formatter:on */
-    );
-    
-    /**
-     * Constructor.
-     *
-     * @param Attribute[] $attribs
-     */
-    public function __construct(Attribute ...$attribs)
-    {
-        $this->_attributes = $attribs;
-    }
-    
-    /**
-     * Initialize from attribute values.
-     *
-     * @param AttributeValue[] $values
-     * @return self
-     */
-    public static function fromAttributeValues(AttributeValue ...$values)
-    {
-        $attribs = array_map(
-            function (AttributeValue $value) {
-                return $value->toAttribute();
-            }, $values);
-        return new self(...$attribs);
-    }
-    
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq)
-    {
-        $attribs = array_map(
-            function (UnspecifiedType $el) {
-                return Attribute::fromASN1($el->asSequence());
-            }, $seq->elements());
-        // cast attributes
-        $attribs = array_map(
-            function (Attribute $attr) {
-                $oid = $attr->oid();
-                if (array_key_exists($oid, self::MAP_OID_TO_CLASS)) {
-                    $cls = self::MAP_OID_TO_CLASS[$oid];
-                    $attr = $attr->castValues($cls);
-                }
-                return $attr;
-            }, $attribs);
-        return new self(...$attribs);
-    }
-    
-    /**
-     * Check whether 'Access Identity' attribute is present.
-     *
-     * @return bool
-     */
-    public function hasAccessIdentity(): bool
-    {
-        return $this->has(AccessIdentityAttributeValue::OID);
-    }
-    
-    /**
-     * Get the first 'Access Identity' attribute value.
-     *
-     * @return AccessIdentityAttributeValue
-     */
-    public function accessIdentity(): AccessIdentityAttributeValue
-    {
-        return $this->firstOf(AccessIdentityAttributeValue::OID)->first();
-    }
-    
-    /**
-     * Check whether 'Service Authentication Information' attribute is present.
-     *
-     * @return bool
-     */
-    public function hasAuthenticationInformation(): bool
-    {
-        return $this->has(AuthenticationInfoAttributeValue::OID);
-    }
-    
-    /**
-     * Get the first 'Service Authentication Information' attribute value.
-     *
-     * @return AuthenticationInfoAttributeValue
-     */
-    public function authenticationInformation(): AuthenticationInfoAttributeValue
-    {
-        return $this->firstOf(AuthenticationInfoAttributeValue::OID)->first();
-    }
-    
-    /**
-     * Check whether 'Charging Identity' attribute is present.
-     *
-     * @return bool
-     */
-    public function hasChargingIdentity(): bool
-    {
-        return $this->has(ChargingIdentityAttributeValue::OID);
-    }
-    
-    /**
-     * Get the first 'Charging Identity' attribute value.
-     *
-     * @return ChargingIdentityAttributeValue
-     */
-    public function chargingIdentity(): ChargingIdentityAttributeValue
-    {
-        return $this->firstOf(ChargingIdentityAttributeValue::OID)->first();
-    }
-    
-    /**
-     * Check whether 'Group' attribute is present.
-     *
-     * @return bool
-     */
-    public function hasGroup(): bool
-    {
-        return $this->has(GroupAttributeValue::OID);
-    }
-    
-    /**
-     * Get the first 'Group' attribute value.
-     *
-     * @return GroupAttributeValue
-     */
-    public function group(): GroupAttributeValue
-    {
-        return $this->firstOf(GroupAttributeValue::OID)->first();
-    }
-    
-    /**
-     * Check whether 'Role' attribute is present.
-     *
-     * @return bool
-     */
-    public function hasRole(): bool
-    {
-        return $this->has(AttributeType::OID_ROLE);
-    }
-    
-    /**
-     * Get the first 'Role' attribute value.
-     *
-     * @return RoleAttributeValue
-     */
-    public function role(): RoleAttributeValue
-    {
-        return $this->firstOf(AttributeType::OID_ROLE)->first();
-    }
-    
-    /**
-     * Get all 'Role' attribute values.
-     *
-     * @return RoleAttributeValue[]
-     */
-    public function roles(): array
-    {
-        return array_merge(array(),
-            ...array_map(
-                function (Attribute $attr) {
-                    return $attr->values();
-                }, $this->allOf(AttributeType::OID_ROLE)));
-    }
-    
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $elements = array_map(
-            function (Attribute $attr) {
-                return $attr->toASN1();
-            }, array_values($this->_attributes));
-        return new Sequence(...$elements);
-    }
+	use AttributeContainer;
+    
+	/**
+	 * Mapping from OID to attribute value class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_OID_TO_CLASS = array(
+		/* @formatter:off */
+		AccessIdentityAttributeValue::OID => AccessIdentityAttributeValue::class,
+		AuthenticationInfoAttributeValue::OID => AuthenticationInfoAttributeValue::class,
+		ChargingIdentityAttributeValue::OID => ChargingIdentityAttributeValue::class,
+		GroupAttributeValue::OID => GroupAttributeValue::class,
+		AttributeType::OID_ROLE => RoleAttributeValue::class
+		/* @formatter:on */
+	);
+    
+	/**
+	 * Constructor.
+	 *
+	 * @param Attribute[] $attribs
+	 */
+	public function __construct(Attribute ...$attribs)
+	{
+		$this->_attributes = $attribs;
+	}
+    
+	/**
+	 * Initialize from attribute values.
+	 *
+	 * @param AttributeValue[] $values
+	 * @return self
+	 */
+	public static function fromAttributeValues(AttributeValue ...$values)
+	{
+		$attribs = array_map(
+			function (AttributeValue $value) {
+				return $value->toAttribute();
+			}, $values);
+		return new self(...$attribs);
+	}
+    
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq)
+	{
+		$attribs = array_map(
+			function (UnspecifiedType $el) {
+				return Attribute::fromASN1($el->asSequence());
+			}, $seq->elements());
+		// cast attributes
+		$attribs = array_map(
+			function (Attribute $attr) {
+				$oid = $attr->oid();
+				if (array_key_exists($oid, self::MAP_OID_TO_CLASS)) {
+					$cls = self::MAP_OID_TO_CLASS[$oid];
+					$attr = $attr->castValues($cls);
+				}
+				return $attr;
+			}, $attribs);
+		return new self(...$attribs);
+	}
+    
+	/**
+	 * Check whether 'Access Identity' attribute is present.
+	 *
+	 * @return bool
+	 */
+	public function hasAccessIdentity(): bool
+	{
+		return $this->has(AccessIdentityAttributeValue::OID);
+	}
+    
+	/**
+	 * Get the first 'Access Identity' attribute value.
+	 *
+	 * @return AccessIdentityAttributeValue
+	 */
+	public function accessIdentity(): AccessIdentityAttributeValue
+	{
+		return $this->firstOf(AccessIdentityAttributeValue::OID)->first();
+	}
+    
+	/**
+	 * Check whether 'Service Authentication Information' attribute is present.
+	 *
+	 * @return bool
+	 */
+	public function hasAuthenticationInformation(): bool
+	{
+		return $this->has(AuthenticationInfoAttributeValue::OID);
+	}
+    
+	/**
+	 * Get the first 'Service Authentication Information' attribute value.
+	 *
+	 * @return AuthenticationInfoAttributeValue
+	 */
+	public function authenticationInformation(): AuthenticationInfoAttributeValue
+	{
+		return $this->firstOf(AuthenticationInfoAttributeValue::OID)->first();
+	}
+    
+	/**
+	 * Check whether 'Charging Identity' attribute is present.
+	 *
+	 * @return bool
+	 */
+	public function hasChargingIdentity(): bool
+	{
+		return $this->has(ChargingIdentityAttributeValue::OID);
+	}
+    
+	/**
+	 * Get the first 'Charging Identity' attribute value.
+	 *
+	 * @return ChargingIdentityAttributeValue
+	 */
+	public function chargingIdentity(): ChargingIdentityAttributeValue
+	{
+		return $this->firstOf(ChargingIdentityAttributeValue::OID)->first();
+	}
+    
+	/**
+	 * Check whether 'Group' attribute is present.
+	 *
+	 * @return bool
+	 */
+	public function hasGroup(): bool
+	{
+		return $this->has(GroupAttributeValue::OID);
+	}
+    
+	/**
+	 * Get the first 'Group' attribute value.
+	 *
+	 * @return GroupAttributeValue
+	 */
+	public function group(): GroupAttributeValue
+	{
+		return $this->firstOf(GroupAttributeValue::OID)->first();
+	}
+    
+	/**
+	 * Check whether 'Role' attribute is present.
+	 *
+	 * @return bool
+	 */
+	public function hasRole(): bool
+	{
+		return $this->has(AttributeType::OID_ROLE);
+	}
+    
+	/**
+	 * Get the first 'Role' attribute value.
+	 *
+	 * @return RoleAttributeValue
+	 */
+	public function role(): RoleAttributeValue
+	{
+		return $this->firstOf(AttributeType::OID_ROLE)->first();
+	}
+    
+	/**
+	 * Get all 'Role' attribute values.
+	 *
+	 * @return RoleAttributeValue[]
+	 */
+	public function roles(): array
+	{
+		return array_merge(array(),
+			...array_map(
+				function (Attribute $attr) {
+					return $attr->values();
+				}, $this->allOf(AttributeType::OID_ROLE)));
+	}
+    
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$elements = array_map(
+			function (Attribute $attr) {
+				return $attr->toASN1();
+			}, array_values($this->_attributes));
+		return new Sequence(...$elements);
+	}
 }

lib/X509/AttributeCertificate/ObjectDigestInfo.php

Indentation +81 added lines, -81 removed lines

@@ -20,92 +20,92 @@
  */
 class ObjectDigestInfo
 {
-    const TYPE_PUBLIC_KEY = 0;
-    const TYPE_PUBLIC_KEY_CERT = 1;
-    const TYPE_OTHER_OBJECT_TYPES = 2;
+	const TYPE_PUBLIC_KEY = 0;
+	const TYPE_PUBLIC_KEY_CERT = 1;
+	const TYPE_OTHER_OBJECT_TYPES = 2;
     
-    /**
-     * Object type.
-     *
-     * @var int $_digestedObjectType
-     */
-    protected $_digestedObjectType;
+	/**
+	 * Object type.
+	 *
+	 * @var int $_digestedObjectType
+	 */
+	protected $_digestedObjectType;
     
-    /**
-     * OID of other object type.
-     *
-     * @var string|null $_otherObjectTypeID
-     */
-    protected $_otherObjectTypeID;
+	/**
+	 * OID of other object type.
+	 *
+	 * @var string|null $_otherObjectTypeID
+	 */
+	protected $_otherObjectTypeID;
     
-    /**
-     * Digest algorithm.
-     *
-     * @var AlgorithmIdentifierType $_digestAlgorithm
-     */
-    protected $_digestAlgorithm;
+	/**
+	 * Digest algorithm.
+	 *
+	 * @var AlgorithmIdentifierType $_digestAlgorithm
+	 */
+	protected $_digestAlgorithm;
     
-    /**
-     * Object digest.
-     *
-     * @var BitString $_objectDigest
-     */
-    protected $_objectDigest;
+	/**
+	 * Object digest.
+	 *
+	 * @var BitString $_objectDigest
+	 */
+	protected $_objectDigest;
     
-    /**
-     * Constructor.
-     *
-     * @param int $type
-     * @param AlgorithmIdentifierType $algo
-     * @param BitString $digest
-     */
-    public function __construct($type, AlgorithmIdentifierType $algo,
-        BitString $digest)
-    {
-        $this->_digestedObjectType = $type;
-        $this->_otherObjectTypeID = null;
-        $this->_digestAlgorithm = $algo;
-        $this->_objectDigest = $digest;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int $type
+	 * @param AlgorithmIdentifierType $algo
+	 * @param BitString $digest
+	 */
+	public function __construct($type, AlgorithmIdentifierType $algo,
+		BitString $digest)
+	{
+		$this->_digestedObjectType = $type;
+		$this->_otherObjectTypeID = null;
+		$this->_digestAlgorithm = $algo;
+		$this->_objectDigest = $digest;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq)
-    {
-        $type = $seq->at(0)
-            ->asEnumerated()
-            ->number();
-        $oid = null;
-        $idx = 1;
-        if ($seq->has($idx, Element::TYPE_OBJECT_IDENTIFIER)) {
-            $oid = $seq->at($idx++)
-                ->asObjectIdentifier()
-                ->oid();
-        }
-        $algo = AlgorithmIdentifier::fromASN1($seq->at($idx++)->asSequence());
-        $digest = $seq->at($idx)->asBitString();
-        $obj = new self($type, $algo, $digest);
-        $obj->_otherObjectTypeID = $oid;
-        return $obj;
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq)
+	{
+		$type = $seq->at(0)
+			->asEnumerated()
+			->number();
+		$oid = null;
+		$idx = 1;
+		if ($seq->has($idx, Element::TYPE_OBJECT_IDENTIFIER)) {
+			$oid = $seq->at($idx++)
+				->asObjectIdentifier()
+				->oid();
+		}
+		$algo = AlgorithmIdentifier::fromASN1($seq->at($idx++)->asSequence());
+		$digest = $seq->at($idx)->asBitString();
+		$obj = new self($type, $algo, $digest);
+		$obj->_otherObjectTypeID = $oid;
+		return $obj;
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $elements = array(new Enumerated($this->_digestedObjectType));
-        if (isset($this->_otherObjectTypeID)) {
-            $elements[] = new ObjectIdentifier($this->_otherObjectTypeID);
-        }
-        $elements[] = $this->_digestAlgorithm->toASN1();
-        $elements[] = $this->_objectDigest;
-        return new Sequence(...$elements);
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$elements = array(new Enumerated($this->_digestedObjectType));
+		if (isset($this->_otherObjectTypeID)) {
+			$elements[] = new ObjectIdentifier($this->_otherObjectTypeID);
+		}
+		$elements[] = $this->_digestAlgorithm->toASN1();
+		$elements[] = $this->_objectDigest;
+		return new Sequence(...$elements);
+	}
 }

lib/X509/AttributeCertificate/Validation/ACValidator.php

Indentation +164 added lines, -164 removed lines

@@ -21,178 +21,178 @@
  */
 class ACValidator
 {
-    /**
-     * Attribute certificate.
-     *
-     * @var AttributeCertificate
-     */
-    protected $_ac;
+	/**
+	 * Attribute certificate.
+	 *
+	 * @var AttributeCertificate
+	 */
+	protected $_ac;
     
-    /**
-     * Validation configuration.
-     *
-     * @var ACValidationConfig
-     */
-    protected $_config;
+	/**
+	 * Validation configuration.
+	 *
+	 * @var ACValidationConfig
+	 */
+	protected $_config;
     
-    /**
-     * Crypto engine.
-     *
-     * @var Crypto
-     */
-    protected $_crypto;
+	/**
+	 * Crypto engine.
+	 *
+	 * @var Crypto
+	 */
+	protected $_crypto;
     
-    /**
-     * Constructor.
-     *
-     * @param AttributeCertificate $ac Attribute certificate to validate
-     * @param ACValidationConfig $config Validation configuration
-     * @param Crypto|null $crypto Crypto engine, use default if not set
-     */
-    public function __construct(AttributeCertificate $ac,
-        ACValidationConfig $config, Crypto $crypto = null)
-    {
-        $this->_ac = $ac;
-        $this->_config = $config;
-        $this->_crypto = $crypto ?: Crypto::getDefault();
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param AttributeCertificate $ac Attribute certificate to validate
+	 * @param ACValidationConfig $config Validation configuration
+	 * @param Crypto|null $crypto Crypto engine, use default if not set
+	 */
+	public function __construct(AttributeCertificate $ac,
+		ACValidationConfig $config, Crypto $crypto = null)
+	{
+		$this->_ac = $ac;
+		$this->_config = $config;
+		$this->_crypto = $crypto ?: Crypto::getDefault();
+	}
     
-    /**
-     * Validate attribute certificate.
-     *
-     * @throws ACValidationException If validation fails
-     * @return AttributeCertificate Validated AC
-     */
-    public function validate()
-    {
-        $this->_validateHolder();
-        $issuer = $this->_verifyIssuer();
-        $this->_validateIssuerProfile($issuer);
-        $this->_validateTime();
-        $this->_validateTargeting();
-        return $this->_ac;
-    }
+	/**
+	 * Validate attribute certificate.
+	 *
+	 * @throws ACValidationException If validation fails
+	 * @return AttributeCertificate Validated AC
+	 */
+	public function validate()
+	{
+		$this->_validateHolder();
+		$issuer = $this->_verifyIssuer();
+		$this->_validateIssuerProfile($issuer);
+		$this->_validateTime();
+		$this->_validateTargeting();
+		return $this->_ac;
+	}
     
-    /**
-     * Validate AC holder's certification.
-     *
-     * @throws ACValidationException
-     * @return Certificate Certificate of the AC's holder
-     */
-    private function _validateHolder()
-    {
-        $path = $this->_config->holderPath();
-        $config = PathValidationConfig::defaultConfig()->withMaxLength(
-            count($path))->withDateTime($this->_config->evaluationTime());
-        try {
-            $holder = $path->validate($config, $this->_crypto)->certificate();
-        } catch (PathValidationException $e) {
-            throw new ACValidationException(
-                "Failed to validate holder PKC's certification path.", 0, $e);
-        }
-        if (!$this->_ac->isHeldBy($holder)) {
-            throw new ACValidationException("Name mismatch of AC's holder PKC.");
-        }
-        return $holder;
-    }
+	/**
+	 * Validate AC holder's certification.
+	 *
+	 * @throws ACValidationException
+	 * @return Certificate Certificate of the AC's holder
+	 */
+	private function _validateHolder()
+	{
+		$path = $this->_config->holderPath();
+		$config = PathValidationConfig::defaultConfig()->withMaxLength(
+			count($path))->withDateTime($this->_config->evaluationTime());
+		try {
+			$holder = $path->validate($config, $this->_crypto)->certificate();
+		} catch (PathValidationException $e) {
+			throw new ACValidationException(
+				"Failed to validate holder PKC's certification path.", 0, $e);
+		}
+		if (!$this->_ac->isHeldBy($holder)) {
+			throw new ACValidationException("Name mismatch of AC's holder PKC.");
+		}
+		return $holder;
+	}
     
-    /**
-     * Verify AC's signature and issuer's certification.
-     *
-     * @throws ACValidationException
-     * @return Certificate Certificate of the AC's issuer
-     */
-    private function _verifyIssuer()
-    {
-        $path = $this->_config->issuerPath();
-        $config = PathValidationConfig::defaultConfig()->withMaxLength(
-            count($path))->withDateTime($this->_config->evaluationTime());
-        try {
-            $issuer = $path->validate($config, $this->_crypto)->certificate();
-        } catch (PathValidationException $e) {
-            throw new ACValidationException(
-                "Failed to validate issuer PKC's certification path.", 0, $e);
-        }
-        if (!$this->_ac->isIssuedBy($issuer)) {
-            throw new ACValidationException("Name mismatch of AC's issuer PKC.");
-        }
-        $pubkey_info = $issuer->tbsCertificate()->subjectPublicKeyInfo();
-        if (!$this->_ac->verify($pubkey_info, $this->_crypto)) {
-            throw new ACValidationException("Failed to verify signature.");
-        }
-        return $issuer;
-    }
+	/**
+	 * Verify AC's signature and issuer's certification.
+	 *
+	 * @throws ACValidationException
+	 * @return Certificate Certificate of the AC's issuer
+	 */
+	private function _verifyIssuer()
+	{
+		$path = $this->_config->issuerPath();
+		$config = PathValidationConfig::defaultConfig()->withMaxLength(
+			count($path))->withDateTime($this->_config->evaluationTime());
+		try {
+			$issuer = $path->validate($config, $this->_crypto)->certificate();
+		} catch (PathValidationException $e) {
+			throw new ACValidationException(
+				"Failed to validate issuer PKC's certification path.", 0, $e);
+		}
+		if (!$this->_ac->isIssuedBy($issuer)) {
+			throw new ACValidationException("Name mismatch of AC's issuer PKC.");
+		}
+		$pubkey_info = $issuer->tbsCertificate()->subjectPublicKeyInfo();
+		if (!$this->_ac->verify($pubkey_info, $this->_crypto)) {
+			throw new ACValidationException("Failed to verify signature.");
+		}
+		return $issuer;
+	}
     
-    /**
-     * Validate AC issuer's profile.
-     *
-     * @link https://tools.ietf.org/html/rfc5755#section-4.5
-     * @param Certificate $cert
-     * @throws ACValidationException
-     */
-    private function _validateIssuerProfile(Certificate $cert)
-    {
-        $exts = $cert->tbsCertificate()->extensions();
-        if ($exts->hasKeyUsage() && !$exts->keyUsage()->isDigitalSignature()) {
-            throw new ACValidationException(
-                "Issuer PKC's Key Usage extension doesn't permit" .
-                     " verification of digital signatures.");
-        }
-        if ($exts->hasBasicConstraints() && $exts->basicConstraints()->isCA()) {
-            throw new ACValidationException("Issuer PKC must not be a CA.");
-        }
-    }
+	/**
+	 * Validate AC issuer's profile.
+	 *
+	 * @link https://tools.ietf.org/html/rfc5755#section-4.5
+	 * @param Certificate $cert
+	 * @throws ACValidationException
+	 */
+	private function _validateIssuerProfile(Certificate $cert)
+	{
+		$exts = $cert->tbsCertificate()->extensions();
+		if ($exts->hasKeyUsage() && !$exts->keyUsage()->isDigitalSignature()) {
+			throw new ACValidationException(
+				"Issuer PKC's Key Usage extension doesn't permit" .
+					 " verification of digital signatures.");
+		}
+		if ($exts->hasBasicConstraints() && $exts->basicConstraints()->isCA()) {
+			throw new ACValidationException("Issuer PKC must not be a CA.");
+		}
+	}
     
-    /**
-     * Validate AC's validity period.
-     *
-     * @throws ACValidationException
-     */
-    private function _validateTime()
-    {
-        $t = $this->_config->evaluationTime();
-        $validity = $this->_ac->acinfo()->validityPeriod();
-        if ($validity->notBeforeTime()->diff($t)->invert) {
-            throw new ACValidationException("Validity period has not started.");
-        }
-        if ($t->diff($validity->notAfterTime())->invert) {
-            throw new ACValidationException("Attribute certificate has expired.");
-        }
-    }
+	/**
+	 * Validate AC's validity period.
+	 *
+	 * @throws ACValidationException
+	 */
+	private function _validateTime()
+	{
+		$t = $this->_config->evaluationTime();
+		$validity = $this->_ac->acinfo()->validityPeriod();
+		if ($validity->notBeforeTime()->diff($t)->invert) {
+			throw new ACValidationException("Validity period has not started.");
+		}
+		if ($t->diff($validity->notAfterTime())->invert) {
+			throw new ACValidationException("Attribute certificate has expired.");
+		}
+	}
     
-    /**
-     * Validate AC's target information.
-     *
-     * @throws ACValidationException
-     */
-    private function _validateTargeting()
-    {
-        $exts = $this->_ac->acinfo()->extensions();
-        // if target information extension is not present
-        if (!$exts->has(Extension::OID_TARGET_INFORMATION)) {
-            return;
-        }
-        $ext = $exts->get(Extension::OID_TARGET_INFORMATION);
-        if ($ext instanceof TargetInformationExtension &&
-             !$this->_hasMatchingTarget($ext->targets())) {
-            throw new ACValidationException(
-                "Attribute certificate doesn't have a matching target.");
-        }
-    }
+	/**
+	 * Validate AC's target information.
+	 *
+	 * @throws ACValidationException
+	 */
+	private function _validateTargeting()
+	{
+		$exts = $this->_ac->acinfo()->extensions();
+		// if target information extension is not present
+		if (!$exts->has(Extension::OID_TARGET_INFORMATION)) {
+			return;
+		}
+		$ext = $exts->get(Extension::OID_TARGET_INFORMATION);
+		if ($ext instanceof TargetInformationExtension &&
+			 !$this->_hasMatchingTarget($ext->targets())) {
+			throw new ACValidationException(
+				"Attribute certificate doesn't have a matching target.");
+		}
+	}
     
-    /**
-     * Check whether validation configuration has matching targets.
-     *
-     * @param Targets $targets Set of eligible targets
-     * @return boolean
-     */
-    private function _hasMatchingTarget(Targets $targets)
-    {
-        foreach ($this->_config->targets() as $target) {
-            if ($targets->hasTarget($target)) {
-                return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * Check whether validation configuration has matching targets.
+	 *
+	 * @param Targets $targets Set of eligible targets
+	 * @return boolean
+	 */
+	private function _hasMatchingTarget(Targets $targets)
+	{
+		foreach ($this->_config->targets() as $target) {
+			if ($targets->hasTarget($target)) {
+				return true;
+			}
+		}
+		return false;
+	}
 }

lib/X509/AttributeCertificate/Holder.php

Indentation +259 added lines, -259 removed lines

@@ -19,281 +19,281 @@
  */
 class Holder
 {
-    /**
-     * Holder PKC's issuer and serial.
-     *
-     * @var IssuerSerial|null $_baseCertificateID
-     */
-    protected $_baseCertificateID;
+	/**
+	 * Holder PKC's issuer and serial.
+	 *
+	 * @var IssuerSerial|null $_baseCertificateID
+	 */
+	protected $_baseCertificateID;
     
-    /**
-     * Holder PKC's subject.
-     *
-     * @var GeneralNames|null $_entityName
-     */
-    protected $_entityName;
+	/**
+	 * Holder PKC's subject.
+	 *
+	 * @var GeneralNames|null $_entityName
+	 */
+	protected $_entityName;
     
-    /**
-     * Linked object.
-     *
-     * @var ObjectDigestInfo|null $_objectDigestInfo
-     */
-    protected $_objectDigestInfo;
+	/**
+	 * Linked object.
+	 *
+	 * @var ObjectDigestInfo|null $_objectDigestInfo
+	 */
+	protected $_objectDigestInfo;
     
-    /**
-     * Constructor.
-     *
-     * @param IssuerSerial|null $issuer_serial
-     * @param GeneralNames|null $entity_name
-     */
-    public function __construct(IssuerSerial $issuer_serial = null,
-        GeneralNames $entity_name = null)
-    {
-        $this->_baseCertificateID = $issuer_serial;
-        $this->_entityName = $entity_name;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param IssuerSerial|null $issuer_serial
+	 * @param GeneralNames|null $entity_name
+	 */
+	public function __construct(IssuerSerial $issuer_serial = null,
+		GeneralNames $entity_name = null)
+	{
+		$this->_baseCertificateID = $issuer_serial;
+		$this->_entityName = $entity_name;
+	}
     
-    /**
-     * Initialize from a holder's public key certificate.
-     *
-     * @param Certificate $cert
-     * @return self
-     */
-    public static function fromPKC(Certificate $cert)
-    {
-        return new self(IssuerSerial::fromPKC($cert));
-    }
+	/**
+	 * Initialize from a holder's public key certificate.
+	 *
+	 * @param Certificate $cert
+	 * @return self
+	 */
+	public static function fromPKC(Certificate $cert)
+	{
+		return new self(IssuerSerial::fromPKC($cert));
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     */
-    public static function fromASN1(Sequence $seq)
-    {
-        $cert_id = null;
-        $entity_name = null;
-        $digest_info = null;
-        if ($seq->hasTagged(0)) {
-            $cert_id = IssuerSerial::fromASN1(
-                $seq->getTagged(0)
-                    ->asImplicit(Element::TYPE_SEQUENCE)
-                    ->asSequence());
-        }
-        if ($seq->hasTagged(1)) {
-            $entity_name = GeneralNames::fromASN1(
-                $seq->getTagged(1)
-                    ->asImplicit(Element::TYPE_SEQUENCE)
-                    ->asSequence());
-        }
-        if ($seq->hasTagged(2)) {
-            $digest_info = ObjectDigestInfo::fromASN1(
-                $seq->getTagged(2)
-                    ->asImplicit(Element::TYPE_SEQUENCE)
-                    ->asSequence());
-        }
-        $obj = new self($cert_id, $entity_name);
-        $obj->_objectDigestInfo = $digest_info;
-        return $obj;
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 */
+	public static function fromASN1(Sequence $seq)
+	{
+		$cert_id = null;
+		$entity_name = null;
+		$digest_info = null;
+		if ($seq->hasTagged(0)) {
+			$cert_id = IssuerSerial::fromASN1(
+				$seq->getTagged(0)
+					->asImplicit(Element::TYPE_SEQUENCE)
+					->asSequence());
+		}
+		if ($seq->hasTagged(1)) {
+			$entity_name = GeneralNames::fromASN1(
+				$seq->getTagged(1)
+					->asImplicit(Element::TYPE_SEQUENCE)
+					->asSequence());
+		}
+		if ($seq->hasTagged(2)) {
+			$digest_info = ObjectDigestInfo::fromASN1(
+				$seq->getTagged(2)
+					->asImplicit(Element::TYPE_SEQUENCE)
+					->asSequence());
+		}
+		$obj = new self($cert_id, $entity_name);
+		$obj->_objectDigestInfo = $digest_info;
+		return $obj;
+	}
     
-    /**
-     * Get self with base certificate ID.
-     *
-     * @param IssuerSerial $issuer
-     * @return self
-     */
-    public function withBaseCertificateID(IssuerSerial $issuer)
-    {
-        $obj = clone $this;
-        $obj->_baseCertificateID = $issuer;
-        return $obj;
-    }
+	/**
+	 * Get self with base certificate ID.
+	 *
+	 * @param IssuerSerial $issuer
+	 * @return self
+	 */
+	public function withBaseCertificateID(IssuerSerial $issuer)
+	{
+		$obj = clone $this;
+		$obj->_baseCertificateID = $issuer;
+		return $obj;
+	}
     
-    /**
-     * Get self with entity name.
-     *
-     * @param GeneralNames $names
-     * @return self
-     */
-    public function withEntityName(GeneralNames $names)
-    {
-        $obj = clone $this;
-        $obj->_entityName = $names;
-        return $obj;
-    }
+	/**
+	 * Get self with entity name.
+	 *
+	 * @param GeneralNames $names
+	 * @return self
+	 */
+	public function withEntityName(GeneralNames $names)
+	{
+		$obj = clone $this;
+		$obj->_entityName = $names;
+		return $obj;
+	}
     
-    /**
-     * Get self with object digest info.
-     *
-     * @param ObjectDigestInfo $odi
-     * @return self
-     */
-    public function withObjectDigestInfo(ObjectDigestInfo $odi)
-    {
-        $obj = clone $this;
-        $obj->_objectDigestInfo = $odi;
-        return $obj;
-    }
+	/**
+	 * Get self with object digest info.
+	 *
+	 * @param ObjectDigestInfo $odi
+	 * @return self
+	 */
+	public function withObjectDigestInfo(ObjectDigestInfo $odi)
+	{
+		$obj = clone $this;
+		$obj->_objectDigestInfo = $odi;
+		return $obj;
+	}
     
-    /**
-     * Check whether base certificate ID is present.
-     *
-     * @return bool
-     */
-    public function hasBaseCertificateID()
-    {
-        return isset($this->_baseCertificateID);
-    }
+	/**
+	 * Check whether base certificate ID is present.
+	 *
+	 * @return bool
+	 */
+	public function hasBaseCertificateID()
+	{
+		return isset($this->_baseCertificateID);
+	}
     
-    /**
-     * Get base certificate ID.
-     *
-     * @throws \LogicException
-     * @return IssuerSerial
-     */
-    public function baseCertificateID(): IssuerSerial
-    {
-        if (!$this->hasBaseCertificateID()) {
-            throw new \LogicException("baseCertificateID not set.");
-        }
-        return $this->_baseCertificateID;
-    }
+	/**
+	 * Get base certificate ID.
+	 *
+	 * @throws \LogicException
+	 * @return IssuerSerial
+	 */
+	public function baseCertificateID(): IssuerSerial
+	{
+		if (!$this->hasBaseCertificateID()) {
+			throw new \LogicException("baseCertificateID not set.");
+		}
+		return $this->_baseCertificateID;
+	}
     
-    /**
-     * Check whether entity name is present.
-     *
-     * @return bool
-     */
-    public function hasEntityName(): bool
-    {
-        return isset($this->_entityName);
-    }
+	/**
+	 * Check whether entity name is present.
+	 *
+	 * @return bool
+	 */
+	public function hasEntityName(): bool
+	{
+		return isset($this->_entityName);
+	}
     
-    /**
-     * Get entity name.
-     *
-     * @throws \LogicException
-     * @return GeneralNames
-     */
-    public function entityName(): GeneralNames
-    {
-        if (!$this->hasEntityName()) {
-            throw new \LogicException("entityName not set.");
-        }
-        return $this->_entityName;
-    }
+	/**
+	 * Get entity name.
+	 *
+	 * @throws \LogicException
+	 * @return GeneralNames
+	 */
+	public function entityName(): GeneralNames
+	{
+		if (!$this->hasEntityName()) {
+			throw new \LogicException("entityName not set.");
+		}
+		return $this->_entityName;
+	}
     
-    /**
-     * Check whether object digest info is present.
-     *
-     * @return bool
-     */
-    public function hasObjectDigestInfo(): bool
-    {
-        return isset($this->_objectDigestInfo);
-    }
+	/**
+	 * Check whether object digest info is present.
+	 *
+	 * @return bool
+	 */
+	public function hasObjectDigestInfo(): bool
+	{
+		return isset($this->_objectDigestInfo);
+	}
     
-    /**
-     * Get object digest info.
-     *
-     * @throws \LogicException
-     * @return ObjectDigestInfo
-     */
-    public function objectDigestInfo(): ObjectDigestInfo
-    {
-        if (!$this->hasObjectDigestInfo()) {
-            throw new \LogicException("objectDigestInfo not set.");
-        }
-        return $this->_objectDigestInfo;
-    }
+	/**
+	 * Get object digest info.
+	 *
+	 * @throws \LogicException
+	 * @return ObjectDigestInfo
+	 */
+	public function objectDigestInfo(): ObjectDigestInfo
+	{
+		if (!$this->hasObjectDigestInfo()) {
+			throw new \LogicException("objectDigestInfo not set.");
+		}
+		return $this->_objectDigestInfo;
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $elements = [];
-        if (isset($this->_baseCertificateID)) {
-            $elements[] = new ImplicitlyTaggedType(0,
-                $this->_baseCertificateID->toASN1());
-        }
-        if (isset($this->_entityName)) {
-            $elements[] = new ImplicitlyTaggedType(1,
-                $this->_entityName->toASN1());
-        }
-        if (isset($this->_objectDigestInfo)) {
-            $elements[] = new ImplicitlyTaggedType(2,
-                $this->_objectDigestInfo->toASN1());
-        }
-        return new Sequence(...$elements);
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$elements = [];
+		if (isset($this->_baseCertificateID)) {
+			$elements[] = new ImplicitlyTaggedType(0,
+				$this->_baseCertificateID->toASN1());
+		}
+		if (isset($this->_entityName)) {
+			$elements[] = new ImplicitlyTaggedType(1,
+				$this->_entityName->toASN1());
+		}
+		if (isset($this->_objectDigestInfo)) {
+			$elements[] = new ImplicitlyTaggedType(2,
+				$this->_objectDigestInfo->toASN1());
+		}
+		return new Sequence(...$elements);
+	}
     
-    /**
-     * Check whether Holder identifies given certificate.
-     *
-     * @param Certificate $cert
-     * @return boolean
-     */
-    public function identifiesPKC(Certificate $cert): bool
-    {
-        // if neither baseCertificateID nor entityName are present
-        if (!$this->_baseCertificateID && !$this->_entityName) {
-            return false;
-        }
-        // if baseCertificateID is present, but doesn't match
-        if ($this->_baseCertificateID &&
-             !$this->_baseCertificateID->identifiesPKC($cert)) {
-            return false;
-        }
-        // if entityName is present, but doesn't match
-        if ($this->_entityName && !$this->_checkEntityName($cert)) {
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Check whether Holder identifies given certificate.
+	 *
+	 * @param Certificate $cert
+	 * @return boolean
+	 */
+	public function identifiesPKC(Certificate $cert): bool
+	{
+		// if neither baseCertificateID nor entityName are present
+		if (!$this->_baseCertificateID && !$this->_entityName) {
+			return false;
+		}
+		// if baseCertificateID is present, but doesn't match
+		if ($this->_baseCertificateID &&
+			 !$this->_baseCertificateID->identifiesPKC($cert)) {
+			return false;
+		}
+		// if entityName is present, but doesn't match
+		if ($this->_entityName && !$this->_checkEntityName($cert)) {
+			return false;
+		}
+		return true;
+	}
     
-    /**
-     * Check whether entityName matches the given certificate.
-     *
-     * @param Certificate $cert
-     * @return boolean
-     */
-    private function _checkEntityName(Certificate $cert): bool
-    {
-        $name = $this->_entityName->firstDN();
-        if ($cert->tbsCertificate()
-            ->subject()
-            ->equals($name)) {
-            return true;
-        }
-        $exts = $cert->tbsCertificate()->extensions();
-        if ($exts->hasSubjectAlternativeName()) {
-            $ext = $exts->subjectAlternativeName();
-            if ($this->_checkEntityAlternativeNames($ext->names())) {
-                return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * Check whether entityName matches the given certificate.
+	 *
+	 * @param Certificate $cert
+	 * @return boolean
+	 */
+	private function _checkEntityName(Certificate $cert): bool
+	{
+		$name = $this->_entityName->firstDN();
+		if ($cert->tbsCertificate()
+			->subject()
+			->equals($name)) {
+			return true;
+		}
+		$exts = $cert->tbsCertificate()->extensions();
+		if ($exts->hasSubjectAlternativeName()) {
+			$ext = $exts->subjectAlternativeName();
+			if ($this->_checkEntityAlternativeNames($ext->names())) {
+				return true;
+			}
+		}
+		return false;
+	}
     
-    /**
-     * Check whether any of the subject alternative names match entityName.
-     *
-     * @param GeneralNames $san
-     * @return boolean
-     */
-    private function _checkEntityAlternativeNames(GeneralNames $san): bool
-    {
-        // only directory names supported for now
-        $name = $this->_entityName->firstDN();
-        foreach ($san->allOf(GeneralName::TAG_DIRECTORY_NAME) as $dn) {
-            if ($dn instanceof DirectoryName && $dn->dn()->equals($name)) {
-                return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * Check whether any of the subject alternative names match entityName.
+	 *
+	 * @param GeneralNames $san
+	 * @return boolean
+	 */
+	private function _checkEntityAlternativeNames(GeneralNames $san): bool
+	{
+		// only directory names supported for now
+		$name = $this->_entityName->firstDN();
+		foreach ($san->allOf(GeneralName::TAG_DIRECTORY_NAME) as $dn) {
+			if ($dn instanceof DirectoryName && $dn->dn()->equals($name)) {
+				return true;
+			}
+		}
+		return false;
+	}
 }

lib/X509/AttributeCertificate/Attribute/IetfAttrSyntax.php

Indentation +183 added lines, -183 removed lines

@@ -19,203 +19,203 @@
  * @link https://tools.ietf.org/html/rfc5755#section-4.4
  */
 abstract class IetfAttrSyntax extends AttributeValue implements 
-    \Countable,
-    \IteratorAggregate
+	\Countable,
+	\IteratorAggregate
 {
-    /**
-     * Policy authority.
-     *
-     * @var GeneralNames|null $_policyAuthority
-     */
-    protected $_policyAuthority;
+	/**
+	 * Policy authority.
+	 *
+	 * @var GeneralNames|null $_policyAuthority
+	 */
+	protected $_policyAuthority;
     
-    /**
-     * Values.
-     *
-     * @var IetfAttrValue[] $_values
-     */
-    protected $_values;
+	/**
+	 * Values.
+	 *
+	 * @var IetfAttrValue[] $_values
+	 */
+	protected $_values;
     
-    /**
-     * Constructor.
-     *
-     * @param IetfAttrValue[] $values
-     */
-    public function __construct(IetfAttrValue ...$values)
-    {
-        $this->_policyAuthority = null;
-        $this->_values = $values;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param IetfAttrValue[] $values
+	 */
+	public function __construct(IetfAttrValue ...$values)
+	{
+		$this->_policyAuthority = null;
+		$this->_values = $values;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromASN1(UnspecifiedType $el)
-    {
-        $seq = $el->asSequence();
-        $authority = null;
-        $idx = 0;
-        if ($seq->hasTagged(0)) {
-            $authority = GeneralNames::fromASN1(
-                $seq->getTagged(0)
-                    ->asImplicit(Element::TYPE_SEQUENCE)
-                    ->asSequence());
-            ++$idx;
-        }
-        $values = array_map(
-            function (UnspecifiedType $el) {
-                return IetfAttrValue::fromASN1($el);
-            },
-            $seq->at($idx)
-                ->asSequence()
-                ->elements());
-        $obj = new static(...$values);
-        $obj->_policyAuthority = $authority;
-        return $obj;
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromASN1(UnspecifiedType $el)
+	{
+		$seq = $el->asSequence();
+		$authority = null;
+		$idx = 0;
+		if ($seq->hasTagged(0)) {
+			$authority = GeneralNames::fromASN1(
+				$seq->getTagged(0)
+					->asImplicit(Element::TYPE_SEQUENCE)
+					->asSequence());
+			++$idx;
+		}
+		$values = array_map(
+			function (UnspecifiedType $el) {
+				return IetfAttrValue::fromASN1($el);
+			},
+			$seq->at($idx)
+				->asSequence()
+				->elements());
+		$obj = new static(...$values);
+		$obj->_policyAuthority = $authority;
+		return $obj;
+	}
     
-    /**
-     * Get self with policy authority.
-     *
-     * @param GeneralNames $names
-     * @return self
-     */
-    public function withPolicyAuthority(GeneralNames $names)
-    {
-        $obj = clone $this;
-        $obj->_policyAuthority = $names;
-        return $obj;
-    }
+	/**
+	 * Get self with policy authority.
+	 *
+	 * @param GeneralNames $names
+	 * @return self
+	 */
+	public function withPolicyAuthority(GeneralNames $names)
+	{
+		$obj = clone $this;
+		$obj->_policyAuthority = $names;
+		return $obj;
+	}
     
-    /**
-     * Check whether policy authority is present.
-     *
-     * @return bool
-     */
-    public function hasPolicyAuthority(): bool
-    {
-        return isset($this->_policyAuthority);
-    }
+	/**
+	 * Check whether policy authority is present.
+	 *
+	 * @return bool
+	 */
+	public function hasPolicyAuthority(): bool
+	{
+		return isset($this->_policyAuthority);
+	}
     
-    /**
-     * Get policy authority.
-     *
-     * @throws \LogicException
-     * @return GeneralNames
-     */
-    public function policyAuthority(): GeneralNames
-    {
-        if (!$this->hasPolicyAuthority()) {
-            throw new \LogicException("policyAuthority not set.");
-        }
-        return $this->_policyAuthority;
-    }
+	/**
+	 * Get policy authority.
+	 *
+	 * @throws \LogicException
+	 * @return GeneralNames
+	 */
+	public function policyAuthority(): GeneralNames
+	{
+		if (!$this->hasPolicyAuthority()) {
+			throw new \LogicException("policyAuthority not set.");
+		}
+		return $this->_policyAuthority;
+	}
     
-    /**
-     * Get values.
-     *
-     * @return IetfAttrValue[]
-     */
-    public function values(): array
-    {
-        return $this->_values;
-    }
+	/**
+	 * Get values.
+	 *
+	 * @return IetfAttrValue[]
+	 */
+	public function values(): array
+	{
+		return $this->_values;
+	}
     
-    /**
-     * Get first value.
-     *
-     * @throws \LogicException
-     * @return IetfAttrValue
-     */
-    public function first(): IetfAttrValue
-    {
-        if (!count($this->_values)) {
-            throw new \LogicException("No values.");
-        }
-        return $this->_values[0];
-    }
+	/**
+	 * Get first value.
+	 *
+	 * @throws \LogicException
+	 * @return IetfAttrValue
+	 */
+	public function first(): IetfAttrValue
+	{
+		if (!count($this->_values)) {
+			throw new \LogicException("No values.");
+		}
+		return $this->_values[0];
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::toASN1()
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $elements = array();
-        if (isset($this->_policyAuthority)) {
-            $elements[] = new ImplicitlyTaggedType(0,
-                $this->_policyAuthority->toASN1());
-        }
-        $values = array_map(
-            function (IetfAttrValue $val) {
-                return $val->toASN1();
-            }, $this->_values);
-        $elements[] = new Sequence(...$values);
-        return new Sequence(...$elements);
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::toASN1()
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$elements = array();
+		if (isset($this->_policyAuthority)) {
+			$elements[] = new ImplicitlyTaggedType(0,
+				$this->_policyAuthority->toASN1());
+		}
+		$values = array_map(
+			function (IetfAttrValue $val) {
+				return $val->toASN1();
+			}, $this->_values);
+		$elements[] = new Sequence(...$values);
+		return new Sequence(...$elements);
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::stringValue()
-     * @return string
-     */
-    public function stringValue(): string
-    {
-        return "#" . bin2hex($this->toASN1()->toDER());
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::stringValue()
+	 * @return string
+	 */
+	public function stringValue(): string
+	{
+		return "#" . bin2hex($this->toASN1()->toDER());
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::equalityMatchingRule()
-     * @return BinaryMatch
-     */
-    public function equalityMatchingRule(): BinaryMatch
-    {
-        return new BinaryMatch();
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::equalityMatchingRule()
+	 * @return BinaryMatch
+	 */
+	public function equalityMatchingRule(): BinaryMatch
+	{
+		return new BinaryMatch();
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::rfc2253String()
-     * @return string
-     */
-    public function rfc2253String(): string
-    {
-        return $this->stringValue();
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::rfc2253String()
+	 * @return string
+	 */
+	public function rfc2253String(): string
+	{
+		return $this->stringValue();
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::_transcodedString()
-     * @return string
-     */
-    protected function _transcodedString(): string
-    {
-        return $this->stringValue();
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::_transcodedString()
+	 * @return string
+	 */
+	protected function _transcodedString(): string
+	{
+		return $this->stringValue();
+	}
     
-    /**
-     * Get number of values.
-     *
-     * @see \Countable::count()
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_values);
-    }
+	/**
+	 * Get number of values.
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_values);
+	}
     
-    /**
-     * Get iterator for values.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_values);
-    }
+	/**
+	 * Get iterator for values.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_values);
+	}
 }

lib/X509/AttributeCertificate/Attribute/SvceAuthInfo.php

Indentation +139 added lines, -139 removed lines

@@ -20,156 +20,156 @@
  */
 abstract class SvceAuthInfo extends AttributeValue
 {
-    /**
-     * Service.
-     *
-     * @var GeneralName $_service
-     */
-    protected $_service;
+	/**
+	 * Service.
+	 *
+	 * @var GeneralName $_service
+	 */
+	protected $_service;
     
-    /**
-     * Ident.
-     *
-     * @var GeneralName $_ident
-     */
-    protected $_ident;
+	/**
+	 * Ident.
+	 *
+	 * @var GeneralName $_ident
+	 */
+	protected $_ident;
     
-    /**
-     * Auth info.
-     *
-     * @var string|null $_authInfo
-     */
-    protected $_authInfo;
+	/**
+	 * Auth info.
+	 *
+	 * @var string|null $_authInfo
+	 */
+	protected $_authInfo;
     
-    /**
-     * Constructor.
-     *
-     * @param GeneralName $service
-     * @param GeneralName $ident
-     * @param string|null $auth_info
-     */
-    public function __construct(GeneralName $service, GeneralName $ident,
-        string $auth_info = null)
-    {
-        $this->_service = $service;
-        $this->_ident = $ident;
-        $this->_authInfo = $auth_info;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param GeneralName $service
+	 * @param GeneralName $ident
+	 * @param string|null $auth_info
+	 */
+	public function __construct(GeneralName $service, GeneralName $ident,
+		string $auth_info = null)
+	{
+		$this->_service = $service;
+		$this->_ident = $ident;
+		$this->_authInfo = $auth_info;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromASN1(UnspecifiedType $el)
-    {
-        $seq = $el->asSequence();
-        $service = GeneralName::fromASN1($seq->at(0)->asTagged());
-        $ident = GeneralName::fromASN1($seq->at(1)->asTagged());
-        $auth_info = null;
-        if ($seq->has(2, Element::TYPE_OCTET_STRING)) {
-            $auth_info = $seq->at(2)
-                ->asString()
-                ->string();
-        }
-        return new static($service, $ident, $auth_info);
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromASN1(UnspecifiedType $el)
+	{
+		$seq = $el->asSequence();
+		$service = GeneralName::fromASN1($seq->at(0)->asTagged());
+		$ident = GeneralName::fromASN1($seq->at(1)->asTagged());
+		$auth_info = null;
+		if ($seq->has(2, Element::TYPE_OCTET_STRING)) {
+			$auth_info = $seq->at(2)
+				->asString()
+				->string();
+		}
+		return new static($service, $ident, $auth_info);
+	}
     
-    /**
-     * Get service name.
-     *
-     * @return GeneralName
-     */
-    public function service(): GeneralName
-    {
-        return $this->_service;
-    }
+	/**
+	 * Get service name.
+	 *
+	 * @return GeneralName
+	 */
+	public function service(): GeneralName
+	{
+		return $this->_service;
+	}
     
-    /**
-     * Get ident.
-     *
-     * @return GeneralName
-     */
-    public function ident(): GeneralName
-    {
-        return $this->_ident;
-    }
+	/**
+	 * Get ident.
+	 *
+	 * @return GeneralName
+	 */
+	public function ident(): GeneralName
+	{
+		return $this->_ident;
+	}
     
-    /**
-     * Check whether authentication info is present.
-     *
-     * @return bool
-     */
-    public function hasAuthInfo(): bool
-    {
-        return isset($this->_authInfo);
-    }
+	/**
+	 * Check whether authentication info is present.
+	 *
+	 * @return bool
+	 */
+	public function hasAuthInfo(): bool
+	{
+		return isset($this->_authInfo);
+	}
     
-    /**
-     * Get authentication info.
-     *
-     * @throws \LogicException
-     * @return string
-     */
-    public function authInfo(): string
-    {
-        if (!$this->hasAuthInfo()) {
-            throw new \LogicException("authInfo not set.");
-        }
-        return $this->_authInfo;
-    }
+	/**
+	 * Get authentication info.
+	 *
+	 * @throws \LogicException
+	 * @return string
+	 */
+	public function authInfo(): string
+	{
+		if (!$this->hasAuthInfo()) {
+			throw new \LogicException("authInfo not set.");
+		}
+		return $this->_authInfo;
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::toASN1()
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $elements = array($this->_service->toASN1(), $this->_ident->toASN1());
-        if (isset($this->_authInfo)) {
-            $elements[] = new OctetString($this->_authInfo);
-        }
-        return new Sequence(...$elements);
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::toASN1()
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$elements = array($this->_service->toASN1(), $this->_ident->toASN1());
+		if (isset($this->_authInfo)) {
+			$elements[] = new OctetString($this->_authInfo);
+		}
+		return new Sequence(...$elements);
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::stringValue()
-     * @return string
-     */
-    public function stringValue(): string
-    {
-        return "#" . bin2hex($this->toASN1()->toDER());
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::stringValue()
+	 * @return string
+	 */
+	public function stringValue(): string
+	{
+		return "#" . bin2hex($this->toASN1()->toDER());
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::equalityMatchingRule()
-     * @return BinaryMatch
-     */
-    public function equalityMatchingRule(): BinaryMatch
-    {
-        return new BinaryMatch();
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::equalityMatchingRule()
+	 * @return BinaryMatch
+	 */
+	public function equalityMatchingRule(): BinaryMatch
+	{
+		return new BinaryMatch();
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::rfc2253String()
-     * @return string
-     */
-    public function rfc2253String(): string
-    {
-        return $this->stringValue();
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::rfc2253String()
+	 * @return string
+	 */
+	public function rfc2253String(): string
+	{
+		return $this->stringValue();
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::_transcodedString()
-     * @return string
-     */
-    protected function _transcodedString(): string
-    {
-        return $this->stringValue();
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::_transcodedString()
+	 * @return string
+	 */
+	protected function _transcodedString(): string
+	{
+		return $this->stringValue();
+	}
 }

lib/X509/AttributeCertificate/Attribute/GroupAttributeValue.php

Indentation +11 added lines, -11 removed lines

@@ -11,16 +11,16 @@
  */
 class GroupAttributeValue extends IetfAttrSyntax
 {
-    const OID = "1.3.6.1.5.5.7.10.4";
+	const OID = "1.3.6.1.5.5.7.10.4";
     
-    /**
-     * Constructor.
-     *
-     * @param IetfAttrValue[] $values
-     */
-    public function __construct(IetfAttrValue ...$values)
-    {
-        parent::__construct(...$values);
-        $this->_oid = self::OID;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param IetfAttrValue[] $values
+	 */
+	public function __construct(IetfAttrValue ...$values)
+	{
+		parent::__construct(...$values);
+		$this->_oid = self::OID;
+	}
 }

lib/X509/AttributeCertificate/Attribute/IetfAttrValue.php

Indentation +144 added lines, -144 removed lines

@@ -17,161 +17,161 @@
  */
 class IetfAttrValue
 {
-    /**
-     * Element type tag.
-     *
-     * @var int $_type
-     */
-    protected $_type;
+	/**
+	 * Element type tag.
+	 *
+	 * @var int $_type
+	 */
+	protected $_type;
     
-    /**
-     * Value.
-     *
-     * @var string $_value
-     */
-    protected $_value;
+	/**
+	 * Value.
+	 *
+	 * @var string $_value
+	 */
+	protected $_value;
     
-    /**
-     * Constructor.
-     *
-     * @param string $value
-     * @param int $type
-     */
-    public function __construct(string $value, int $type)
-    {
-        $this->_type = $type;
-        $this->_value = $value;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $value
+	 * @param int $type
+	 */
+	public function __construct(string $value, int $type)
+	{
+		$this->_type = $type;
+		$this->_value = $value;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param UnspecifiedType $el
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromASN1(UnspecifiedType $el)
-    {
-        switch ($el->tag()) {
-            case Element::TYPE_OCTET_STRING:
-            case Element::TYPE_UTF8_STRING:
-                return new self($el->asString()->string(), $el->tag());
-            case Element::TYPE_OBJECT_IDENTIFIER:
-                return new self($el->asObjectIdentifier()->oid(), $el->tag());
-        }
-        throw new \UnexpectedValueException(
-            "Type " . Element::tagToName($el->tag()) . " not supported.");
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param UnspecifiedType $el
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromASN1(UnspecifiedType $el)
+	{
+		switch ($el->tag()) {
+			case Element::TYPE_OCTET_STRING:
+			case Element::TYPE_UTF8_STRING:
+				return new self($el->asString()->string(), $el->tag());
+			case Element::TYPE_OBJECT_IDENTIFIER:
+				return new self($el->asObjectIdentifier()->oid(), $el->tag());
+		}
+		throw new \UnexpectedValueException(
+			"Type " . Element::tagToName($el->tag()) . " not supported.");
+	}
     
-    /**
-     * Initialize from octet string.
-     *
-     * @param string $octets
-     * @return self
-     */
-    public static function fromOctets(string $octets)
-    {
-        return new self($octets, Element::TYPE_OCTET_STRING);
-    }
+	/**
+	 * Initialize from octet string.
+	 *
+	 * @param string $octets
+	 * @return self
+	 */
+	public static function fromOctets(string $octets)
+	{
+		return new self($octets, Element::TYPE_OCTET_STRING);
+	}
     
-    /**
-     * Initialize from UTF-8 string.
-     *
-     * @param string $str
-     * @return self
-     */
-    public static function fromString(string $str)
-    {
-        return new self($str, Element::TYPE_UTF8_STRING);
-    }
+	/**
+	 * Initialize from UTF-8 string.
+	 *
+	 * @param string $str
+	 * @return self
+	 */
+	public static function fromString(string $str)
+	{
+		return new self($str, Element::TYPE_UTF8_STRING);
+	}
     
-    /**
-     * Initialize from OID.
-     *
-     * @param string $oid
-     * @return self
-     */
-    public static function fromOID(string $oid)
-    {
-        return new self($oid, Element::TYPE_OBJECT_IDENTIFIER);
-    }
+	/**
+	 * Initialize from OID.
+	 *
+	 * @param string $oid
+	 * @return self
+	 */
+	public static function fromOID(string $oid)
+	{
+		return new self($oid, Element::TYPE_OBJECT_IDENTIFIER);
+	}
     
-    /**
-     * Get type tag.
-     *
-     * @return int
-     */
-    public function type(): int
-    {
-        return $this->_type;
-    }
+	/**
+	 * Get type tag.
+	 *
+	 * @return int
+	 */
+	public function type(): int
+	{
+		return $this->_type;
+	}
     
-    /**
-     * Whether value type is octets.
-     *
-     * @return bool
-     */
-    public function isOctets(): bool
-    {
-        return $this->_type === Element::TYPE_OCTET_STRING;
-    }
+	/**
+	 * Whether value type is octets.
+	 *
+	 * @return bool
+	 */
+	public function isOctets(): bool
+	{
+		return $this->_type === Element::TYPE_OCTET_STRING;
+	}
     
-    /**
-     * Whether value type is OID.
-     *
-     * @return bool
-     */
-    public function isOID(): bool
-    {
-        return $this->_type === Element::TYPE_OBJECT_IDENTIFIER;
-    }
+	/**
+	 * Whether value type is OID.
+	 *
+	 * @return bool
+	 */
+	public function isOID(): bool
+	{
+		return $this->_type === Element::TYPE_OBJECT_IDENTIFIER;
+	}
     
-    /**
-     * Whether value type is string.
-     *
-     * @return bool
-     */
-    public function isString(): bool
-    {
-        return $this->_type === Element::TYPE_UTF8_STRING;
-    }
+	/**
+	 * Whether value type is string.
+	 *
+	 * @return bool
+	 */
+	public function isString(): bool
+	{
+		return $this->_type === Element::TYPE_UTF8_STRING;
+	}
     
-    /**
-     * Get value.
-     *
-     * @return string
-     */
-    public function value(): string
-    {
-        return $this->_value;
-    }
+	/**
+	 * Get value.
+	 *
+	 * @return string
+	 */
+	public function value(): string
+	{
+		return $this->_value;
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @throws \LogicException
-     * @return Element
-     */
-    public function toASN1(): Element
-    {
-        switch ($this->_type) {
-            case Element::TYPE_OCTET_STRING:
-                return new OctetString($this->_value);
-            case Element::TYPE_UTF8_STRING:
-                return new UTF8String($this->_value);
-            case Element::TYPE_OBJECT_IDENTIFIER:
-                return new ObjectIdentifier($this->_value);
-        }
-        throw new \LogicException(
-            "Type " . Element::tagToName($this->_type) . " not supported.");
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @throws \LogicException
+	 * @return Element
+	 */
+	public function toASN1(): Element
+	{
+		switch ($this->_type) {
+			case Element::TYPE_OCTET_STRING:
+				return new OctetString($this->_value);
+			case Element::TYPE_UTF8_STRING:
+				return new UTF8String($this->_value);
+			case Element::TYPE_OBJECT_IDENTIFIER:
+				return new ObjectIdentifier($this->_value);
+		}
+		throw new \LogicException(
+			"Type " . Element::tagToName($this->_type) . " not supported.");
+	}
     
-    /**
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->_value;
-    }
+	/**
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->_value;
+	}
 }

lib/X509/AttributeCertificate/Attribute/ChargingIdentityAttributeValue.php

Indentation +11 added lines, -11 removed lines

@@ -11,16 +11,16 @@
  */
 class ChargingIdentityAttributeValue extends IetfAttrSyntax
 {
-    const OID = "1.3.6.1.5.5.7.10.3";
+	const OID = "1.3.6.1.5.5.7.10.3";
     
-    /**
-     * Constructor.
-     *
-     * @param IetfAttrValue[] $values
-     */
-    public function __construct(IetfAttrValue ...$values)
-    {
-        parent::__construct(...$values);
-        $this->_oid = self::OID;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param IetfAttrValue[] $values
+	 */
+	public function __construct(IetfAttrValue ...$values)
+	{
+		parent::__construct(...$values);
+		$this->_oid = self::OID;
+	}
 }