sop / x509

lib/X509/Feature/AttributeContainer.php

Indentation +132 added lines, -132 removed lines

@@ -14,145 +14,145 @@
  */
 trait AttributeContainer
 {
-    /**
-     * Array of attributes.
-     *
-     * @var Attribute[]
-     */
-    protected $_attributes;
+	/**
+	 * Array of attributes.
+	 *
+	 * @var Attribute[]
+	 */
+	protected $_attributes;
 
-    /**
-     * Check whether attribute is present.
-     *
-     * @param string $name OID or attribute name
-     *
-     * @return bool
-     */
-    public function has(string $name): bool
-    {
-        return null !== $this->_findFirst($name);
-    }
+	/**
+	 * Check whether attribute is present.
+	 *
+	 * @param string $name OID or attribute name
+	 *
+	 * @return bool
+	 */
+	public function has(string $name): bool
+	{
+		return null !== $this->_findFirst($name);
+	}
 
-    /**
-     * Get first attribute by OID or attribute name.
-     *
-     * @param string $name OID or attribute name
-     *
-     * @throws \OutOfBoundsException
-     *
-     * @return Attribute
-     */
-    public function firstOf(string $name): Attribute
-    {
-        $attr = $this->_findFirst($name);
-        if (!$attr) {
-            throw new \UnexpectedValueException("No {$name} attribute.");
-        }
-        return $attr;
-    }
+	/**
+	 * Get first attribute by OID or attribute name.
+	 *
+	 * @param string $name OID or attribute name
+	 *
+	 * @throws \OutOfBoundsException
+	 *
+	 * @return Attribute
+	 */
+	public function firstOf(string $name): Attribute
+	{
+		$attr = $this->_findFirst($name);
+		if (!$attr) {
+			throw new \UnexpectedValueException("No {$name} attribute.");
+		}
+		return $attr;
+	}
 
-    /**
-     * Get all attributes of given name.
-     *
-     * @param string $name OID or attribute name
-     *
-     * @return Attribute[]
-     */
-    public function allOf(string $name): array
-    {
-        $oid = AttributeType::attrNameToOID($name);
-        $attrs = array_filter($this->_attributes,
-            function (Attribute $attr) use ($oid) {
-                return $attr->oid() === $oid;
-            });
-        return array_values($attrs);
-    }
+	/**
+	 * Get all attributes of given name.
+	 *
+	 * @param string $name OID or attribute name
+	 *
+	 * @return Attribute[]
+	 */
+	public function allOf(string $name): array
+	{
+		$oid = AttributeType::attrNameToOID($name);
+		$attrs = array_filter($this->_attributes,
+			function (Attribute $attr) use ($oid) {
+				return $attr->oid() === $oid;
+			});
+		return array_values($attrs);
+	}
 
-    /**
-     * Get all attributes.
-     *
-     * @return Attribute[]
-     */
-    public function all(): array
-    {
-        return $this->_attributes;
-    }
+	/**
+	 * Get all attributes.
+	 *
+	 * @return Attribute[]
+	 */
+	public function all(): array
+	{
+		return $this->_attributes;
+	}
 
-    /**
-     * Get self with additional attributes added.
-     *
-     * @param Attribute ...$attribs
-     *
-     * @return self
-     */
-    public function withAdditional(Attribute ...$attribs): self
-    {
-        $obj = clone $this;
-        foreach ($attribs as $attr) {
-            $obj->_attributes[] = $attr;
-        }
-        return $obj;
-    }
+	/**
+	 * Get self with additional attributes added.
+	 *
+	 * @param Attribute ...$attribs
+	 *
+	 * @return self
+	 */
+	public function withAdditional(Attribute ...$attribs): self
+	{
+		$obj = clone $this;
+		foreach ($attribs as $attr) {
+			$obj->_attributes[] = $attr;
+		}
+		return $obj;
+	}
 
-    /**
-     * Get self with single unique attribute added.
-     *
-     * All previous attributes of the same type are removed.
-     *
-     * @param Attribute $attr
-     *
-     * @return self
-     */
-    public function withUnique(Attribute $attr): self
-    {
-        $obj = clone $this;
-        $obj->_attributes = array_filter($obj->_attributes,
-            function (Attribute $a) use ($attr) {
-                return $a->oid() !== $attr->oid();
-            });
-        $obj->_attributes[] = $attr;
-        return $obj;
-    }
+	/**
+	 * Get self with single unique attribute added.
+	 *
+	 * All previous attributes of the same type are removed.
+	 *
+	 * @param Attribute $attr
+	 *
+	 * @return self
+	 */
+	public function withUnique(Attribute $attr): self
+	{
+		$obj = clone $this;
+		$obj->_attributes = array_filter($obj->_attributes,
+			function (Attribute $a) use ($attr) {
+				return $a->oid() !== $attr->oid();
+			});
+		$obj->_attributes[] = $attr;
+		return $obj;
+	}
 
-    /**
-     * Get number of attributes.
-     *
-     * @see \Countable::count()
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_attributes);
-    }
+	/**
+	 * Get number of attributes.
+	 *
+	 * @see \Countable::count()
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_attributes);
+	}
 
-    /**
-     * Get iterator for attributes.
-     *
-     * @see \IteratorAggregate::getIterator()
-     *
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_attributes);
-    }
+	/**
+	 * Get iterator for attributes.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 *
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_attributes);
+	}
 
-    /**
-     * Find first attribute of given name or OID.
-     *
-     * @param string $name
-     *
-     * @return null|Attribute
-     */
-    protected function _findFirst(string $name): ?Attribute
-    {
-        $oid = AttributeType::attrNameToOID($name);
-        foreach ($this->_attributes as $attr) {
-            if ($attr->oid() === $oid) {
-                return $attr;
-            }
-        }
-        return null;
-    }
+	/**
+	 * Find first attribute of given name or OID.
+	 *
+	 * @param string $name
+	 *
+	 * @return null|Attribute
+	 */
+	protected function _findFirst(string $name): ?Attribute
+	{
+		$oid = AttributeType::attrNameToOID($name);
+		foreach ($this->_attributes as $attr) {
+			if ($attr->oid() === $oid) {
+				return $attr;
+			}
+		}
+		return null;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\X509\Feature;
 
@@ -62,7 +62,7 @@ 
     {
         $oid = AttributeType::attrNameToOID($name);
         $attrs = array_filter($this->_attributes,
-            function (Attribute $attr) use ($oid) {
+            function(Attribute $attr) use ($oid) {
                 return $attr->oid() === $oid;
             });
         return array_values($attrs);
@@ -107,7 +107,7 @@ 
     {
         $obj = clone $this;
         $obj->_attributes = array_filter($obj->_attributes,
-            function (Attribute $a) use ($attr) {
+            function(Attribute $a) use ($attr) {
                 return $a->oid() !== $attr->oid();
             });
         $obj->_attributes[] = $attr;

examples/create-csr.php

Indentation +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 
 // load EC private key from PEM
 $private_key_info = PrivateKeyInfo::fromPEM(
-    PEM::fromFile(dirname(__DIR__) . '/test/assets/ec/private_key.pem'));
+	PEM::fromFile(dirname(__DIR__) . '/test/assets/ec/private_key.pem'));
 // extract public key from private key
 $public_key_info = $private_key_info->publicKeyInfo();
 // DN of the subject
@@ -27,6 +27,6 @@ 
 $cri = new CertificationRequestInfo($subject, $public_key_info);
 // sign certificate request with private key
 $algo = SignatureAlgorithmIdentifierFactory::algoForAsymmetricCrypto(
-    $private_key_info->algorithmIdentifier(), new SHA256AlgorithmIdentifier());
+	$private_key_info->algorithmIdentifier(), new SHA256AlgorithmIdentifier());
 $csr = $cri->sign($algo, $private_key_info);
 echo $csr;

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  * php create-csr.php
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Sop\CryptoEncoding\PEM;
 use Sop\CryptoTypes\AlgorithmIdentifier\Hash\SHA256AlgorithmIdentifier;

examples/path-validate.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  * php path-validate.php
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Sop\CryptoEncoding\PEM;
 use Sop\X509\Certificate\Certificate;

examples/ac-example.php

Indentation +68 added lines, -68 removed lines

@@ -38,106 +38,106 @@ 
 
 // CA private key
 openssl_pkey_export(
-    openssl_pkey_new(
-        ['private_key_type' => OPENSSL_KEYTYPE_RSA,
-            'private_key_bits' => 2048, ]), $pkey);
+	openssl_pkey_new(
+		['private_key_type' => OPENSSL_KEYTYPE_RSA,
+			'private_key_bits' => 2048, ]), $pkey);
 $ca_private_key = PrivateKeyInfo::fromPEM(PEM::fromString($pkey));
 // Issuer private key
 openssl_pkey_export(
-    openssl_pkey_new(
-        ['private_key_type' => OPENSSL_KEYTYPE_RSA,
-            'private_key_bits' => 2048, ]), $pkey);
+	openssl_pkey_new(
+		['private_key_type' => OPENSSL_KEYTYPE_RSA,
+			'private_key_bits' => 2048, ]), $pkey);
 $issuer_private_key = PrivateKeyInfo::fromPEM(PEM::fromString($pkey));
 // Holder private key
 openssl_pkey_export(
-    openssl_pkey_new(
-        ['private_key_type' => OPENSSL_KEYTYPE_RSA,
-            'private_key_bits' => 2048, ]), $pkey);
+	openssl_pkey_new(
+		['private_key_type' => OPENSSL_KEYTYPE_RSA,
+			'private_key_bits' => 2048, ]), $pkey);
 $holder_private_key = PrivateKeyInfo::fromPEM(PEM::fromString($pkey));
 
 // create trust anchor certificate (self signed)
 $tbs_cert = new TBSCertificate(
-    Name::fromString('cn=CA'),
-    $ca_private_key->publicKeyInfo(),
-    Name::fromString('cn=CA'),
-    Validity::fromStrings('now', 'now + 1 year'));
+	Name::fromString('cn=CA'),
+	$ca_private_key->publicKeyInfo(),
+	Name::fromString('cn=CA'),
+	Validity::fromStrings('now', 'now + 1 year'));
 $tbs_cert = $tbs_cert->withRandomSerialNumber()
