@@ -18,137 +18,137 @@ |
||
18 | 18 | */ |
19 | 19 | class V2Form extends AttCertIssuer |
20 | 20 | { |
21 | - /** |
|
22 | - * Issuer name. |
|
23 | - * |
|
24 | - * @var null|GeneralNames |
|
25 | - */ |
|
26 | - protected $_issuerName; |
|
21 | + /** |
|
22 | + * Issuer name. |
|
23 | + * |
|
24 | + * @var null|GeneralNames |
|
25 | + */ |
|
26 | + protected $_issuerName; |
|
27 | 27 | |
28 | - /** |
|
29 | - * Issuer PKC's issuer and serial. |
|
30 | - * |
|
31 | - * @var IssuerSerial |
|
32 | - */ |
|
33 | - protected $_baseCertificateID; |
|
28 | + /** |
|
29 | + * Issuer PKC's issuer and serial. |
|
30 | + * |
|
31 | + * @var IssuerSerial |
|
32 | + */ |
|
33 | + protected $_baseCertificateID; |
|
34 | 34 | |
35 | - /** |
|
36 | - * Linked object. |
|
37 | - * |
|
38 | - * @var ObjectDigestInfo |
|
39 | - */ |
|
40 | - protected $_objectDigestInfo; |
|
35 | + /** |
|
36 | + * Linked object. |
|
37 | + * |
|
38 | + * @var ObjectDigestInfo |
|
39 | + */ |
|
40 | + protected $_objectDigestInfo; |
|
41 | 41 | |
42 | - /** |
|
43 | - * Constructor. |
|
44 | - * |
|
45 | - * @param null|GeneralNames $names |
|
46 | - */ |
|
47 | - public function __construct(?GeneralNames $names = null) |
|
48 | - { |
|
49 | - $this->_issuerName = $names; |
|
50 | - $this->_baseCertificateID = null; |
|
51 | - $this->_objectDigestInfo = null; |
|
52 | - } |
|
42 | + /** |
|
43 | + * Constructor. |
|
44 | + * |
|
45 | + * @param null|GeneralNames $names |
|
46 | + */ |
|
47 | + public function __construct(?GeneralNames $names = null) |
|
48 | + { |
|
49 | + $this->_issuerName = $names; |
|
50 | + $this->_baseCertificateID = null; |
|
51 | + $this->_objectDigestInfo = null; |
|
52 | + } |
|
53 | 53 | |
54 | - /** |
|
55 | - * Initialize from ASN.1. |
|
56 | - * |
|
57 | - * @param Sequence $seq |
|
58 | - * |
|
59 | - * @return self |
|
60 | - */ |
|
61 | - public static function fromV2ASN1(Sequence $seq): self |
|
62 | - { |
|
63 | - $issuer = null; |
|
64 | - $cert_id = null; |
|
65 | - $digest_info = null; |
|
66 | - if ($seq->has(0, Element::TYPE_SEQUENCE)) { |
|
67 | - $issuer = GeneralNames::fromASN1($seq->at(0)->asSequence()); |
|
68 | - } |
|
69 | - if ($seq->hasTagged(0)) { |
|
70 | - $cert_id = IssuerSerial::fromASN1( |
|
71 | - $seq->getTagged(0)->asImplicit(Element::TYPE_SEQUENCE) |
|
72 | - ->asSequence()); |
|
73 | - } |
|
74 | - if ($seq->hasTagged(1)) { |
|
75 | - $digest_info = ObjectDigestInfo::fromASN1( |
|
76 | - $seq->getTagged(1)->asImplicit(Element::TYPE_SEQUENCE) |
|
77 | - ->asSequence()); |
|
78 | - } |
|
79 | - $obj = new self($issuer); |
|
80 | - $obj->_baseCertificateID = $cert_id; |
|
81 | - $obj->_objectDigestInfo = $digest_info; |
|
82 | - return $obj; |
|
83 | - } |
|
54 | + /** |
|
55 | + * Initialize from ASN.1. |
|
56 | + * |
|
57 | + * @param Sequence $seq |
|
58 | + * |
|
59 | + * @return self |
|
60 | + */ |
|
61 | + public static function fromV2ASN1(Sequence $seq): self |
|
62 | + { |
|
63 | + $issuer = null; |
|
64 | + $cert_id = null; |
|
65 | + $digest_info = null; |
|
66 | + if ($seq->has(0, Element::TYPE_SEQUENCE)) { |
|
67 | + $issuer = GeneralNames::fromASN1($seq->at(0)->asSequence()); |
|
68 | + } |
|
69 | + if ($seq->hasTagged(0)) { |
|
70 | + $cert_id = IssuerSerial::fromASN1( |
|
71 | + $seq->getTagged(0)->asImplicit(Element::TYPE_SEQUENCE) |
|
72 | + ->asSequence()); |
|
73 | + } |
|
74 | + if ($seq->hasTagged(1)) { |
|
75 | + $digest_info = ObjectDigestInfo::fromASN1( |
|
76 | + $seq->getTagged(1)->asImplicit(Element::TYPE_SEQUENCE) |
|
77 | + ->asSequence()); |
|
78 | + } |
|
79 | + $obj = new self($issuer); |
|
80 | + $obj->_baseCertificateID = $cert_id; |
|
81 | + $obj->_objectDigestInfo = $digest_info; |
|
82 | + return $obj; |
|
83 | + } |
|
84 | 84 | |
85 | - /** |
|
86 | - * Check whether issuer name is set. |
|
87 | - * |
|
88 | - * @return bool |
|
89 | - */ |
|
90 | - public function hasIssuerName(): bool |
|
91 | - { |
|
92 | - return isset($this->_issuerName); |
|
93 | - } |
|
85 | + /** |
|
86 | + * Check whether issuer name is set. |
|
87 | + * |
|
88 | + * @return bool |
|
89 | + */ |
|
90 | + public function hasIssuerName(): bool |
|
91 | + { |
|
92 | + return isset($this->_issuerName); |
|
93 | + } |
|
94 | 94 | |
95 | - /** |
|
96 | - * Get issuer name. |
|
97 | - * |
|
98 | - * @throws \LogicException If not set |
|
99 | - * |
|
100 | - * @return GeneralNames |
|
101 | - */ |
|
102 | - public function issuerName(): GeneralNames |
|
103 | - { |
|
104 | - if (!$this->hasIssuerName()) { |
|
105 | - throw new \LogicException('issuerName not set.'); |
|
106 | - } |
|
107 | - return $this->_issuerName; |
|
108 | - } |
|
95 | + /** |
|
96 | + * Get issuer name. |
|
97 | + * |
|
98 | + * @throws \LogicException If not set |
|
99 | + * |
|
100 | + * @return GeneralNames |
|
101 | + */ |
|
102 | + public function issuerName(): GeneralNames |
|
103 | + { |
|
104 | + if (!$this->hasIssuerName()) { |
|
105 | + throw new \LogicException('issuerName not set.'); |
|
106 | + } |
|
107 | + return $this->_issuerName; |
|
108 | + } |
|
109 | 109 | |
110 | - /** |
|
111 | - * Get DN of the issuer. |
|
112 | - * |
|
113 | - * This is a convenience method conforming to RFC 5755, which states |
|
114 | - * that Issuer must contain only one non-empty distinguished name. |
|
115 | - * |
|
116 | - * @return Name |
|
117 | - */ |
|
118 | - public function name(): Name |
|
119 | - { |
|
120 | - return $this->issuerName()->firstDN(); |
|
121 | - } |
|
110 | + /** |
|
111 | + * Get DN of the issuer. |
|
112 | + * |
|
113 | + * This is a convenience method conforming to RFC 5755, which states |
|
114 | + * that Issuer must contain only one non-empty distinguished name. |
|
115 | + * |
|
116 | + * @return Name |
|
117 | + */ |
|
118 | + public function name(): Name |
|
119 | + { |
|
120 | + return $this->issuerName()->firstDN(); |
|
121 | + } |
|
122 | 122 | |
123 | - /** |
|
124 | - * {@inheritdoc} |
|
125 | - */ |
|
126 | - public function toASN1(): Element |
|
127 | - { |
|
128 | - $elements = []; |
|
129 | - if (isset($this->_issuerName)) { |
|
130 | - $elements[] = $this->_issuerName->toASN1(); |
|
131 | - } |
|
132 | - if (isset($this->_baseCertificateID)) { |
|
133 | - $elements[] = new ImplicitlyTaggedType(0, |
|
134 | - $this->_baseCertificateID->toASN1()); |
|
135 | - } |
|
136 | - if (isset($this->_objectDigestInfo)) { |
|
137 | - $elements[] = new ImplicitlyTaggedType(1, |
|
138 | - $this->_objectDigestInfo->toASN1()); |
|
139 | - } |
|
140 | - return new ImplicitlyTaggedType(0, new Sequence(...$elements)); |
|
141 | - } |
|
123 | + /** |
|
124 | + * {@inheritdoc} |
|
125 | + */ |
|
126 | + public function toASN1(): Element |
|
127 | + { |
|
128 | + $elements = []; |
|
129 | + if (isset($this->_issuerName)) { |
|
130 | + $elements[] = $this->_issuerName->toASN1(); |
|
131 | + } |
|
132 | + if (isset($this->_baseCertificateID)) { |
|
133 | + $elements[] = new ImplicitlyTaggedType(0, |
|
134 | + $this->_baseCertificateID->toASN1()); |
|
135 | + } |
|
136 | + if (isset($this->_objectDigestInfo)) { |
|
137 | + $elements[] = new ImplicitlyTaggedType(1, |
|
138 | + $this->_objectDigestInfo->toASN1()); |
|
139 | + } |
|
140 | + return new ImplicitlyTaggedType(0, new Sequence(...$elements)); |
|
141 | + } |
|
142 | 142 | |
143 | - /** |
|
144 | - * {@inheritdoc} |
|
145 | - */ |
|
146 | - public function identifiesPKC(Certificate $cert): bool |
|
147 | - { |
|
148 | - $name = $this->_issuerName->firstDN(); |
|
149 | - if (!$cert->tbsCertificate()->subject()->equals($name)) { |
|
150 | - return false; |
|
151 | - } |
|
152 | - return true; |
|
153 | - } |
|
143 | + /** |
|
144 | + * {@inheritdoc} |
|
145 | + */ |
|
146 | + public function identifiesPKC(Certificate $cert): bool |
|
147 | + { |
|
148 | + $name = $this->_issuerName->firstDN(); |
|
149 | + if (!$cert->tbsCertificate()->subject()->equals($name)) { |
|
150 | + return false; |
|
151 | + } |
|
152 | + return true; |
|
153 | + } |
|
154 | 154 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types = 1); |
|
3 | +declare(strict_types=1); |
|
4 | 4 | |
5 | 5 | namespace Sop\X509\AttributeCertificate; |
6 | 6 |
@@ -15,93 +15,93 @@ |
||
15 | 15 | */ |
16 | 16 | class AttCertValidityPeriod |
17 | 17 | { |
18 | - use DateTimeHelper; |
|
18 | + use DateTimeHelper; |
|
19 | 19 | |
20 | - /** |
|
21 | - * Not before time. |
|
22 | - * |
|
23 | - * @var \DateTimeImmutable |
|
24 | - */ |
|
25 | - protected $_notBeforeTime; |
|
20 | + /** |
|
21 | + * Not before time. |
|
22 | + * |
|
23 | + * @var \DateTimeImmutable |
|
24 | + */ |
|
25 | + protected $_notBeforeTime; |
|
26 | 26 | |
27 | - /** |
|
28 | - * Not after time. |
|
29 | - * |
|
30 | - * @var \DateTimeImmutable |
|
31 | - */ |
|
32 | - protected $_notAfterTime; |
|
27 | + /** |
|
28 | + * Not after time. |
|
29 | + * |
|
30 | + * @var \DateTimeImmutable |
|
31 | + */ |
|
32 | + protected $_notAfterTime; |
|
33 | 33 | |
34 | - /** |
|
35 | - * Constructor. |
|
36 | - * |
|
37 | - * @param \DateTimeImmutable $nb |
|
38 | - * @param \DateTimeImmutable $na |
|
39 | - */ |
|
40 | - public function __construct(\DateTimeImmutable $nb, \DateTimeImmutable $na) |
|
41 | - { |
|
42 | - $this->_notBeforeTime = $nb; |
|
43 | - $this->_notAfterTime = $na; |
|
44 | - } |
|
34 | + /** |
|
35 | + * Constructor. |
|
36 | + * |
|
37 | + * @param \DateTimeImmutable $nb |
|
38 | + * @param \DateTimeImmutable $na |
|
39 | + */ |
|
40 | + public function __construct(\DateTimeImmutable $nb, \DateTimeImmutable $na) |
|
41 | + { |
|
42 | + $this->_notBeforeTime = $nb; |
|
43 | + $this->_notAfterTime = $na; |
|
44 | + } |
|
45 | 45 | |
46 | - /** |
|
47 | - * Initialize from ASN.1. |
|
48 | - * |
|
49 | - * @param Sequence $seq |
|
50 | - * |
|
51 | - * @return self |
|
52 | - */ |
|
53 | - public static function fromASN1(Sequence $seq): self |
|
54 | - { |
|
55 | - $nb = $seq->at(0)->asGeneralizedTime()->dateTime(); |
|
56 | - $na = $seq->at(1)->asGeneralizedTime()->dateTime(); |
|
57 | - return new self($nb, $na); |
|
58 | - } |
|
46 | + /** |
|
47 | + * Initialize from ASN.1. |
|
48 | + * |
|
49 | + * @param Sequence $seq |
|
50 | + * |
|
51 | + * @return self |
|
52 | + */ |
|
53 | + public static function fromASN1(Sequence $seq): self |
|
54 | + { |
|
55 | + $nb = $seq->at(0)->asGeneralizedTime()->dateTime(); |
|
56 | + $na = $seq->at(1)->asGeneralizedTime()->dateTime(); |
|
57 | + return new self($nb, $na); |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * Initialize from date strings. |
|
62 | - * |
|
63 | - * @param null|string $nb_date Not before date |
|
64 | - * @param null|string $na_date Not after date |
|
65 | - * @param null|string $tz Timezone string |
|
66 | - * |
|
67 | - * @return self |
|
68 | - */ |
|
69 | - public static function fromStrings(?string $nb_date, ?string $na_date, |
|
70 | - ?string $tz = null): self |
|
71 | - { |
|
72 | - $nb = self::_createDateTime($nb_date, $tz); |
|
73 | - $na = self::_createDateTime($na_date, $tz); |
|
74 | - return new self($nb, $na); |
|
75 | - } |
|
60 | + /** |
|
61 | + * Initialize from date strings. |
|
62 | + * |
|
63 | + * @param null|string $nb_date Not before date |
|
64 | + * @param null|string $na_date Not after date |
|
65 | + * @param null|string $tz Timezone string |
|
66 | + * |
|
67 | + * @return self |
|
68 | + */ |
|
69 | + public static function fromStrings(?string $nb_date, ?string $na_date, |
|
70 | + ?string $tz = null): self |
|
71 | + { |
|
72 | + $nb = self::_createDateTime($nb_date, $tz); |
|
73 | + $na = self::_createDateTime($na_date, $tz); |
|
74 | + return new self($nb, $na); |
|
75 | + } |
|
76 | 76 | |
77 | - /** |
|
78 | - * Get not before time. |
|
79 | - * |
|
80 | - * @return \DateTimeImmutable |
|
81 | - */ |
|
82 | - public function notBeforeTime(): \DateTimeImmutable |
|
83 | - { |
|
84 | - return $this->_notBeforeTime; |
|
85 | - } |
|
77 | + /** |
|
78 | + * Get not before time. |
|
79 | + * |
|
80 | + * @return \DateTimeImmutable |
|
81 | + */ |
|
82 | + public function notBeforeTime(): \DateTimeImmutable |
|
83 | + { |
|
84 | + return $this->_notBeforeTime; |
|
85 | + } |
|
86 | 86 | |
87 | - /** |
|
88 | - * Get not after time. |
|
89 | - * |
|
90 | - * @return \DateTimeImmutable |
|
91 | - */ |
|
92 | - public function notAfterTime(): \DateTimeImmutable |
|
93 | - { |
|
94 | - return $this->_notAfterTime; |
|
95 | - } |
|
87 | + /** |
|
88 | + * Get not after time. |
|
89 | + * |
|
90 | + * @return \DateTimeImmutable |
|
91 | + */ |
|
92 | + public function notAfterTime(): \DateTimeImmutable |
|
93 | + { |
|
94 | + return $this->_notAfterTime; |
|
95 | + } |
|
96 | 96 | |
97 | - /** |
|
98 | - * Generate ASN.1 structure. |
|
99 | - * |
|
100 | - * @return Sequence |
|
101 | - */ |
|
102 | - public function toASN1(): Sequence |
|
103 | - { |
|
104 | - return new Sequence(new GeneralizedTime($this->_notBeforeTime), |
|
105 | - new GeneralizedTime($this->_notAfterTime)); |
|
106 | - } |
|
97 | + /** |
|
98 | + * Generate ASN.1 structure. |
|
99 | + * |
|
100 | + * @return Sequence |
|
101 | + */ |
|
102 | + public function toASN1(): Sequence |
|
103 | + { |
|
104 | + return new Sequence(new GeneralizedTime($this->_notBeforeTime), |
|
105 | + new GeneralizedTime($this->_notAfterTime)); |
|
106 | + } |
|
107 | 107 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types = 1); |
|
3 | +declare(strict_types=1); |
|
4 | 4 | |
5 | 5 | namespace Sop\X509\AttributeCertificate; |
6 | 6 |
@@ -19,175 +19,175 @@ |
||
19 | 19 | */ |
20 | 20 | class CertificationRequest |
21 | 21 | { |
22 | - /** |
|
23 | - * Certification request info. |
|
24 | - * |
|
25 | - * @var CertificationRequestInfo |
|
26 | - */ |
|
27 | - protected $_certificationRequestInfo; |
|
28 | - |
|
29 | - /** |
|
30 | - * Signature algorithm. |
|
31 | - * |
|
32 | - * @var SignatureAlgorithmIdentifier |
|
33 | - */ |
|
34 | - protected $_signatureAlgorithm; |
|
35 | - |
|
36 | - /** |
|
37 | - * Signature. |
|
38 | - * |
|
39 | - * @var Signature |
|
40 | - */ |
|
41 | - protected $_signature; |
|
42 | - |
|
43 | - /** |
|
44 | - * Constructor. |
|
45 | - * |
|
46 | - * @param CertificationRequestInfo $info |
|
47 | - * @param SignatureAlgorithmIdentifier $algo |
|
48 | - * @param Signature $signature |
|
49 | - */ |
|
50 | - public function __construct(CertificationRequestInfo $info, |
|
51 | - SignatureAlgorithmIdentifier $algo, Signature $signature) |
|
52 | - { |
|
53 | - $this->_certificationRequestInfo = $info; |
|
54 | - $this->_signatureAlgorithm = $algo; |
|
55 | - $this->_signature = $signature; |
|
56 | - } |
|
57 | - |
|
58 | - /** |
|
59 | - * Get certification request as a PEM formatted string. |
|
60 | - * |
|
61 | - * @return string |
|
62 | - */ |
|
63 | - public function __toString(): string |
|
64 | - { |
|
65 | - return $this->toPEM()->string(); |
|
66 | - } |
|
67 | - |
|
68 | - /** |
|
69 | - * Initialize from ASN.1. |
|
70 | - * |
|
71 | - * @param Sequence $seq |
|
72 | - * |
|
73 | - * @return self |
|
74 | - */ |
|
75 | - public static function fromASN1(Sequence $seq): self |
|
76 | - { |
|
77 | - $info = CertificationRequestInfo::fromASN1($seq->at(0)->asSequence()); |
|
78 | - $algo = AlgorithmIdentifier::fromASN1($seq->at(1)->asSequence()); |
|
79 | - if (!$algo instanceof SignatureAlgorithmIdentifier) { |
|
80 | - throw new \UnexpectedValueException( |
|
81 | - 'Unsupported signature algorithm ' . $algo->oid() . '.'); |
|
82 | - } |
|
83 | - $signature = Signature::fromSignatureData( |
|
84 | - $seq->at(2)->asBitString()->string(), $algo); |
|
85 | - return new self($info, $algo, $signature); |
|
86 | - } |
|
87 | - |
|
88 | - /** |
|
89 | - * Initialize from DER. |
|
90 | - * |
|
91 | - * @param string $data |
|
92 | - * |
|
93 | - * @return self |
|
94 | - */ |
|
95 | - public static function fromDER(string $data): self |
|
96 | - { |
|
97 | - return self::fromASN1(UnspecifiedType::fromDER($data)->asSequence()); |
|
98 | - } |
|
99 | - |
|
100 | - /** |
|
101 | - * Initialize from PEM. |
|
102 | - * |
|
103 | - * @param PEM $pem |
|
104 | - * |
|
105 | - * @throws \UnexpectedValueException |
|
106 | - * |
|
107 | - * @return self |
|
108 | - */ |
|
109 | - public static function fromPEM(PEM $pem): self |
|
110 | - { |
|
111 | - if (PEM::TYPE_CERTIFICATE_REQUEST !== $pem->type()) { |
|
112 | - throw new \UnexpectedValueException('Invalid PEM type.'); |
|
113 | - } |
|
114 | - return self::fromDER($pem->data()); |
|
115 | - } |
|
116 | - |
|
117 | - /** |
|
118 | - * Get certification request info. |
|
119 | - * |
|
120 | - * @return CertificationRequestInfo |
|
121 | - */ |
|
122 | - public function certificationRequestInfo(): CertificationRequestInfo |
|
123 | - { |
|
124 | - return $this->_certificationRequestInfo; |
|
125 | - } |
|
126 | - |
|
127 | - /** |
|
128 | - * Get signature algorithm. |
|
129 | - * |
|
130 | - * @return SignatureAlgorithmIdentifier |
|
131 | - */ |
|
132 | - public function signatureAlgorithm(): SignatureAlgorithmIdentifier |
|
133 | - { |
|
134 | - return $this->_signatureAlgorithm; |
|
135 | - } |
|
136 | - |
|
137 | - /** |
|
138 | - * Get signature. |
|
139 | - * |
|
140 | - * @return Signature |
|
141 | - */ |
|
142 | - public function signature(): Signature |
|
143 | - { |
|
144 | - return $this->_signature; |
|
145 | - } |
|
146 | - |
|
147 | - /** |
|
148 | - * Generate ASN.1 structure. |
|
149 | - * |
|
150 | - * @return Sequence |
|
151 | - */ |
|
152 | - public function toASN1(): Sequence |
|
153 | - { |
|
154 | - return new Sequence($this->_certificationRequestInfo->toASN1(), |
|
155 | - $this->_signatureAlgorithm->toASN1(), $this->_signature->bitString()); |
|
156 | - } |
|
157 | - |
|
158 | - /** |
|
159 | - * Get certification request as a DER. |
|
160 | - * |
|
161 | - * @return string |
|
162 | - */ |
|
163 | - public function toDER(): string |
|
164 | - { |
|
165 | - return $this->toASN1()->toDER(); |
|
166 | - } |
|
167 | - |
|
168 | - /** |
|
169 | - * Get certification request as a PEM. |
|
170 | - * |
|
171 | - * @return PEM |
|
172 | - */ |
|
173 | - public function toPEM(): PEM |
|
174 | - { |
|
175 | - return new PEM(PEM::TYPE_CERTIFICATE_REQUEST, $this->toDER()); |
|
176 | - } |
|
177 | - |
|
178 | - /** |
|
179 | - * Verify certification request signature. |
|
180 | - * |
|
181 | - * @param null|Crypto $crypto Crypto engine, use default if not set |
|
182 | - * |
|
183 | - * @return bool True if signature matches |
|
184 | - */ |
|
185 | - public function verify(?Crypto $crypto = null): bool |
|
186 | - { |
|
187 | - $crypto = $crypto ?? Crypto::getDefault(); |
|
188 | - $data = $this->_certificationRequestInfo->toASN1()->toDER(); |
|
189 | - $pk_info = $this->_certificationRequestInfo->subjectPKInfo(); |
|
190 | - return $crypto->verify($data, $this->_signature, $pk_info, |
|
191 | - $this->_signatureAlgorithm); |
|
192 | - } |
|
22 | + /** |
|
23 | + * Certification request info. |
|
24 | + * |
|
25 | + * @var CertificationRequestInfo |
|
26 | + */ |
|
27 | + protected $_certificationRequestInfo; |
|
28 | + |
|
29 | + /** |
|
30 | + * Signature algorithm. |
|
31 | + * |
|
32 | + * @var SignatureAlgorithmIdentifier |
|
33 | + */ |
|
34 | + protected $_signatureAlgorithm; |
|
35 | + |
|
36 | + /** |
|
37 | + * Signature. |
|
38 | + * |
|
39 | + * @var Signature |
|
40 | + */ |
|
41 | + protected $_signature; |
|
42 | + |
|
43 | + /** |
|
44 | + * Constructor. |
|
45 | + * |
|
46 | + * @param CertificationRequestInfo $info |
|
47 | + * @param SignatureAlgorithmIdentifier $algo |
|
48 | + * @param Signature $signature |
|
49 | + */ |
|
50 | + public function __construct(CertificationRequestInfo $info, |
|
51 | + SignatureAlgorithmIdentifier $algo, Signature $signature) |
|
52 | + { |
|
53 | + $this->_certificationRequestInfo = $info; |
|
54 | + $this->_signatureAlgorithm = $algo; |
|
55 | + $this->_signature = $signature; |
|
56 | + } |
|
57 | + |
|
58 | + /** |
|
59 | + * Get certification request as a PEM formatted string. |
|
60 | + * |
|
61 | + * @return string |
|
62 | + */ |
|
63 | + public function __toString(): string |
|
64 | + { |
|
65 | + return $this->toPEM()->string(); |
|
66 | + } |
|
67 | + |
|
68 | + /** |
|
69 | + * Initialize from ASN.1. |
|
70 | + * |
|
71 | + * @param Sequence $seq |
|
72 | + * |
|
73 | + * @return self |
|
74 | + */ |
|
75 | + public static function fromASN1(Sequence $seq): self |
|
76 | + { |
|
77 | + $info = CertificationRequestInfo::fromASN1($seq->at(0)->asSequence()); |
|
78 | + $algo = AlgorithmIdentifier::fromASN1($seq->at(1)->asSequence()); |
|
79 | + if (!$algo instanceof SignatureAlgorithmIdentifier) { |
|
80 | + throw new \UnexpectedValueException( |
|
81 | + 'Unsupported signature algorithm ' . $algo->oid() . '.'); |
|
82 | + } |
|
83 | + $signature = Signature::fromSignatureData( |
|
84 | + $seq->at(2)->asBitString()->string(), $algo); |
|
85 | + return new self($info, $algo, $signature); |
|
86 | + } |
|
87 | + |
|
88 | + /** |
|
89 | + * Initialize from DER. |
|
90 | + * |
|
91 | + * @param string $data |
|
92 | + * |
|
93 | + * @return self |
|
94 | + */ |
|
95 | + public static function fromDER(string $data): self |
|
96 | + { |
|
97 | + return self::fromASN1(UnspecifiedType::fromDER($data)->asSequence()); |
|
98 | + } |
|
99 | + |
|
100 | + /** |
|
101 | + * Initialize from PEM. |
|
102 | + * |
|
103 | + * @param PEM $pem |
|
104 | + * |
|
105 | + * @throws \UnexpectedValueException |
|
106 | + * |
|
107 | + * @return self |
|
108 | + */ |
|
109 | + public static function fromPEM(PEM $pem): self |
|
110 | + { |
|
111 | + if (PEM::TYPE_CERTIFICATE_REQUEST !== $pem->type()) { |
|
112 | + throw new \UnexpectedValueException('Invalid PEM type.'); |
|
113 | + } |
|
114 | + return self::fromDER($pem->data()); |
|
115 | + } |
|
116 | + |
|
117 | + /** |
|
118 | + * Get certification request info. |
|
119 | + * |
|
120 | + * @return CertificationRequestInfo |
|
121 | + */ |
|
122 | + public function certificationRequestInfo(): CertificationRequestInfo |
|
123 | + { |
|
124 | + return $this->_certificationRequestInfo; |
|
125 | + } |
|
126 | + |
|
127 | + /** |
|
128 | + * Get signature algorithm. |
|
129 | + * |
|
130 | + * @return SignatureAlgorithmIdentifier |
|
131 | + */ |
|
132 | + public function signatureAlgorithm(): SignatureAlgorithmIdentifier |
|
133 | + { |
|
134 | + return $this->_signatureAlgorithm; |
|
135 | + } |
|
136 | + |
|
137 | + /** |
|
138 | + * Get signature. |
|
139 | + * |
|
140 | + * @return Signature |
|
141 | + */ |
|
142 | + public function signature(): Signature |
|
143 | + { |
|
144 | + return $this->_signature; |
|
145 | + } |
|
146 | + |
|
147 | + /** |
|
148 | + * Generate ASN.1 structure. |
|
149 | + * |
|
150 | + * @return Sequence |
|
151 | + */ |
|
152 | + public function toASN1(): Sequence |
|
153 | + { |
|
154 | + return new Sequence($this->_certificationRequestInfo->toASN1(), |
|
155 | + $this->_signatureAlgorithm->toASN1(), $this->_signature->bitString()); |
|
156 | + } |
|
157 | + |
|
158 | + /** |
|
159 | + * Get certification request as a DER. |
|
160 | + * |
|
161 | + * @return string |
|
162 | + */ |
|
163 | + public function toDER(): string |
|
164 | + { |
|
165 | + return $this->toASN1()->toDER(); |
|
166 | + } |
|
167 | + |
|
168 | + /** |
|
169 | + * Get certification request as a PEM. |
|
170 | + * |
|
171 | + * @return PEM |
|
172 | + */ |
|
173 | + public function toPEM(): PEM |
|
174 | + { |
|
175 | + return new PEM(PEM::TYPE_CERTIFICATE_REQUEST, $this->toDER()); |
|
176 | + } |
|
177 | + |
|
178 | + /** |
|
179 | + * Verify certification request signature. |
|
180 | + * |
|
181 | + * @param null|Crypto $crypto Crypto engine, use default if not set |
|
182 | + * |
|
183 | + * @return bool True if signature matches |
|
184 | + */ |
|
185 | + public function verify(?Crypto $crypto = null): bool |
|
186 | + { |
|
187 | + $crypto = $crypto ?? Crypto::getDefault(); |
|
188 | + $data = $this->_certificationRequestInfo->toASN1()->toDER(); |
|
189 | + $pk_info = $this->_certificationRequestInfo->subjectPKInfo(); |
|
190 | + return $crypto->verify($data, $this->_signature, $pk_info, |
|
191 | + $this->_signatureAlgorithm); |
|
192 | + } |
|
193 | 193 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types = 1); |
|
3 | +declare(strict_types=1); |
|
4 | 4 | |
5 | 5 | namespace Sop\X509\CertificationRequest; |
6 | 6 |
@@ -18,83 +18,83 @@ |
||
18 | 18 | */ |
19 | 19 | class ExtensionRequestValue extends AttributeValue |
20 | 20 | { |
21 | - const OID = '1.2.840.113549.1.9.14'; |
|
21 | + const OID = '1.2.840.113549.1.9.14'; |
|
22 | 22 | |
23 | - /** |
|
24 | - * Extensions. |
|
25 | - * |
|
26 | - * @var Extensions |
|
27 | - */ |
|
28 | - protected $_extensions; |
|
23 | + /** |
|
24 | + * Extensions. |
|
25 | + * |
|
26 | + * @var Extensions |
|
27 | + */ |
|
28 | + protected $_extensions; |
|
29 | 29 | |
30 | - /** |
|
31 | - * Constructor. |
|
32 | - * |
|
33 | - * @param Extensions $extensions |
|
34 | - */ |
|
35 | - public function __construct(Extensions $extensions) |
|
36 | - { |
|
37 | - $this->_extensions = $extensions; |
|
38 | - $this->_oid = self::OID; |
|
39 | - } |
|
30 | + /** |
|
31 | + * Constructor. |
|
32 | + * |
|
33 | + * @param Extensions $extensions |
|
34 | + */ |
|
35 | + public function __construct(Extensions $extensions) |
|
36 | + { |
|
37 | + $this->_extensions = $extensions; |
|
38 | + $this->_oid = self::OID; |
|
39 | + } |
|
40 | 40 | |
41 | - /** |
|
42 | - * {@inheritdoc} |
|
43 | - * |
|
44 | - * @return self |
|
45 | - */ |
|
46 | - public static function fromASN1(UnspecifiedType $el): AttributeValue |
|
47 | - { |
|
48 | - return new self(Extensions::fromASN1($el->asSequence())); |
|
49 | - } |
|
41 | + /** |
|
42 | + * {@inheritdoc} |
|
43 | + * |
|
44 | + * @return self |
|
45 | + */ |
|
46 | + public static function fromASN1(UnspecifiedType $el): AttributeValue |
|
47 | + { |
|
48 | + return new self(Extensions::fromASN1($el->asSequence())); |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * Get requested extensions. |
|
53 | - * |
|
54 | - * @return Extensions |
|
55 | - */ |
|
56 | - public function extensions(): Extensions |
|
57 | - { |
|
58 | - return $this->_extensions; |
|
59 | - } |
|
51 | + /** |
|
52 | + * Get requested extensions. |
|
53 | + * |
|
54 | + * @return Extensions |
|
55 | + */ |
|
56 | + public function extensions(): Extensions |
|
57 | + { |
|
58 | + return $this->_extensions; |
|
59 | + } |
|
60 | 60 | |
61 | - /** |
|
62 | - * {@inheritdoc} |
|
63 | - */ |
|
64 | - public function toASN1(): Element |
|
65 | - { |
|
66 | - return $this->_extensions->toASN1(); |
|
67 | - } |
|
61 | + /** |
|
62 | + * {@inheritdoc} |
|
63 | + */ |
|
64 | + public function toASN1(): Element |
|
65 | + { |
|
66 | + return $this->_extensions->toASN1(); |
|
67 | + } |
|
68 | 68 | |
69 | - /** |
|
70 | - * {@inheritdoc} |
|
71 | - */ |
|
72 | - public function stringValue(): string |
|
73 | - { |
|
74 | - return '#' . bin2hex($this->toASN1()->toDER()); |
|
75 | - } |
|
69 | + /** |
|
70 | + * {@inheritdoc} |
|
71 | + */ |
|
72 | + public function stringValue(): string |
|
73 | + { |
|
74 | + return '#' . bin2hex($this->toASN1()->toDER()); |
|
75 | + } |
|
76 | 76 | |
77 | - /** |
|
78 | - * {@inheritdoc} |
|
79 | - */ |
|
80 | - public function equalityMatchingRule(): MatchingRule |
|
81 | - { |
|
82 | - return new BinaryMatch(); |
|
83 | - } |
|
77 | + /** |
|
78 | + * {@inheritdoc} |
|
79 | + */ |
|
80 | + public function equalityMatchingRule(): MatchingRule |
|
81 | + { |
|
82 | + return new BinaryMatch(); |
|
83 | + } |
|
84 | 84 | |
85 | - /** |
|
86 | - * {@inheritdoc} |
|
87 | - */ |
|
88 | - public function rfc2253String(): string |
|
89 | - { |
|
90 | - return $this->stringValue(); |
|
91 | - } |
|
85 | + /** |
|
86 | + * {@inheritdoc} |
|
87 | + */ |
|
88 | + public function rfc2253String(): string |
|
89 | + { |
|
90 | + return $this->stringValue(); |
|
91 | + } |
|
92 | 92 | |
93 | - /** |
|
94 | - * {@inheritdoc} |
|
95 | - */ |
|
96 | - protected function _transcodedString(): string |
|
97 | - { |
|
98 | - return $this->stringValue(); |
|
99 | - } |
|
93 | + /** |
|
94 | + * {@inheritdoc} |
|
95 | + */ |
|
96 | + protected function _transcodedString(): string |
|
97 | + { |
|
98 | + return $this->stringValue(); |
|
99 | + } |
|
100 | 100 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types = 1); |
|
3 | +declare(strict_types=1); |
|
4 | 4 | |
5 | 5 | namespace Sop\X509\CertificationRequest\Attribute; |
6 | 6 |
@@ -20,108 +20,108 @@ |
||
20 | 20 | */ |
21 | 21 | class Attributes implements \Countable, \IteratorAggregate |
22 | 22 | { |
23 | - use AttributeContainer; |
|
23 | + use AttributeContainer; |
|
24 | 24 | |
25 | - /** |
|
26 | - * Mapping from OID to attribute value class name. |
|
27 | - * |
|
28 | - * @internal |
|
29 | - * |
|
30 | - * @var array |
|
31 | - */ |
|
32 | - const MAP_OID_TO_CLASS = [ |
|
33 | - ExtensionRequestValue::OID => ExtensionRequestValue::class, |
|
34 | - ]; |
|
25 | + /** |
|
26 | + * Mapping from OID to attribute value class name. |
|
27 | + * |
|
28 | + * @internal |
|
29 | + * |
|
30 | + * @var array |
|
31 | + */ |
|
32 | + const MAP_OID_TO_CLASS = [ |
|
33 | + ExtensionRequestValue::OID => ExtensionRequestValue::class, |
|
34 | + ]; |
|
35 | 35 | |
36 | - /** |
|
37 | - * Constructor. |
|
38 | - * |
|
39 | - * @param Attribute ...$attribs Attribute objects |
|
40 | - */ |
|
41 | - public function __construct(Attribute ...$attribs) |
|
42 | - { |
|
43 | - $this->_attributes = $attribs; |
|
44 | - } |
|
36 | + /** |
|
37 | + * Constructor. |
|
38 | + * |
|
39 | + * @param Attribute ...$attribs Attribute objects |
|
40 | + */ |
|
41 | + public function __construct(Attribute ...$attribs) |
|
42 | + { |
|
43 | + $this->_attributes = $attribs; |
|
44 | + } |
|
45 | 45 | |
46 | - /** |
|
47 | - * Initialize from attribute values. |
|
48 | - * |
|
49 | - * @param AttributeValue ...$values |
|
50 | - * |
|
51 | - * @return self |
|
52 | - */ |
|
53 | - public static function fromAttributeValues(AttributeValue ...$values): Attributes |
|
54 | - { |
|
55 | - $attribs = array_map( |
|
56 | - function (AttributeValue $value) { |
|
57 | - return $value->toAttribute(); |
|
58 | - }, $values); |
|
59 | - return new self(...$attribs); |
|
60 | - } |
|
46 | + /** |
|
47 | + * Initialize from attribute values. |
|
48 | + * |
|
49 | + * @param AttributeValue ...$values |
|
50 | + * |
|
51 | + * @return self |
|
52 | + */ |
|
53 | + public static function fromAttributeValues(AttributeValue ...$values): Attributes |
|
54 | + { |
|
55 | + $attribs = array_map( |
|
56 | + function (AttributeValue $value) { |
|
57 | + return $value->toAttribute(); |
|
58 | + }, $values); |
|
59 | + return new self(...$attribs); |
|
60 | + } |
|
61 | 61 | |
62 | - /** |
|
63 | - * Initialize from ASN.1. |
|
64 | - * |
|
65 | - * @param Set $set |
|
66 | - * |
|
67 | - * @return self |
|
68 | - */ |
|
69 | - public static function fromASN1(Set $set): Attributes |
|
70 | - { |
|
71 | - $attribs = array_map( |
|
72 | - function (UnspecifiedType $el) { |
|
73 | - return Attribute::fromASN1($el->asSequence()); |
|
74 | - }, $set->elements()); |
|
75 | - // cast attributes |
|
76 | - $attribs = array_map( |
|
77 | - function (Attribute $attr) { |
|
78 | - $oid = $attr->oid(); |
|
79 | - if (array_key_exists($oid, self::MAP_OID_TO_CLASS)) { |
|
80 | - $cls = self::MAP_OID_TO_CLASS[$oid]; |
|
81 | - return $attr->castValues($cls); |
|
82 | - } |
|
83 | - return $attr; |
|
84 | - }, $attribs); |
|
85 | - return new self(...$attribs); |
|
86 | - } |
|
62 | + /** |
|
63 | + * Initialize from ASN.1. |
|
64 | + * |
|
65 | + * @param Set $set |
|
66 | + * |
|
67 | + * @return self |
|
68 | + */ |
|
69 | + public static function fromASN1(Set $set): Attributes |
|
70 | + { |
|
71 | + $attribs = array_map( |
|
72 | + function (UnspecifiedType $el) { |
|
73 | + return Attribute::fromASN1($el->asSequence()); |
|
74 | + }, $set->elements()); |
|
75 | + // cast attributes |
|
76 | + $attribs = array_map( |
|
77 | + function (Attribute $attr) { |
|
78 | + $oid = $attr->oid(); |
|
79 | + if (array_key_exists($oid, self::MAP_OID_TO_CLASS)) { |
|
80 | + $cls = self::MAP_OID_TO_CLASS[$oid]; |
|
81 | + return $attr->castValues($cls); |
|
82 | + } |
|
83 | + return $attr; |
|
84 | + }, $attribs); |
|
85 | + return new self(...$attribs); |
|
86 | + } |
|
87 | 87 | |
88 | - /** |
|
89 | - * Check whether extension request attribute is present. |
|
90 | - * |
|
91 | - * @return bool |
|
92 | - */ |
|
93 | - public function hasExtensionRequest(): bool |
|
94 | - { |
|
95 | - return $this->has(ExtensionRequestValue::OID); |
|
96 | - } |
|
88 | + /** |
|
89 | + * Check whether extension request attribute is present. |
|
90 | + * |
|
91 | + * @return bool |
|
92 | + */ |
|
93 | + public function hasExtensionRequest(): bool |
|
94 | + { |
|
95 | + return $this->has(ExtensionRequestValue::OID); |
|
96 | + } |
|
97 | 97 | |
98 | - /** |
|
99 | - * Get extension request attribute value. |
|
100 | - * |
|
101 | - * @throws \LogicException |
|
102 | - * |
|
103 | - * @return ExtensionRequestValue |
|
104 | - */ |
|
105 | - public function extensionRequest(): ExtensionRequestValue |
|
106 | - { |
|
107 | - if (!$this->hasExtensionRequest()) { |
|
108 | - throw new \LogicException('No extension request attribute.'); |
|
109 | - } |
|
110 | - return $this->firstOf(ExtensionRequestValue::OID)->first(); |
|
111 | - } |
|
98 | + /** |
|
99 | + * Get extension request attribute value. |
|
100 | + * |
|
101 | + * @throws \LogicException |
|
102 | + * |
|
103 | + * @return ExtensionRequestValue |
|
104 | + */ |
|
105 | + public function extensionRequest(): ExtensionRequestValue |
|
106 | + { |
|
107 | + if (!$this->hasExtensionRequest()) { |
|
108 | + throw new \LogicException('No extension request attribute.'); |
|
109 | + } |
|
110 | + return $this->firstOf(ExtensionRequestValue::OID)->first(); |
|
111 | + } |
|
112 | 112 | |
113 | - /** |
|
114 | - * Generate ASN.1 structure. |
|
115 | - * |
|
116 | - * @return Set |
|
117 | - */ |
|
118 | - public function toASN1(): Set |
|
119 | - { |
|
120 | - $elements = array_map( |
|
121 | - function (Attribute $attr) { |
|
122 | - return $attr->toASN1(); |
|
123 | - }, array_values($this->_attributes)); |
|
124 | - $set = new Set(...$elements); |
|
125 | - return $set->sortedSetOf(); |
|
126 | - } |
|
113 | + /** |
|
114 | + * Generate ASN.1 structure. |
|
115 | + * |
|
116 | + * @return Set |
|
117 | + */ |
|
118 | + public function toASN1(): Set |
|
119 | + { |
|
120 | + $elements = array_map( |
|
121 | + function (Attribute $attr) { |
|
122 | + return $attr->toASN1(); |
|
123 | + }, array_values($this->_attributes)); |
|
124 | + $set = new Set(...$elements); |
|
125 | + return $set->sortedSetOf(); |
|
126 | + } |
|
127 | 127 | } |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types = 1); |
|
3 | +declare(strict_types=1); |
|
4 | 4 | |
5 | 5 | namespace Sop\X509\CertificationRequest; |
6 | 6 | |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | public static function fromAttributeValues(AttributeValue ...$values): Attributes |
54 | 54 | { |
55 | 55 | $attribs = array_map( |
56 | - function (AttributeValue $value) { |
|
56 | + function(AttributeValue $value) { |
|
57 | 57 | return $value->toAttribute(); |
58 | 58 | }, $values); |
59 | 59 | return new self(...$attribs); |
@@ -69,12 +69,12 @@ discard block |
||
69 | 69 | public static function fromASN1(Set $set): Attributes |
70 | 70 | { |
71 | 71 | $attribs = array_map( |
72 | - function (UnspecifiedType $el) { |
|
72 | + function(UnspecifiedType $el) { |
|
73 | 73 | return Attribute::fromASN1($el->asSequence()); |
74 | 74 | }, $set->elements()); |
75 | 75 | // cast attributes |
76 | 76 | $attribs = array_map( |
77 | - function (Attribute $attr) { |
|
77 | + function(Attribute $attr) { |
|
78 | 78 | $oid = $attr->oid(); |
79 | 79 | if (array_key_exists($oid, self::MAP_OID_TO_CLASS)) { |
80 | 80 | $cls = self::MAP_OID_TO_CLASS[$oid]; |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | public function toASN1(): Set |
119 | 119 | { |
120 | 120 | $elements = array_map( |
121 | - function (Attribute $attr) { |
|
121 | + function(Attribute $attr) { |
|
122 | 122 | return $attr->toASN1(); |
123 | 123 | }, array_values($this->_attributes)); |
124 | 124 | $set = new Set(...$elements); |
@@ -24,206 +24,206 @@ |
||
24 | 24 | */ |
25 | 25 | class CertificationRequestInfo |
26 | 26 | { |
27 | - const VERSION_1 = 0; |
|
28 | - |
|
29 | - /** |
|
30 | - * Version. |
|
31 | - * |
|
32 | - * @var int |
|
33 | - */ |
|
34 | - protected $_version; |
|
35 | - |
|
36 | - /** |
|
37 | - * Subject. |
|
38 | - * |
|
39 | - * @var Name |
|
40 | - */ |
|
41 | - protected $_subject; |
|
42 | - |
|
43 | - /** |
|
44 | - * Public key info. |
|
45 | - * |
|
46 | - * @var PublicKeyInfo |
|
47 | - */ |
|
48 | - protected $_subjectPKInfo; |
|
49 | - |
|
50 | - /** |
|
51 | - * Attributes. |
|
52 | - * |
|
53 | - * @var null|Attributes |
|
54 | - */ |
|
55 | - protected $_attributes; |
|
56 | - |
|
57 | - /** |
|
58 | - * Constructor. |
|
59 | - * |
|
60 | - * @param Name $subject Subject |
|
61 | - * @param PublicKeyInfo $pkinfo Public key info |
|
62 | - */ |
|
63 | - public function __construct(Name $subject, PublicKeyInfo $pkinfo) |
|
64 | - { |
|
65 | - $this->_version = self::VERSION_1; |
|
66 | - $this->_subject = $subject; |
|
67 | - $this->_subjectPKInfo = $pkinfo; |
|
68 | - } |
|
69 | - |
|
70 | - /** |
|
71 | - * Initialize from ASN.1. |
|
72 | - * |
|
73 | - * @param Sequence $seq |
|
74 | - * |
|
75 | - * @throws \UnexpectedValueException |
|
76 | - * |
|
77 | - * @return self |
|
78 | - */ |
|
79 | - public static function fromASN1(Sequence $seq): self |
|
80 | - { |
|
81 | - $version = $seq->at(0)->asInteger()->intNumber(); |
|
82 | - if (self::VERSION_1 != $version) { |
|
83 | - throw new \UnexpectedValueException( |
|
84 | - "Version {$version} not supported."); |
|
85 | - } |
|
86 | - $subject = Name::fromASN1($seq->at(1)->asSequence()); |
|
87 | - $pkinfo = PublicKeyInfo::fromASN1($seq->at(2)->asSequence()); |
|
88 | - $obj = new self($subject, $pkinfo); |
|
89 | - if ($seq->hasTagged(0)) { |
|
90 | - $obj->_attributes = Attributes::fromASN1( |
|
91 | - $seq->getTagged(0)->asImplicit(Element::TYPE_SET)->asSet()); |
|
92 | - } |
|
93 | - return $obj; |
|
94 | - } |
|
95 | - |
|
96 | - /** |
|
97 | - * Get version. |
|
98 | - * |
|
99 | - * @return int |
|
100 | - */ |
|
101 | - public function version(): int |
|
102 | - { |
|
103 | - return $this->_version; |
|
104 | - } |
|
105 | - |
|
106 | - /** |
|
107 | - * Get self with subject. |
|
108 | - * |
|
109 | - * @param Name $subject |
|
110 | - * |
|
111 | - * @return self |
|
112 | - */ |
|
113 | - public function withSubject(Name $subject): self |
|
114 | - { |
|
115 | - $obj = clone $this; |
|
116 | - $obj->_subject = $subject; |
|
117 | - return $obj; |
|
118 | - } |
|
119 | - |
|
120 | - /** |
|
121 | - * Get subject. |
|
122 | - * |
|
123 | - * @return Name |
|
124 | - */ |
|
125 | - public function subject(): Name |
|
126 | - { |
|
127 | - return $this->_subject; |
|
128 | - } |
|
129 | - |
|
130 | - /** |
|
131 | - * Get subject public key info. |
|
132 | - * |
|
133 | - * @return PublicKeyInfo |
|
134 | - */ |
|
135 | - public function subjectPKInfo(): PublicKeyInfo |
|
136 | - { |
|
137 | - return $this->_subjectPKInfo; |
|
138 | - } |
|
139 | - |
|
140 | - /** |
|
141 | - * Whether certification request info has attributes. |
|
142 | - * |
|
143 | - * @return bool |
|
144 | - */ |
|
145 | - public function hasAttributes(): bool |
|
146 | - { |
|
147 | - return isset($this->_attributes); |
|
148 | - } |
|
149 | - |
|
150 | - /** |
|
151 | - * Get attributes. |
|
152 | - * |
|
153 | - * @throws \LogicException If not set |
|
154 | - * |
|
155 | - * @return Attributes |
|
156 | - */ |
|
157 | - public function attributes(): Attributes |
|
158 | - { |
|
159 | - if (!$this->hasAttributes()) { |
|
160 | - throw new \LogicException('No attributes.'); |
|
161 | - } |
|
162 | - return $this->_attributes; |
|
163 | - } |
|
164 | - |
|
165 | - /** |
|
166 | - * Get instance of self with attributes. |
|
167 | - * |
|
168 | - * @param Attributes $attribs |
|
169 | - */ |
|
170 | - public function withAttributes(Attributes $attribs): self |
|
171 | - { |
|
172 | - $obj = clone $this; |
|
173 | - $obj->_attributes = $attribs; |
|
174 | - return $obj; |
|
175 | - } |
|
176 | - |
|
177 | - /** |
|
178 | - * Get self with extension request attribute. |
|
179 | - * |
|
180 | - * @param Extensions $extensions Extensions to request |
|
181 | - * |
|
182 | - * @return self |
|
183 | - */ |
|
184 | - public function withExtensionRequest(Extensions $extensions): self |
|
185 | - { |
|
186 | - $obj = clone $this; |
|
187 | - if (!isset($obj->_attributes)) { |
|
188 | - $obj->_attributes = new Attributes(); |
|
189 | - } |
|
190 | - $obj->_attributes = $obj->_attributes->withUnique( |
|
191 | - Attribute::fromAttributeValues( |
|
192 | - new ExtensionRequestValue($extensions))); |
|
193 | - return $obj; |
|
194 | - } |
|
195 | - |
|
196 | - /** |
|
197 | - * Generate ASN.1 structure. |
|
198 | - * |
|
199 | - * @return Sequence |
|
200 | - */ |
|
201 | - public function toASN1(): Sequence |
|
202 | - { |
|
203 | - $elements = [new Integer($this->_version), |
|
204 | - $this->_subject->toASN1(), $this->_subjectPKInfo->toASN1(), ]; |
|
205 | - if (isset($this->_attributes)) { |
|
206 | - $elements[] = new ImplicitlyTaggedType(0, |
|
207 | - $this->_attributes->toASN1()); |
|
208 | - } |
|
209 | - return new Sequence(...$elements); |
|
210 | - } |
|
211 | - |
|
212 | - /** |
|
213 | - * Create signed CertificationRequest. |
|
214 | - * |
|
215 | - * @param SignatureAlgorithmIdentifier $algo Algorithm used for signing |
|
216 | - * @param PrivateKeyInfo $privkey_info Private key used for signing |
|
217 | - * @param null|Crypto $crypto Crypto engine, use default if not set |
|
218 | - * |
|
219 | - * @return CertificationRequest |
|
220 | - */ |
|
221 | - public function sign(SignatureAlgorithmIdentifier $algo, |
|
222 | - PrivateKeyInfo $privkey_info, ?Crypto $crypto = null): CertificationRequest |
|
223 | - { |
|
224 | - $crypto = $crypto ?? Crypto::getDefault(); |
|
225 | - $data = $this->toASN1()->toDER(); |
|
226 | - $signature = $crypto->sign($data, $privkey_info, $algo); |
|
227 | - return new CertificationRequest($this, $algo, $signature); |
|
228 | - } |
|
27 | + const VERSION_1 = 0; |
|
28 | + |
|
29 | + /** |
|
30 | + * Version. |
|
31 | + * |
|
32 | + * @var int |
|
33 | + */ |
|
34 | + protected $_version; |
|
35 | + |
|
36 | + /** |
|
37 | + * Subject. |
|
38 | + * |
|
39 | + * @var Name |
|
40 | + */ |
|
41 | + protected $_subject; |
|
42 | + |
|
43 | + /** |
|
44 | + * Public key info. |
|
45 | + * |
|
46 | + * @var PublicKeyInfo |
|
47 | + */ |
|
48 | + protected $_subjectPKInfo; |
|
49 | + |
|
50 | + /** |
|
51 | + * Attributes. |
|
52 | + * |
|
53 | + * @var null|Attributes |
|
54 | + */ |
|
55 | + protected $_attributes; |
|
56 | + |
|
57 | + /** |
|
58 | + * Constructor. |
|
59 | + * |
|
60 | + * @param Name $subject Subject |
|
61 | + * @param PublicKeyInfo $pkinfo Public key info |
|
62 | + */ |
|
63 | + public function __construct(Name $subject, PublicKeyInfo $pkinfo) |
|
64 | + { |
|
65 | + $this->_version = self::VERSION_1; |
|
66 | + $this->_subject = $subject; |
|
67 | + $this->_subjectPKInfo = $pkinfo; |
|
68 | + } |
|
69 | + |
|
70 | + /** |
|
71 | + * Initialize from ASN.1. |
|
72 | + * |
|
73 | + * @param Sequence $seq |
|
74 | + * |
|
75 | + * @throws \UnexpectedValueException |
|
76 | + * |
|
77 | + * @return self |
|
78 | + */ |
|
79 | + public static function fromASN1(Sequence $seq): self |
|
80 | + { |
|
81 | + $version = $seq->at(0)->asInteger()->intNumber(); |
|
82 | + if (self::VERSION_1 != $version) { |
|
83 | + throw new \UnexpectedValueException( |
|
84 | + "Version {$version} not supported."); |
|
85 | + } |
|
86 | + $subject = Name::fromASN1($seq->at(1)->asSequence()); |
|
87 | + $pkinfo = PublicKeyInfo::fromASN1($seq->at(2)->asSequence()); |
|
88 | + $obj = new self($subject, $pkinfo); |
|
89 | + if ($seq->hasTagged(0)) { |
|
90 | + $obj->_attributes = Attributes::fromASN1( |
|
91 | + $seq->getTagged(0)->asImplicit(Element::TYPE_SET)->asSet()); |
|
92 | + } |
|
93 | + return $obj; |
|
94 | + } |
|
95 | + |
|
96 | + /** |
|
97 | + * Get version. |
|
98 | + * |
|
99 | + * @return int |
|
100 | + */ |
|
101 | + public function version(): int |
|
102 | + { |
|
103 | + return $this->_version; |
|
104 | + } |
|
105 | + |
|
106 | + /** |
|
107 | + * Get self with subject. |
|
108 | + * |
|
109 | + * @param Name $subject |
|
110 | + * |
|
111 | + * @return self |
|
112 | + */ |
|
113 | + public function withSubject(Name $subject): self |
|
114 | + { |
|
115 | + $obj = clone $this; |
|
116 | + $obj->_subject = $subject; |
|
117 | + return $obj; |
|
118 | + } |
|
119 | + |
|
120 | + /** |
|
121 | + * Get subject. |
|
122 | + * |
|
123 | + * @return Name |
|
124 | + */ |
|
125 | + public function subject(): Name |
|
126 | + { |
|
127 | + return $this->_subject; |
|
128 | + } |
|
129 | + |
|
130 | + /** |
|
131 | + * Get subject public key info. |
|
132 | + * |
|
133 | + * @return PublicKeyInfo |
|
134 | + */ |
|
135 | + public function subjectPKInfo(): PublicKeyInfo |
|
136 | + { |
|
137 | + return $this->_subjectPKInfo; |
|
138 | + } |
|
139 | + |
|
140 | + /** |
|
141 | + * Whether certification request info has attributes. |
|
142 | + * |
|
143 | + * @return bool |
|
144 | + */ |
|
145 | + public function hasAttributes(): bool |
|
146 | + { |
|
147 | + return isset($this->_attributes); |
|
148 | + } |
|
149 | + |
|
150 | + /** |
|
151 | + * Get attributes. |
|
152 | + * |
|
153 | + * @throws \LogicException If not set |
|
154 | + * |
|
155 | + * @return Attributes |
|
156 | + */ |
|
157 | + public function attributes(): Attributes |
|
158 | + { |
|
159 | + if (!$this->hasAttributes()) { |
|
160 | + throw new \LogicException('No attributes.'); |
|
161 | + } |
|
162 | + return $this->_attributes; |
|
163 | + } |
|
164 | + |
|
165 | + /** |
|
166 | + * Get instance of self with attributes. |
|
167 | + * |
|
168 | + * @param Attributes $attribs |
|
169 | + */ |
|
170 | + public function withAttributes(Attributes $attribs): self |
|
171 | + { |
|
172 | + $obj = clone $this; |
|
173 | + $obj->_attributes = $attribs; |
|
174 | + return $obj; |
|
175 | + } |
|
176 | + |
|
177 | + /** |
|
178 | + * Get self with extension request attribute. |
|
179 | + * |
|
180 | + * @param Extensions $extensions Extensions to request |
|
181 | + * |
|
182 | + * @return self |
|
183 | + */ |
|
184 | + public function withExtensionRequest(Extensions $extensions): self |
|
185 | + { |
|
186 | + $obj = clone $this; |
|
187 | + if (!isset($obj->_attributes)) { |
|
188 | + $obj->_attributes = new Attributes(); |
|
189 | + } |
|
190 | + $obj->_attributes = $obj->_attributes->withUnique( |
|
191 | + Attribute::fromAttributeValues( |
|
192 | + new ExtensionRequestValue($extensions))); |
|
193 | + return $obj; |
|
194 | + } |
|
195 | + |
|
196 | + /** |
|
197 | + * Generate ASN.1 structure. |
|
198 | + * |
|
199 | + * @return Sequence |
|
200 | + */ |
|
201 | + public function toASN1(): Sequence |
|
202 | + { |
|
203 | + $elements = [new Integer($this->_version), |
|
204 | + $this->_subject->toASN1(), $this->_subjectPKInfo->toASN1(), ]; |
|
205 | + if (isset($this->_attributes)) { |
|
206 | + $elements[] = new ImplicitlyTaggedType(0, |
|
207 | + $this->_attributes->toASN1()); |
|
208 | + } |
|
209 | + return new Sequence(...$elements); |
|
210 | + } |
|
211 | + |
|
212 | + /** |
|
213 | + * Create signed CertificationRequest. |
|
214 | + * |
|
215 | + * @param SignatureAlgorithmIdentifier $algo Algorithm used for signing |
|
216 | + * @param PrivateKeyInfo $privkey_info Private key used for signing |
|
217 | + * @param null|Crypto $crypto Crypto engine, use default if not set |
|
218 | + * |
|
219 | + * @return CertificationRequest |
|
220 | + */ |
|
221 | + public function sign(SignatureAlgorithmIdentifier $algo, |
|
222 | + PrivateKeyInfo $privkey_info, ?Crypto $crypto = null): CertificationRequest |
|
223 | + { |
|
224 | + $crypto = $crypto ?? Crypto::getDefault(); |
|
225 | + $data = $this->toASN1()->toDER(); |
|
226 | + $signature = $crypto->sign($data, $privkey_info, $algo); |
|
227 | + return new CertificationRequest($this, $algo, $signature); |
|
228 | + } |
|
229 | 229 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types = 1); |
|
3 | +declare(strict_types=1); |
|
4 | 4 | |
5 | 5 | namespace Sop\X509\CertificationRequest; |
6 | 6 |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types = 1); |
|
3 | +declare(strict_types=1); |
|
4 | 4 | |
5 | 5 | namespace Sop\X509\Exception; |
6 | 6 |
@@ -9,76 +9,76 @@ |
||
9 | 9 | */ |
10 | 10 | trait DateTimeHelper |
11 | 11 | { |
12 | - /** |
|
13 | - * Create DateTime object from time string and timezone. |
|
14 | - * |
|
15 | - * @param null|string $time Time string, default to 'now' |
|
16 | - * @param null|string $tz Timezone, default if omitted |
|
17 | - * |
|
18 | - * @throws \RuntimeException |
|
19 | - * |
|
20 | - * @return \DateTimeImmutable |
|
21 | - */ |
|
22 | - private static function _createDateTime( |
|
23 | - ?string $time = null, ?string $tz = null): \DateTimeImmutable |
|
24 | - { |
|
25 | - if (!isset($time)) { |
|
26 | - $time = 'now'; |
|
27 | - } |
|
28 | - if (!isset($tz)) { |
|
29 | - $tz = date_default_timezone_get(); |
|
30 | - } |
|
31 | - try { |
|
32 | - $dt = new \DateTimeImmutable($time, self::_createTimeZone($tz)); |
|
33 | - return self::_roundDownFractionalSeconds($dt); |
|
34 | - } catch (\Exception $e) { |
|
35 | - throw new \RuntimeException( |
|
36 | - 'Failed to create DateTime: ' . |
|
37 | - self::_getLastDateTimeImmutableErrorsStr(), 0, $e); |
|
38 | - } |
|
39 | - } |
|
12 | + /** |
|
13 | + * Create DateTime object from time string and timezone. |
|
14 | + * |
|
15 | + * @param null|string $time Time string, default to 'now' |
|
16 | + * @param null|string $tz Timezone, default if omitted |
|
17 | + * |
|
18 | + * @throws \RuntimeException |
|
19 | + * |
|
20 | + * @return \DateTimeImmutable |
|
21 | + */ |
|
22 | + private static function _createDateTime( |
|
23 | + ?string $time = null, ?string $tz = null): \DateTimeImmutable |
|
24 | + { |
|
25 | + if (!isset($time)) { |
|
26 | + $time = 'now'; |
|
27 | + } |
|
28 | + if (!isset($tz)) { |
|
29 | + $tz = date_default_timezone_get(); |
|
30 | + } |
|
31 | + try { |
|
32 | + $dt = new \DateTimeImmutable($time, self::_createTimeZone($tz)); |
|
33 | + return self::_roundDownFractionalSeconds($dt); |
|
34 | + } catch (\Exception $e) { |
|
35 | + throw new \RuntimeException( |
|
36 | + 'Failed to create DateTime: ' . |
|
37 | + self::_getLastDateTimeImmutableErrorsStr(), 0, $e); |
|
38 | + } |
|
39 | + } |
|
40 | 40 | |
41 | - /** |
|
42 | - * Rounds a \DateTimeImmutable value such that fractional |
|
43 | - * seconds are removed. |
|
44 | - * |
|
45 | - * @param \DateTimeImmutable $dt |
|
46 | - * |
|
47 | - * @return \DateTimeImmutable |
|
48 | - */ |
|
49 | - private static function _roundDownFractionalSeconds( |
|
50 | - \DateTimeImmutable $dt): \DateTimeImmutable |
|
51 | - { |
|
52 | - return \DateTimeImmutable::createFromFormat('Y-m-d H:i:s', |
|
53 | - $dt->format('Y-m-d H:i:s'), $dt->getTimezone()); |
|
54 | - } |
|
41 | + /** |
|
42 | + * Rounds a \DateTimeImmutable value such that fractional |
|
43 | + * seconds are removed. |
|
44 | + * |
|
45 | + * @param \DateTimeImmutable $dt |
|
46 | + * |
|
47 | + * @return \DateTimeImmutable |
|
48 | + */ |
|
49 | + private static function _roundDownFractionalSeconds( |
|
50 | + \DateTimeImmutable $dt): \DateTimeImmutable |
|
51 | + { |
|
52 | + return \DateTimeImmutable::createFromFormat('Y-m-d H:i:s', |
|
53 | + $dt->format('Y-m-d H:i:s'), $dt->getTimezone()); |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * Create DateTimeZone object from string. |
|
58 | - * |
|
59 | - * @param string $tz |
|
60 | - * |
|
61 | - * @throws \UnexpectedValueException |
|
62 | - * |
|
63 | - * @return \DateTimeZone |
|
64 | - */ |
|
65 | - private static function _createTimeZone(string $tz): \DateTimeZone |
|
66 | - { |
|
67 | - try { |
|
68 | - return new \DateTimeZone($tz); |
|
69 | - } catch (\Exception $e) { |
|
70 | - throw new \UnexpectedValueException('Invalid timezone.', 0, $e); |
|
71 | - } |
|
72 | - } |
|
56 | + /** |
|
57 | + * Create DateTimeZone object from string. |
|
58 | + * |
|
59 | + * @param string $tz |
|
60 | + * |
|
61 | + * @throws \UnexpectedValueException |
|
62 | + * |
|
63 | + * @return \DateTimeZone |
|
64 | + */ |
|
65 | + private static function _createTimeZone(string $tz): \DateTimeZone |
|
66 | + { |
|
67 | + try { |
|
68 | + return new \DateTimeZone($tz); |
|
69 | + } catch (\Exception $e) { |
|
70 | + throw new \UnexpectedValueException('Invalid timezone.', 0, $e); |
|
71 | + } |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * Get last error caused by DateTimeImmutable. |
|
76 | - * |
|
77 | - * @return string |
|
78 | - */ |
|
79 | - private static function _getLastDateTimeImmutableErrorsStr(): string |
|
80 | - { |
|
81 | - $errors = \DateTimeImmutable::getLastErrors()['errors']; |
|
82 | - return implode(', ', $errors); |
|
83 | - } |
|
74 | + /** |
|
75 | + * Get last error caused by DateTimeImmutable. |
|
76 | + * |
|
77 | + * @return string |
|
78 | + */ |
|
79 | + private static function _getLastDateTimeImmutableErrorsStr(): string |
|
80 | + { |
|
81 | + $errors = \DateTimeImmutable::getLastErrors()['errors']; |
|
82 | + return implode(', ', $errors); |
|
83 | + } |
|
84 | 84 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types = 1); |
|
3 | +declare(strict_types=1); |
|
4 | 4 | |
5 | 5 | namespace Sop\X509\Feature; |
6 | 6 |
@@ -14,145 +14,145 @@ |
||
14 | 14 | */ |
15 | 15 | trait AttributeContainer |
16 | 16 | { |
17 | - /** |
|
18 | - * Array of attributes. |
|
19 | - * |
|
20 | - * @var Attribute[] |
|
21 | - */ |
|
22 | - protected $_attributes; |
|
17 | + /** |
|
18 | + * Array of attributes. |
|
19 | + * |
|
20 | + * @var Attribute[] |
|
21 | + */ |
|
22 | + protected $_attributes; |
|
23 | 23 | |
24 | - /** |
|
25 | - * Check whether attribute is present. |
|
26 | - * |
|
27 | - * @param string $name OID or attribute name |
|
28 | - * |
|
29 | - * @return bool |
|
30 | - */ |
|
31 | - public function has(string $name): bool |
|
32 | - { |
|
33 | - return null !== $this->_findFirst($name); |
|
34 | - } |
|
24 | + /** |
|
25 | + * Check whether attribute is present. |
|
26 | + * |
|
27 | + * @param string $name OID or attribute name |
|
28 | + * |
|
29 | + * @return bool |
|
30 | + */ |
|
31 | + public function has(string $name): bool |
|
32 | + { |
|
33 | + return null !== $this->_findFirst($name); |
|
34 | + } |
|
35 | 35 | |
36 | - /** |
|
37 | - * Get first attribute by OID or attribute name. |
|
38 | - * |
|
39 | - * @param string $name OID or attribute name |
|
40 | - * |
|
41 | - * @throws \OutOfBoundsException |
|
42 | - * |
|
43 | - * @return Attribute |
|
44 | - */ |
|
45 | - public function firstOf(string $name): Attribute |
|
46 | - { |
|
47 | - $attr = $this->_findFirst($name); |
|
48 | - if (!$attr) { |
|
49 | - throw new \UnexpectedValueException("No {$name} attribute."); |
|
50 | - } |
|
51 | - return $attr; |
|
52 | - } |
|
36 | + /** |
|
37 | + * Get first attribute by OID or attribute name. |
|
38 | + * |
|
39 | + * @param string $name OID or attribute name |
|
40 | + * |
|
41 | + * @throws \OutOfBoundsException |
|
42 | + * |
|
43 | + * @return Attribute |
|
44 | + */ |
|
45 | + public function firstOf(string $name): Attribute |
|
46 | + { |
|
47 | + $attr = $this->_findFirst($name); |
|
48 | + if (!$attr) { |
|
49 | + throw new \UnexpectedValueException("No {$name} attribute."); |
|
50 | + } |
|
51 | + return $attr; |
|
52 | + } |
|
53 | 53 | |
54 | - /** |
|
55 | - * Get all attributes of given name. |
|
56 | - * |
|
57 | - * @param string $name OID or attribute name |
|
58 | - * |
|
59 | - * @return Attribute[] |
|
60 | - */ |
|
61 | - public function allOf(string $name): array |
|
62 | - { |
|
63 | - $oid = AttributeType::attrNameToOID($name); |
|
64 | - $attrs = array_filter($this->_attributes, |
|
65 | - function (Attribute $attr) use ($oid) { |
|
66 | - return $attr->oid() === $oid; |
|
67 | - }); |
|
68 | - return array_values($attrs); |
|
69 | - } |
|
54 | + /** |
|
55 | + * Get all attributes of given name. |
|
56 | + * |
|
57 | + * @param string $name OID or attribute name |
|
58 | + * |
|
59 | + * @return Attribute[] |
|
60 | + */ |
|
61 | + public function allOf(string $name): array |
|
62 | + { |
|
63 | + $oid = AttributeType::attrNameToOID($name); |
|
64 | + $attrs = array_filter($this->_attributes, |
|
65 | + function (Attribute $attr) use ($oid) { |
|
66 | + return $attr->oid() === $oid; |
|
67 | + }); |
|
68 | + return array_values($attrs); |
|
69 | + } |
|
70 | 70 | |
71 | - /** |
|
72 | - * Get all attributes. |
|
73 | - * |
|
74 | - * @return Attribute[] |
|
75 | - */ |
|
76 | - public function all(): array |
|
77 | - { |
|
78 | - return $this->_attributes; |
|
79 | - } |
|
71 | + /** |
|
72 | + * Get all attributes. |
|
73 | + * |
|
74 | + * @return Attribute[] |
|
75 | + */ |
|
76 | + public function all(): array |
|
77 | + { |
|
78 | + return $this->_attributes; |
|
79 | + } |
|
80 | 80 | |
81 | - /** |
|
82 | - * Get self with additional attributes added. |
|
83 | - * |
|
84 | - * @param Attribute ...$attribs |
|
85 | - * |
|
86 | - * @return self |
|
87 | - */ |
|
88 | - public function withAdditional(Attribute ...$attribs): self |
|
89 | - { |
|
90 | - $obj = clone $this; |
|
91 | - foreach ($attribs as $attr) { |
|
92 | - $obj->_attributes[] = $attr; |
|
93 | - } |
|
94 | - return $obj; |
|
95 | - } |
|
81 | + /** |
|
82 | + * Get self with additional attributes added. |
|
83 | + * |
|
84 | + * @param Attribute ...$attribs |
|
85 | + * |
|
86 | + * @return self |
|
87 | + */ |
|
88 | + public function withAdditional(Attribute ...$attribs): self |
|
89 | + { |
|
90 | + $obj = clone $this; |
|
91 | + foreach ($attribs as $attr) { |
|
92 | + $obj->_attributes[] = $attr; |
|
93 | + } |
|
94 | + return $obj; |
|
95 | + } |
|
96 | 96 | |
97 | - /** |
|
98 | - * Get self with single unique attribute added. |
|
99 | - * |
|
100 | - * All previous attributes of the same type are removed. |
|
101 | - * |
|
102 | - * @param Attribute $attr |
|
103 | - * |
|
104 | - * @return self |
|
105 | - */ |
|
106 | - public function withUnique(Attribute $attr): self |
|
107 | - { |
|
108 | - $obj = clone $this; |
|
109 | - $obj->_attributes = array_filter($obj->_attributes, |
|
110 | - function (Attribute $a) use ($attr) { |
|
111 | - return $a->oid() !== $attr->oid(); |
|
112 | - }); |
|
113 | - $obj->_attributes[] = $attr; |
|
114 | - return $obj; |
|
115 | - } |
|
97 | + /** |
|
98 | + * Get self with single unique attribute added. |
|
99 | + * |
|
100 | + * All previous attributes of the same type are removed. |
|
101 | + * |
|
102 | + * @param Attribute $attr |
|
103 | + * |
|
104 | + * @return self |
|
105 | + */ |
|
106 | + public function withUnique(Attribute $attr): self |
|
107 | + { |
|
108 | + $obj = clone $this; |
|
109 | + $obj->_attributes = array_filter($obj->_attributes, |
|
110 | + function (Attribute $a) use ($attr) { |
|
111 | + return $a->oid() !== $attr->oid(); |
|
112 | + }); |
|
113 | + $obj->_attributes[] = $attr; |
|
114 | + return $obj; |
|
115 | + } |
|
116 | 116 | |
117 | - /** |
|
118 | - * Get number of attributes. |
|
119 | - * |
|
120 | - * @see \Countable::count() |
|
121 | - * |
|
122 | - * @return int |
|
123 | - */ |
|
124 | - public function count(): int |
|
125 | - { |
|
126 | - return count($this->_attributes); |
|
127 | - } |
|
117 | + /** |
|
118 | + * Get number of attributes. |
|
119 | + * |
|
120 | + * @see \Countable::count() |
|
121 | + * |
|
122 | + * @return int |
|
123 | + */ |
|
124 | + public function count(): int |
|
125 | + { |
|
126 | + return count($this->_attributes); |
|
127 | + } |
|
128 | 128 | |
129 | - /** |
|
130 | - * Get iterator for attributes. |
|
131 | - * |
|
132 | - * @see \IteratorAggregate::getIterator() |
|
133 | - * |
|
134 | - * @return \ArrayIterator |
|
135 | - */ |
|
136 | - public function getIterator(): \ArrayIterator |
|
137 | - { |
|
138 | - return new \ArrayIterator($this->_attributes); |
|
139 | - } |
|
129 | + /** |
|
130 | + * Get iterator for attributes. |
|
131 | + * |
|
132 | + * @see \IteratorAggregate::getIterator() |
|
133 | + * |
|
134 | + * @return \ArrayIterator |
|
135 | + */ |
|
136 | + public function getIterator(): \ArrayIterator |
|
137 | + { |
|
138 | + return new \ArrayIterator($this->_attributes); |
|
139 | + } |
|
140 | 140 | |
141 | - /** |
|
142 | - * Find first attribute of given name or OID. |
|
143 | - * |
|
144 | - * @param string $name |
|
145 | - * |
|
146 | - * @return null|Attribute |
|
147 | - */ |
|
148 | - protected function _findFirst(string $name): ?Attribute |
|
149 | - { |
|
150 | - $oid = AttributeType::attrNameToOID($name); |
|
151 | - foreach ($this->_attributes as $attr) { |
|
152 | - if ($attr->oid() === $oid) { |
|
153 | - return $attr; |
|
154 | - } |
|
155 | - } |
|
156 | - return null; |
|
157 | - } |
|
141 | + /** |
|
142 | + * Find first attribute of given name or OID. |
|
143 | + * |
|
144 | + * @param string $name |
|
145 | + * |
|
146 | + * @return null|Attribute |
|
147 | + */ |
|
148 | + protected function _findFirst(string $name): ?Attribute |
|
149 | + { |
|
150 | + $oid = AttributeType::attrNameToOID($name); |
|
151 | + foreach ($this->_attributes as $attr) { |
|
152 | + if ($attr->oid() === $oid) { |
|
153 | + return $attr; |
|
154 | + } |
|
155 | + } |
|
156 | + return null; |
|
157 | + } |
|
158 | 158 | } |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types = 1); |
|
3 | +declare(strict_types=1); |
|
4 | 4 | |
5 | 5 | namespace Sop\X509\Feature; |
6 | 6 | |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | { |
63 | 63 | $oid = AttributeType::attrNameToOID($name); |
64 | 64 | $attrs = array_filter($this->_attributes, |
65 | - function (Attribute $attr) use ($oid) { |
|
65 | + function(Attribute $attr) use ($oid) { |
|
66 | 66 | return $attr->oid() === $oid; |
67 | 67 | }); |
68 | 68 | return array_values($attrs); |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | { |
108 | 108 | $obj = clone $this; |
109 | 109 | $obj->_attributes = array_filter($obj->_attributes, |
110 | - function (Attribute $a) use ($attr) { |
|
110 | + function(Attribute $a) use ($attr) { |
|
111 | 111 | return $a->oid() !== $attr->oid(); |
112 | 112 | }); |
113 | 113 | $obj->_attributes[] = $attr; |