-    ->withAdditionalExtensions(
-        new BasicConstraintsExtension(true, true),
-        new SubjectKeyIdentifierExtension(false,
-            $ca_private_key->publicKeyInfo()->keyIdentifier()),
-        new KeyUsageExtension(true,
-            KeyUsageExtension::DIGITAL_SIGNATURE |
-            KeyUsageExtension::KEY_CERT_SIGN));
+	->withAdditionalExtensions(
+		new BasicConstraintsExtension(true, true),
+		new SubjectKeyIdentifierExtension(false,
+			$ca_private_key->publicKeyInfo()->keyIdentifier()),
+		new KeyUsageExtension(true,
+			KeyUsageExtension::DIGITAL_SIGNATURE |
+			KeyUsageExtension::KEY_CERT_SIGN));
 $algo = SignatureAlgorithmIdentifierFactory::algoForAsymmetricCrypto(
-    $ca_private_key->algorithmIdentifier(),
-    new SHA256AlgorithmIdentifier());
+	$ca_private_key->algorithmIdentifier(),
+	new SHA256AlgorithmIdentifier());
 $ca_cert = $tbs_cert->sign($algo, $ca_private_key);
 
 // create AC issuer certificate
 $tbs_cert = new TBSCertificate(
-    Name::fromString('cn=Issuer'),
-    $issuer_private_key->publicKeyInfo(),
-    new Name(),
-    Validity::fromStrings('now', 'now + 6 months'));
+	Name::fromString('cn=Issuer'),
+	$issuer_private_key->publicKeyInfo(),
+	new Name(),
+	Validity::fromStrings('now', 'now + 6 months'));
 $tbs_cert = $tbs_cert->withIssuerCertificate($ca_cert)
-    ->withRandomSerialNumber()
-    ->withAdditionalExtensions(
-        // issuer must not be a CA
-        new BasicConstraintsExtension(true, false),
-        new KeyUsageExtension(true,
-            KeyUsageExtension::DIGITAL_SIGNATURE |
-             KeyUsageExtension::KEY_ENCIPHERMENT));
+	->withRandomSerialNumber()
+	->withAdditionalExtensions(
+		// issuer must not be a CA
+		new BasicConstraintsExtension(true, false),
+		new KeyUsageExtension(true,
+			KeyUsageExtension::DIGITAL_SIGNATURE |
+			 KeyUsageExtension::KEY_ENCIPHERMENT));
 $algo = SignatureAlgorithmIdentifierFactory::algoForAsymmetricCrypto(
-    $ca_private_key->algorithmIdentifier(),
-    new SHA256AlgorithmIdentifier());
+	$ca_private_key->algorithmIdentifier(),
+	new SHA256AlgorithmIdentifier());
 $issuer_cert = $tbs_cert->sign($algo, $ca_private_key);
 
 // create AC holder certificate
 $tbs_cert = new TBSCertificate(
-    Name::fromString('cn=Holder, gn=John, sn=Doe'),
-    $holder_private_key->publicKeyInfo(),
-    new Name(),
-    Validity::fromStrings('now', 'now + 6 months'));
+	Name::fromString('cn=Holder, gn=John, sn=Doe'),
+	$holder_private_key->publicKeyInfo(),
+	new Name(),
+	Validity::fromStrings('now', 'now + 6 months'));
 $tbs_cert = $tbs_cert->withIssuerCertificate($ca_cert)
-    ->withRandomSerialNumber()
-    ->withAdditionalExtensions(
-        new BasicConstraintsExtension(true, false),
-        new KeyUsageExtension(true,
-            KeyUsageExtension::DIGITAL_SIGNATURE |
-             KeyUsageExtension::KEY_ENCIPHERMENT));
+	->withRandomSerialNumber()
+	->withAdditionalExtensions(
+		new BasicConstraintsExtension(true, false),
+		new KeyUsageExtension(true,
+			KeyUsageExtension::DIGITAL_SIGNATURE |
+			 KeyUsageExtension::KEY_ENCIPHERMENT));
 $algo = SignatureAlgorithmIdentifierFactory::algoForAsymmetricCrypto(
-    $ca_private_key->algorithmIdentifier(),
-    new SHA256AlgorithmIdentifier());
+	$ca_private_key->algorithmIdentifier(),
+	new SHA256AlgorithmIdentifier());
 $holder_cert = $tbs_cert->sign($algo, $ca_private_key);
 
 // named authority that grants the attributes
 $authority = new GeneralNames(
-    new UniformResourceIdentifier('uri:trusted_authority'));
+	new UniformResourceIdentifier('uri:trusted_authority'));
 // role attribute
 $attribs = new Attributes(
-    Attribute::fromAttributeValues(
-        RoleAttributeValue::fromString('role-name', $authority)));
+	Attribute::fromAttributeValues(
+		RoleAttributeValue::fromString('role-name', $authority)));
 $aci = new AttributeCertificateInfo(
-    // holder is identified by the holder's public key certificate
-    new Holder(IssuerSerial::fromPKC($holder_cert)),
-    AttCertIssuer::fromPKC($issuer_cert),
-    AttCertValidityPeriod::fromStrings('now - 1 hour', 'now + 3 months'),
-    $attribs);
+	// holder is identified by the holder's public key certificate
+	new Holder(IssuerSerial::fromPKC($holder_cert)),
+	AttCertIssuer::fromPKC($issuer_cert),
+	AttCertValidityPeriod::fromStrings('now - 1 hour', 'now + 3 months'),
+	$attribs);
 $aci = $aci->withRandomSerialNumber()
-    ->withAdditionalExtensions(
-        // named target identifier
-        TargetInformationExtension::fromTargets(
-            new TargetName(
-                new UniformResourceIdentifier('uri:target_identifier'))),
-        // key identifier of the AC issuer
-        new AuthorityKeyIdentifierExtension(false,
-            $issuer_cert->tbsCertificate()
-                ->subjectPublicKeyInfo()
-                ->keyIdentifier()));
+	->withAdditionalExtensions(
+		// named target identifier
+		TargetInformationExtension::fromTargets(
+			new TargetName(
+				new UniformResourceIdentifier('uri:target_identifier'))),
+		// key identifier of the AC issuer
+		new AuthorityKeyIdentifierExtension(false,
+			$issuer_cert->tbsCertificate()
+				->subjectPublicKeyInfo()
+				->keyIdentifier()));
 $algo = SignatureAlgorithmIdentifierFactory::algoForAsymmetricCrypto(
-    $issuer_private_key->algorithmIdentifier(),
-    new SHA256AlgorithmIdentifier());
+	$issuer_private_key->algorithmIdentifier(),
+	new SHA256AlgorithmIdentifier());
 $ac = $aci->sign($algo, $issuer_private_key);
 
 // validate AC
@@ -149,7 +149,7 @@ 
 $validator_config = $validator_config->withTargets($target);
 $validator = new ACValidator($ac, $validator_config);
 if ($validator->validate()) {
-    fprintf(STDERR, "AC validation succeeded.\n");
+	fprintf(STDERR, "AC validation succeeded.\n");
 }
 
 fprintf(STDERR, "Root certificate:\n");

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  * php ac-example.php
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Sop\CryptoEncoding\PEM;
 use Sop\CryptoTypes\AlgorithmIdentifier\Hash\SHA256AlgorithmIdentifier;

examples/issue-cert.php

Indentation +9 added lines, -9 removed lines

@@ -27,27 +27,27 @@
 $csr = CertificationRequest::fromPEM(PEM::fromFile($argv[2]));
 // verify CSR
 if (!$csr->verify()) {
-    echo "Failed to verify certification request signature.\n";
-    exit(1);
+	echo "Failed to verify certification request signature.\n";
+	exit(1);
 }
 // load CA's private key from PEM
 $private_key_info = PrivateKeyInfo::fromPEM(
-    PEM::fromFile(dirname(__DIR__) . '/test/assets/rsa/private_key.pem'));
+	PEM::fromFile(dirname(__DIR__) . '/test/assets/rsa/private_key.pem'));
 // initialize certificate from CSR and issuer's certificate
 $tbs_cert = TBSCertificate::fromCSR($csr)->withIssuerCertificate($issuer_cert);
 // set random serial number
 $tbs_cert = $tbs_cert->withRandomSerialNumber();
 // set validity period
 $tbs_cert = $tbs_cert->withValidity(
-    Validity::fromStrings('now', 'now + 3 months'));
+	Validity::fromStrings('now', 'now + 3 months'));
 // add extensions
 $tbs_cert = $tbs_cert->withAdditionalExtensions(
-    new KeyUsageExtension(true,
-        KeyUsageExtension::DIGITAL_SIGNATURE |
-             KeyUsageExtension::KEY_ENCIPHERMENT),
-    new BasicConstraintsExtension(true, false));
+	new KeyUsageExtension(true,
+		KeyUsageExtension::DIGITAL_SIGNATURE |
+			 KeyUsageExtension::KEY_ENCIPHERMENT),
+	new BasicConstraintsExtension(true, false));
 // sign certificate with issuer's private key
 $algo = SignatureAlgorithmIdentifierFactory::algoForAsymmetricCrypto(
-    $private_key_info->algorithmIdentifier(), new SHA512AlgorithmIdentifier());
+	$private_key_info->algorithmIdentifier(), new SHA512AlgorithmIdentifier());
 $cert = $tbs_cert->sign($algo, $private_key_info);
 echo $cert;

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  * php issue-cert.php <(php create-ca-cert.php) <(php create-csr.php)
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Sop\CryptoEncoding\PEM;
 use Sop\CryptoTypes\AlgorithmIdentifier\Hash\SHA512AlgorithmIdentifier;

examples/create-ca-cert.php

Indentation +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
 
 // load RSA private key from PEM
 $private_key_info = PrivateKeyInfo::fromPEM(
-    PEM::fromFile(dirname(__DIR__) . '/test/assets/rsa/private_key.pem'));
+	PEM::fromFile(dirname(__DIR__) . '/test/assets/rsa/private_key.pem'));
 // extract public key from private key
 $public_key_info = $private_key_info->publicKeyInfo();
 // DN of the certification authority
@@ -32,12 +32,12 @@ 
 // create "to be signed" certificate object with extensions
 $tbs_cert = new TBSCertificate($name, $public_key_info, $name, $validity);
 $tbs_cert = $tbs_cert->withRandomSerialNumber()->withAdditionalExtensions(
-    new BasicConstraintsExtension(true, true),
-    new SubjectKeyIdentifierExtension(false, $public_key_info->keyIdentifier()),
-    new KeyUsageExtension(true,
-        KeyUsageExtension::DIGITAL_SIGNATURE | KeyUsageExtension::KEY_CERT_SIGN));
+	new BasicConstraintsExtension(true, true),
+	new SubjectKeyIdentifierExtension(false, $public_key_info->keyIdentifier()),
+	new KeyUsageExtension(true,
+		KeyUsageExtension::DIGITAL_SIGNATURE | KeyUsageExtension::KEY_CERT_SIGN));
 // sign certificate with private key
 $algo = SignatureAlgorithmIdentifierFactory::algoForAsymmetricCrypto(
-    $private_key_info->algorithmIdentifier(), new SHA256AlgorithmIdentifier());
+	$private_key_info->algorithmIdentifier(), new SHA256AlgorithmIdentifier());
 $cert = $tbs_cert->sign($algo, $private_key_info);
 echo $cert;

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  * php create-ca-cert.php
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Sop\CryptoEncoding\PEM;
 use Sop\CryptoTypes\AlgorithmIdentifier\Hash\SHA256AlgorithmIdentifier;