@@ -6,57 +6,57 @@ |
||
6 | 6 | |
7 | 7 | class IPv6Address extends IPAddress |
8 | 8 | { |
9 | - /** |
|
10 | - * Initialize from octets. |
|
11 | - * |
|
12 | - * @param string $octets |
|
13 | - * @throws \InvalidArgumentException |
|
14 | - * @return self |
|
15 | - */ |
|
16 | - public static function fromOctets(string $octets): self |
|
17 | - { |
|
18 | - $mask = null; |
|
19 | - $words = unpack("n*", $octets); |
|
20 | - switch (count($words)) { |
|
21 | - case 8: |
|
22 | - $ip = self::_wordsToIPv6String($words); |
|
23 | - break; |
|
24 | - case 16: |
|
25 | - $ip = self::_wordsToIPv6String(array_slice($words, 0, 8)); |
|
26 | - $mask = self::_wordsToIPv6String(array_slice($words, 8, 8)); |
|
27 | - break; |
|
28 | - default: |
|
29 | - throw new \UnexpectedValueException("Invalid IPv6 octet length."); |
|
30 | - } |
|
31 | - return new self($ip, $mask); |
|
32 | - } |
|
9 | + /** |
|
10 | + * Initialize from octets. |
|
11 | + * |
|
12 | + * @param string $octets |
|
13 | + * @throws \InvalidArgumentException |
|
14 | + * @return self |
|
15 | + */ |
|
16 | + public static function fromOctets(string $octets): self |
|
17 | + { |
|
18 | + $mask = null; |
|
19 | + $words = unpack("n*", $octets); |
|
20 | + switch (count($words)) { |
|
21 | + case 8: |
|
22 | + $ip = self::_wordsToIPv6String($words); |
|
23 | + break; |
|
24 | + case 16: |
|
25 | + $ip = self::_wordsToIPv6String(array_slice($words, 0, 8)); |
|
26 | + $mask = self::_wordsToIPv6String(array_slice($words, 8, 8)); |
|
27 | + break; |
|
28 | + default: |
|
29 | + throw new \UnexpectedValueException("Invalid IPv6 octet length."); |
|
30 | + } |
|
31 | + return new self($ip, $mask); |
|
32 | + } |
|
33 | 33 | |
34 | - /** |
|
35 | - * Convert an array of 16 bit words to an IPv6 string representation. |
|
36 | - * |
|
37 | - * @param int[] $words |
|
38 | - * @return string |
|
39 | - */ |
|
40 | - protected static function _wordsToIPv6String(array $words): string |
|
41 | - { |
|
42 | - $groups = array_map( |
|
43 | - function ($word) { |
|
44 | - return sprintf("%04x", $word); |
|
45 | - }, $words); |
|
46 | - return implode(":", $groups); |
|
47 | - } |
|
34 | + /** |
|
35 | + * Convert an array of 16 bit words to an IPv6 string representation. |
|
36 | + * |
|
37 | + * @param int[] $words |
|
38 | + * @return string |
|
39 | + */ |
|
40 | + protected static function _wordsToIPv6String(array $words): string |
|
41 | + { |
|
42 | + $groups = array_map( |
|
43 | + function ($word) { |
|
44 | + return sprintf("%04x", $word); |
|
45 | + }, $words); |
|
46 | + return implode(":", $groups); |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * |
|
51 | - * {@inheritdoc} |
|
52 | - */ |
|
53 | - protected function _octets(): string |
|
54 | - { |
|
55 | - $words = array_map("hexdec", explode(":", $this->_ip)); |
|
56 | - if (isset($this->_mask)) { |
|
57 | - $words = array_merge($words, |
|
58 | - array_map("hexdec", explode(":", $this->_mask))); |
|
59 | - } |
|
60 | - return pack("n*", ...$words); |
|
61 | - } |
|
49 | + /** |
|
50 | + * |
|
51 | + * {@inheritdoc} |
|
52 | + */ |
|
53 | + protected function _octets(): string |
|
54 | + { |
|
55 | + $words = array_map("hexdec", explode(":", $this->_ip)); |
|
56 | + if (isset($this->_mask)) { |
|
57 | + $words = array_merge($words, |
|
58 | + array_map("hexdec", explode(":", $this->_mask))); |
|
59 | + } |
|
60 | + return pack("n*", ...$words); |
|
61 | + } |
|
62 | 62 | } |
@@ -17,59 +17,59 @@ |
||
17 | 17 | */ |
18 | 18 | class UniformResourceIdentifier extends GeneralName |
19 | 19 | { |
20 | - /** |
|
21 | - * URI. |
|
22 | - * |
|
23 | - * @var string $_uri |
|
24 | - */ |
|
25 | - protected $_uri; |
|
20 | + /** |
|
21 | + * URI. |
|
22 | + * |
|
23 | + * @var string $_uri |
|
24 | + */ |
|
25 | + protected $_uri; |
|
26 | 26 | |
27 | - /** |
|
28 | - * Constructor. |
|
29 | - * |
|
30 | - * @param string $uri |
|
31 | - */ |
|
32 | - public function __construct(string $uri) |
|
33 | - { |
|
34 | - $this->_tag = self::TAG_URI; |
|
35 | - $this->_uri = $uri; |
|
36 | - } |
|
27 | + /** |
|
28 | + * Constructor. |
|
29 | + * |
|
30 | + * @param string $uri |
|
31 | + */ |
|
32 | + public function __construct(string $uri) |
|
33 | + { |
|
34 | + $this->_tag = self::TAG_URI; |
|
35 | + $this->_uri = $uri; |
|
36 | + } |
|
37 | 37 | |
38 | - /** |
|
39 | - * |
|
40 | - * @param UnspecifiedType $el |
|
41 | - * @return self |
|
42 | - */ |
|
43 | - public static function fromChosenASN1(UnspecifiedType $el): self |
|
44 | - { |
|
45 | - return new self($el->asIA5String()->string()); |
|
46 | - } |
|
38 | + /** |
|
39 | + * |
|
40 | + * @param UnspecifiedType $el |
|
41 | + * @return self |
|
42 | + */ |
|
43 | + public static function fromChosenASN1(UnspecifiedType $el): self |
|
44 | + { |
|
45 | + return new self($el->asIA5String()->string()); |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * |
|
50 | - * {@inheritdoc} |
|
51 | - */ |
|
52 | - public function string(): string |
|
53 | - { |
|
54 | - return $this->_uri; |
|
55 | - } |
|
48 | + /** |
|
49 | + * |
|
50 | + * {@inheritdoc} |
|
51 | + */ |
|
52 | + public function string(): string |
|
53 | + { |
|
54 | + return $this->_uri; |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * Get URI. |
|
59 | - * |
|
60 | - * @return string |
|
61 | - */ |
|
62 | - public function uri(): string |
|
63 | - { |
|
64 | - return $this->_uri; |
|
65 | - } |
|
57 | + /** |
|
58 | + * Get URI. |
|
59 | + * |
|
60 | + * @return string |
|
61 | + */ |
|
62 | + public function uri(): string |
|
63 | + { |
|
64 | + return $this->_uri; |
|
65 | + } |
|
66 | 66 | |
67 | - /** |
|
68 | - * |
|
69 | - * {@inheritdoc} |
|
70 | - */ |
|
71 | - protected function _choiceASN1(): TaggedType |
|
72 | - { |
|
73 | - return new ImplicitlyTaggedType($this->_tag, new IA5String($this->_uri)); |
|
74 | - } |
|
67 | + /** |
|
68 | + * |
|
69 | + * {@inheritdoc} |
|
70 | + */ |
|
71 | + protected function _choiceASN1(): TaggedType |
|
72 | + { |
|
73 | + return new ImplicitlyTaggedType($this->_tag, new IA5String($this->_uri)); |
|
74 | + } |
|
75 | 75 | } |
@@ -16,60 +16,60 @@ |
||
16 | 16 | */ |
17 | 17 | class RegisteredID extends GeneralName |
18 | 18 | { |
19 | - /** |
|
20 | - * Object identifier. |
|
21 | - * |
|
22 | - * @var string $_oid |
|
23 | - */ |
|
24 | - protected $_oid; |
|
19 | + /** |
|
20 | + * Object identifier. |
|
21 | + * |
|
22 | + * @var string $_oid |
|
23 | + */ |
|
24 | + protected $_oid; |
|
25 | 25 | |
26 | - /** |
|
27 | - * Constructor. |
|
28 | - * |
|
29 | - * @param string $oid OID in dotted format |
|
30 | - */ |
|
31 | - public function __construct(string $oid) |
|
32 | - { |
|
33 | - $this->_tag = self::TAG_REGISTERED_ID; |
|
34 | - $this->_oid = $oid; |
|
35 | - } |
|
26 | + /** |
|
27 | + * Constructor. |
|
28 | + * |
|
29 | + * @param string $oid OID in dotted format |
|
30 | + */ |
|
31 | + public function __construct(string $oid) |
|
32 | + { |
|
33 | + $this->_tag = self::TAG_REGISTERED_ID; |
|
34 | + $this->_oid = $oid; |
|
35 | + } |
|
36 | 36 | |
37 | - /** |
|
38 | - * |
|
39 | - * @param UnspecifiedType $el |
|
40 | - * @return self |
|
41 | - */ |
|
42 | - public static function fromChosenASN1(UnspecifiedType $el): self |
|
43 | - { |
|
44 | - return new self($el->asObjectIdentifier()->oid()); |
|
45 | - } |
|
37 | + /** |
|
38 | + * |
|
39 | + * @param UnspecifiedType $el |
|
40 | + * @return self |
|
41 | + */ |
|
42 | + public static function fromChosenASN1(UnspecifiedType $el): self |
|
43 | + { |
|
44 | + return new self($el->asObjectIdentifier()->oid()); |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * |
|
49 | - * {@inheritdoc} |
|
50 | - */ |
|
51 | - public function string(): string |
|
52 | - { |
|
53 | - return $this->_oid; |
|
54 | - } |
|
47 | + /** |
|
48 | + * |
|
49 | + * {@inheritdoc} |
|
50 | + */ |
|
51 | + public function string(): string |
|
52 | + { |
|
53 | + return $this->_oid; |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * Get object identifier in dotted format. |
|
58 | - * |
|
59 | - * @return string OID |
|
60 | - */ |
|
61 | - public function oid(): string |
|
62 | - { |
|
63 | - return $this->_oid; |
|
64 | - } |
|
56 | + /** |
|
57 | + * Get object identifier in dotted format. |
|
58 | + * |
|
59 | + * @return string OID |
|
60 | + */ |
|
61 | + public function oid(): string |
|
62 | + { |
|
63 | + return $this->_oid; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * |
|
68 | - * {@inheritdoc} |
|
69 | - */ |
|
70 | - protected function _choiceASN1(): TaggedType |
|
71 | - { |
|
72 | - return new ImplicitlyTaggedType($this->_tag, |
|
73 | - new ObjectIdentifier($this->_oid)); |
|
74 | - } |
|
66 | + /** |
|
67 | + * |
|
68 | + * {@inheritdoc} |
|
69 | + */ |
|
70 | + protected function _choiceASN1(): TaggedType |
|
71 | + { |
|
72 | + return new ImplicitlyTaggedType($this->_tag, |
|
73 | + new ObjectIdentifier($this->_oid)); |
|
74 | + } |
|
75 | 75 | } |
@@ -19,97 +19,97 @@ |
||
19 | 19 | */ |
20 | 20 | abstract class IPAddress extends GeneralName |
21 | 21 | { |
22 | - /** |
|
23 | - * IP address. |
|
24 | - * |
|
25 | - * @var string $_ip |
|
26 | - */ |
|
27 | - protected $_ip; |
|
22 | + /** |
|
23 | + * IP address. |
|
24 | + * |
|
25 | + * @var string $_ip |
|
26 | + */ |
|
27 | + protected $_ip; |
|
28 | 28 | |
29 | - /** |
|
30 | - * Subnet mask. |
|
31 | - * |
|
32 | - * @var string|null $_mask |
|
33 | - */ |
|
34 | - protected $_mask; |
|
29 | + /** |
|
30 | + * Subnet mask. |
|
31 | + * |
|
32 | + * @var string|null $_mask |
|
33 | + */ |
|
34 | + protected $_mask; |
|
35 | 35 | |
36 | - /** |
|
37 | - * Get octet representation of the IP address. |
|
38 | - * |
|
39 | - * @return string |
|
40 | - */ |
|
41 | - abstract protected function _octets(); |
|
36 | + /** |
|
37 | + * Get octet representation of the IP address. |
|
38 | + * |
|
39 | + * @return string |
|
40 | + */ |
|
41 | + abstract protected function _octets(); |
|
42 | 42 | |
43 | - /** |
|
44 | - * Constructor. |
|
45 | - * |
|
46 | - * @param string $ip |
|
47 | - * @param string|null $mask |
|
48 | - */ |
|
49 | - public function __construct(string $ip, $mask = null) |
|
50 | - { |
|
51 | - $this->_tag = self::TAG_IP_ADDRESS; |
|
52 | - $this->_ip = $ip; |
|
53 | - $this->_mask = $mask; |
|
54 | - } |
|
43 | + /** |
|
44 | + * Constructor. |
|
45 | + * |
|
46 | + * @param string $ip |
|
47 | + * @param string|null $mask |
|
48 | + */ |
|
49 | + public function __construct(string $ip, $mask = null) |
|
50 | + { |
|
51 | + $this->_tag = self::TAG_IP_ADDRESS; |
|
52 | + $this->_ip = $ip; |
|
53 | + $this->_mask = $mask; |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * |
|
58 | - * @param UnspecifiedType $el |
|
59 | - * @return self |
|
60 | - */ |
|
61 | - public static function fromChosenASN1(UnspecifiedType $el): self |
|
62 | - { |
|
63 | - $octets = $el->asOctetString()->string(); |
|
64 | - switch (strlen($octets)) { |
|
65 | - case 4: |
|
66 | - case 8: |
|
67 | - return IPv4Address::fromOctets($octets); |
|
68 | - case 16: |
|
69 | - case 32: |
|
70 | - return IPv6Address::fromOctets($octets); |
|
71 | - default: |
|
72 | - throw new \UnexpectedValueException( |
|
73 | - "Invalid octet length for IP address."); |
|
74 | - } |
|
75 | - } |
|
56 | + /** |
|
57 | + * |
|
58 | + * @param UnspecifiedType $el |
|
59 | + * @return self |
|
60 | + */ |
|
61 | + public static function fromChosenASN1(UnspecifiedType $el): self |
|
62 | + { |
|
63 | + $octets = $el->asOctetString()->string(); |
|
64 | + switch (strlen($octets)) { |
|
65 | + case 4: |
|
66 | + case 8: |
|
67 | + return IPv4Address::fromOctets($octets); |
|
68 | + case 16: |
|
69 | + case 32: |
|
70 | + return IPv6Address::fromOctets($octets); |
|
71 | + default: |
|
72 | + throw new \UnexpectedValueException( |
|
73 | + "Invalid octet length for IP address."); |
|
74 | + } |
|
75 | + } |
|
76 | 76 | |
77 | - /** |
|
78 | - * |
|
79 | - * {@inheritdoc} |
|
80 | - */ |
|
81 | - public function string(): string |
|
82 | - { |
|
83 | - return $this->_ip . (isset($this->_mask) ? "/" . $this->_mask : ""); |
|
84 | - } |
|
77 | + /** |
|
78 | + * |
|
79 | + * {@inheritdoc} |
|
80 | + */ |
|
81 | + public function string(): string |
|
82 | + { |
|
83 | + return $this->_ip . (isset($this->_mask) ? "/" . $this->_mask : ""); |
|
84 | + } |
|
85 | 85 | |
86 | - /** |
|
87 | - * Get IP address as a string. |
|
88 | - * |
|
89 | - * @return string |
|
90 | - */ |
|
91 | - public function address(): string |
|
92 | - { |
|
93 | - return $this->_ip; |
|
94 | - } |
|
86 | + /** |
|
87 | + * Get IP address as a string. |
|
88 | + * |
|
89 | + * @return string |
|
90 | + */ |
|
91 | + public function address(): string |
|
92 | + { |
|
93 | + return $this->_ip; |
|
94 | + } |
|
95 | 95 | |
96 | - /** |
|
97 | - * Get subnet mask as a string. |
|
98 | - * |
|
99 | - * @return string |
|
100 | - */ |
|
101 | - public function mask(): string |
|
102 | - { |
|
103 | - return $this->_mask; |
|
104 | - } |
|
96 | + /** |
|
97 | + * Get subnet mask as a string. |
|
98 | + * |
|
99 | + * @return string |
|
100 | + */ |
|
101 | + public function mask(): string |
|
102 | + { |
|
103 | + return $this->_mask; |
|
104 | + } |
|
105 | 105 | |
106 | - /** |
|
107 | - * |
|
108 | - * {@inheritdoc} |
|
109 | - */ |
|
110 | - protected function _choiceASN1(): TaggedType |
|
111 | - { |
|
112 | - return new ImplicitlyTaggedType($this->_tag, |
|
113 | - new OctetString($this->_octets())); |
|
114 | - } |
|
106 | + /** |
|
107 | + * |
|
108 | + * {@inheritdoc} |
|
109 | + */ |
|
110 | + protected function _choiceASN1(): TaggedType |
|
111 | + { |
|
112 | + return new ImplicitlyTaggedType($this->_tag, |
|
113 | + new OctetString($this->_octets())); |
|
114 | + } |
|
115 | 115 | } |
@@ -16,72 +16,72 @@ |
||
16 | 16 | */ |
17 | 17 | class DirectoryName extends GeneralName |
18 | 18 | { |
19 | - /** |
|
20 | - * Directory name. |
|
21 | - * |
|
22 | - * @var Name $_dn |
|
23 | - */ |
|
24 | - protected $_dn; |
|
19 | + /** |
|
20 | + * Directory name. |
|
21 | + * |
|
22 | + * @var Name $_dn |
|
23 | + */ |
|
24 | + protected $_dn; |
|
25 | 25 | |
26 | - /** |
|
27 | - * Constructor. |
|
28 | - * |
|
29 | - * @param Name $dn |
|
30 | - */ |
|
31 | - public function __construct(Name $dn) |
|
32 | - { |
|
33 | - $this->_tag = self::TAG_DIRECTORY_NAME; |
|
34 | - $this->_dn = $dn; |
|
35 | - } |
|
26 | + /** |
|
27 | + * Constructor. |
|
28 | + * |
|
29 | + * @param Name $dn |
|
30 | + */ |
|
31 | + public function __construct(Name $dn) |
|
32 | + { |
|
33 | + $this->_tag = self::TAG_DIRECTORY_NAME; |
|
34 | + $this->_dn = $dn; |
|
35 | + } |
|
36 | 36 | |
37 | - /** |
|
38 | - * |
|
39 | - * @param UnspecifiedType $el |
|
40 | - * @return self |
|
41 | - */ |
|
42 | - public static function fromChosenASN1(UnspecifiedType $el): self |
|
43 | - { |
|
44 | - return new self(Name::fromASN1($el->asSequence())); |
|
45 | - } |
|
37 | + /** |
|
38 | + * |
|
39 | + * @param UnspecifiedType $el |
|
40 | + * @return self |
|
41 | + */ |
|
42 | + public static function fromChosenASN1(UnspecifiedType $el): self |
|
43 | + { |
|
44 | + return new self(Name::fromASN1($el->asSequence())); |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * Initialize from distinguished name string. |
|
49 | - * |
|
50 | - * @param string $str |
|
51 | - * @return self |
|
52 | - */ |
|
53 | - public static function fromDNString(string $str): self |
|
54 | - { |
|
55 | - return new self(Name::fromString($str)); |
|
56 | - } |
|
47 | + /** |
|
48 | + * Initialize from distinguished name string. |
|
49 | + * |
|
50 | + * @param string $str |
|
51 | + * @return self |
|
52 | + */ |
|
53 | + public static function fromDNString(string $str): self |
|
54 | + { |
|
55 | + return new self(Name::fromString($str)); |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * |
|
60 | - * {@inheritdoc} |
|
61 | - */ |
|
62 | - public function string(): string |
|
63 | - { |
|
64 | - return $this->_dn->toString(); |
|
65 | - } |
|
58 | + /** |
|
59 | + * |
|
60 | + * {@inheritdoc} |
|
61 | + */ |
|
62 | + public function string(): string |
|
63 | + { |
|
64 | + return $this->_dn->toString(); |
|
65 | + } |
|
66 | 66 | |
67 | - /** |
|
68 | - * Get directory name. |
|
69 | - * |
|
70 | - * @return Name |
|
71 | - */ |
|
72 | - public function dn(): Name |
|
73 | - { |
|
74 | - return $this->_dn; |
|
75 | - } |
|
67 | + /** |
|
68 | + * Get directory name. |
|
69 | + * |
|
70 | + * @return Name |
|
71 | + */ |
|
72 | + public function dn(): Name |
|
73 | + { |
|
74 | + return $this->_dn; |
|
75 | + } |
|
76 | 76 | |
77 | - /** |
|
78 | - * |
|
79 | - * {@inheritdoc} |
|
80 | - */ |
|
81 | - protected function _choiceASN1(): TaggedType |
|
82 | - { |
|
83 | - // Name type is itself a CHOICE, so explicit tagging must be |
|
84 | - // employed to avoid ambiguities |
|
85 | - return new ExplicitlyTaggedType($this->_tag, $this->_dn->toASN1()); |
|
86 | - } |
|
77 | + /** |
|
78 | + * |
|
79 | + * {@inheritdoc} |
|
80 | + */ |
|
81 | + protected function _choiceASN1(): TaggedType |
|
82 | + { |
|
83 | + // Name type is itself a CHOICE, so explicit tagging must be |
|
84 | + // employed to avoid ambiguities |
|
85 | + return new ExplicitlyTaggedType($this->_tag, $this->_dn->toASN1()); |
|
86 | + } |
|
87 | 87 | } |
@@ -16,59 +16,59 @@ |
||
16 | 16 | */ |
17 | 17 | class DNSName extends GeneralName |
18 | 18 | { |
19 | - /** |
|
20 | - * DNS name. |
|
21 | - * |
|
22 | - * @var string |
|
23 | - */ |
|
24 | - protected $_name; |
|
19 | + /** |
|
20 | + * DNS name. |
|
21 | + * |
|
22 | + * @var string |
|
23 | + */ |
|
24 | + protected $_name; |
|
25 | 25 | |
26 | - /** |
|
27 | - * Constructor. |
|
28 | - * |
|
29 | - * @param string $name Domain name |
|
30 | - */ |
|
31 | - public function __construct(string $name) |
|
32 | - { |
|
33 | - $this->_tag = self::TAG_DNS_NAME; |
|
34 | - $this->_name = $name; |
|
35 | - } |
|
26 | + /** |
|
27 | + * Constructor. |
|
28 | + * |
|
29 | + * @param string $name Domain name |
|
30 | + */ |
|
31 | + public function __construct(string $name) |
|
32 | + { |
|
33 | + $this->_tag = self::TAG_DNS_NAME; |
|
34 | + $this->_name = $name; |
|
35 | + } |
|
36 | 36 | |
37 | - /** |
|
38 | - * |
|
39 | - * @param UnspecifiedType $el |
|
40 | - * @return self |
|
41 | - */ |
|
42 | - public static function fromChosenASN1(UnspecifiedType $el): self |
|
43 | - { |
|
44 | - return new self($el->asIA5String()->string()); |
|
45 | - } |
|
37 | + /** |
|
38 | + * |
|
39 | + * @param UnspecifiedType $el |
|
40 | + * @return self |
|
41 | + */ |
|
42 | + public static function fromChosenASN1(UnspecifiedType $el): self |
|
43 | + { |
|
44 | + return new self($el->asIA5String()->string()); |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * |
|
49 | - * {@inheritdoc} |
|
50 | - */ |
|
51 | - public function string(): string |
|
52 | - { |
|
53 | - return $this->_name; |
|
54 | - } |
|
47 | + /** |
|
48 | + * |
|
49 | + * {@inheritdoc} |
|
50 | + */ |
|
51 | + public function string(): string |
|
52 | + { |
|
53 | + return $this->_name; |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * Get DNS name. |
|
58 | - * |
|
59 | - * @return string |
|
60 | - */ |
|
61 | - public function name(): string |
|
62 | - { |
|
63 | - return $this->_name; |
|
64 | - } |
|
56 | + /** |
|
57 | + * Get DNS name. |
|
58 | + * |
|
59 | + * @return string |
|
60 | + */ |
|
61 | + public function name(): string |
|
62 | + { |
|
63 | + return $this->_name; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * |
|
68 | - * {@inheritdoc} |
|
69 | - */ |
|
70 | - protected function _choiceASN1(): TaggedType |
|
71 | - { |
|
72 | - return new ImplicitlyTaggedType($this->_tag, new IA5String($this->_name)); |
|
73 | - } |
|
66 | + /** |
|
67 | + * |
|
68 | + * {@inheritdoc} |
|
69 | + */ |
|
70 | + protected function _choiceASN1(): TaggedType |
|
71 | + { |
|
72 | + return new ImplicitlyTaggedType($this->_tag, new IA5String($this->_name)); |
|
73 | + } |
|
74 | 74 | } |
@@ -18,47 +18,47 @@ |
||
18 | 18 | */ |
19 | 19 | class X400Address extends GeneralName |
20 | 20 | { |
21 | - /** |
|
22 | - * |
|
23 | - * @var \ASN1\Element |
|
24 | - */ |
|
25 | - protected $_element; |
|
21 | + /** |
|
22 | + * |
|
23 | + * @var \ASN1\Element |
|
24 | + */ |
|
25 | + protected $_element; |
|
26 | 26 | |
27 | - /** |
|
28 | - * Constructor. |
|
29 | - */ |
|
30 | - protected function __construct() |
|
31 | - { |
|
32 | - $this->_tag = self::TAG_X400_ADDRESS; |
|
33 | - } |
|
27 | + /** |
|
28 | + * Constructor. |
|
29 | + */ |
|
30 | + protected function __construct() |
|
31 | + { |
|
32 | + $this->_tag = self::TAG_X400_ADDRESS; |
|
33 | + } |
|
34 | 34 | |
35 | - /** |
|
36 | - * |
|
37 | - * @param UnspecifiedType $el |
|
38 | - * @return self |
|
39 | - */ |
|
40 | - public static function fromChosenASN1(UnspecifiedType $el): self |
|
41 | - { |
|
42 | - $obj = new self(); |
|
43 | - $obj->_element = $el->asSequence(); |
|
44 | - return $obj; |
|
45 | - } |
|
35 | + /** |
|
36 | + * |
|
37 | + * @param UnspecifiedType $el |
|
38 | + * @return self |
|
39 | + */ |
|
40 | + public static function fromChosenASN1(UnspecifiedType $el): self |
|
41 | + { |
|
42 | + $obj = new self(); |
|
43 | + $obj->_element = $el->asSequence(); |
|
44 | + return $obj; |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * |
|
49 | - * {@inheritdoc} |
|
50 | - */ |
|
51 | - public function string(): string |
|
52 | - { |
|
53 | - return bin2hex($this->_element->toDER()); |
|
54 | - } |
|
47 | + /** |
|
48 | + * |
|
49 | + * {@inheritdoc} |
|
50 | + */ |
|
51 | + public function string(): string |
|
52 | + { |
|
53 | + return bin2hex($this->_element->toDER()); |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * |
|
58 | - * {@inheritdoc} |
|
59 | - */ |
|
60 | - protected function _choiceASN1(): TaggedType |
|
61 | - { |
|
62 | - return new ImplicitlyTaggedType($this->_tag, $this->_element); |
|
63 | - } |
|
56 | + /** |
|
57 | + * |
|
58 | + * {@inheritdoc} |
|
59 | + */ |
|
60 | + protected function _choiceASN1(): TaggedType |
|
61 | + { |
|
62 | + return new ImplicitlyTaggedType($this->_tag, $this->_element); |
|
63 | + } |
|
64 | 64 | } |
@@ -13,131 +13,131 @@ |
||
13 | 13 | */ |
14 | 14 | class CertificateChain implements \Countable, \IteratorAggregate |
15 | 15 | { |
16 | - /** |
|
17 | - * List of certificates in a chain. |
|
18 | - * |
|
19 | - * @var Certificate[] |
|
20 | - */ |
|
21 | - protected $_certs; |
|
16 | + /** |
|
17 | + * List of certificates in a chain. |
|
18 | + * |
|
19 | + * @var Certificate[] |
|
20 | + */ |
|
21 | + protected $_certs; |
|
22 | 22 | |
23 | - /** |
|
24 | - * Constructor. |
|
25 | - * |
|
26 | - * @param Certificate ...$certs List of certificates, end-entity first |
|
27 | - */ |
|
28 | - public function __construct(Certificate ...$certs) |
|
29 | - { |
|
30 | - $this->_certs = $certs; |
|
31 | - } |
|
23 | + /** |
|
24 | + * Constructor. |
|
25 | + * |
|
26 | + * @param Certificate ...$certs List of certificates, end-entity first |
|
27 | + */ |
|
28 | + public function __construct(Certificate ...$certs) |
|
29 | + { |
|
30 | + $this->_certs = $certs; |
|
31 | + } |
|
32 | 32 | |
33 | - /** |
|
34 | - * Initialize from a list of PEMs. |
|
35 | - * |
|
36 | - * @param PEM ...$pems |
|
37 | - * @return self |
|
38 | - */ |
|
39 | - public static function fromPEMs(PEM ...$pems): self |
|
40 | - { |
|
41 | - $certs = array_map( |
|
42 | - function (PEM $pem) { |
|
43 | - return Certificate::fromPEM($pem); |
|
44 | - }, $pems); |
|
45 | - return new self(...$certs); |
|
46 | - } |
|
33 | + /** |
|
34 | + * Initialize from a list of PEMs. |
|
35 | + * |
|
36 | + * @param PEM ...$pems |
|
37 | + * @return self |
|
38 | + */ |
|
39 | + public static function fromPEMs(PEM ...$pems): self |
|
40 | + { |
|
41 | + $certs = array_map( |
|
42 | + function (PEM $pem) { |
|
43 | + return Certificate::fromPEM($pem); |
|
44 | + }, $pems); |
|
45 | + return new self(...$certs); |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * Initialize from a string containing multiple PEM blocks. |
|
50 | - * |
|
51 | - * @param string $str |
|
52 | - * @return self |
|
53 | - */ |
|
54 | - public static function fromPEMString(string $str): self |
|
55 | - { |
|
56 | - $pems = PEMBundle::fromString($str)->all(); |
|
57 | - return self::fromPEMs(...$pems); |
|
58 | - } |
|
48 | + /** |
|
49 | + * Initialize from a string containing multiple PEM blocks. |
|
50 | + * |
|
51 | + * @param string $str |
|
52 | + * @return self |
|
53 | + */ |
|
54 | + public static function fromPEMString(string $str): self |
|
55 | + { |
|
56 | + $pems = PEMBundle::fromString($str)->all(); |
|
57 | + return self::fromPEMs(...$pems); |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * Get all certificates in a chain ordered from the end-entity certificate |
|
62 | - * to the trust anchor. |
|
63 | - * |
|
64 | - * @return Certificate[] |
|
65 | - */ |
|
66 | - public function certificates(): array |
|
67 | - { |
|
68 | - return $this->_certs; |
|
69 | - } |
|
60 | + /** |
|
61 | + * Get all certificates in a chain ordered from the end-entity certificate |
|
62 | + * to the trust anchor. |
|
63 | + * |
|
64 | + * @return Certificate[] |
|
65 | + */ |
|
66 | + public function certificates(): array |
|
67 | + { |
|
68 | + return $this->_certs; |
|
69 | + } |
|
70 | 70 | |
71 | - /** |
|
72 | - * Get the end-entity certificate. |
|
73 | - * |
|
74 | - * @throws \LogicException |
|
75 | - * @return Certificate |
|
76 | - */ |
|
77 | - public function endEntityCertificate(): Certificate |
|
78 | - { |
|
79 | - if (!count($this->_certs)) { |
|
80 | - throw new \LogicException("No certificates."); |
|
81 | - } |
|
82 | - return $this->_certs[0]; |
|
83 | - } |
|
71 | + /** |
|
72 | + * Get the end-entity certificate. |
|
73 | + * |
|
74 | + * @throws \LogicException |
|
75 | + * @return Certificate |
|
76 | + */ |
|
77 | + public function endEntityCertificate(): Certificate |
|
78 | + { |
|
79 | + if (!count($this->_certs)) { |
|
80 | + throw new \LogicException("No certificates."); |
|
81 | + } |
|
82 | + return $this->_certs[0]; |
|
83 | + } |
|
84 | 84 | |
85 | - /** |
|
86 | - * Get the trust anchor certificate. |
|
87 | - * |
|
88 | - * @throws \LogicException |
|
89 | - * @return Certificate |
|
90 | - */ |
|
91 | - public function trustAnchorCertificate(): Certificate |
|
92 | - { |
|
93 | - if (!count($this->_certs)) { |
|
94 | - throw new \LogicException("No certificates."); |
|
95 | - } |
|
96 | - return $this->_certs[count($this->_certs) - 1]; |
|
97 | - } |
|
85 | + /** |
|
86 | + * Get the trust anchor certificate. |
|
87 | + * |
|
88 | + * @throws \LogicException |
|
89 | + * @return Certificate |
|
90 | + */ |
|
91 | + public function trustAnchorCertificate(): Certificate |
|
92 | + { |
|
93 | + if (!count($this->_certs)) { |
|
94 | + throw new \LogicException("No certificates."); |
|
95 | + } |
|
96 | + return $this->_certs[count($this->_certs) - 1]; |
|
97 | + } |
|
98 | 98 | |
99 | - /** |
|
100 | - * Convert certificate chain to certification path. |
|
101 | - * |
|
102 | - * @return CertificationPath |
|
103 | - */ |
|
104 | - public function certificationPath(): CertificationPath |
|
105 | - { |
|
106 | - return CertificationPath::fromCertificateChain($this); |
|
107 | - } |
|
99 | + /** |
|
100 | + * Convert certificate chain to certification path. |
|
101 | + * |
|
102 | + * @return CertificationPath |
|
103 | + */ |
|
104 | + public function certificationPath(): CertificationPath |
|
105 | + { |
|
106 | + return CertificationPath::fromCertificateChain($this); |
|
107 | + } |
|
108 | 108 | |
109 | - /** |
|
110 | - * Convert certificate chain to string of PEM blocks. |
|
111 | - * |
|
112 | - * @return string |
|
113 | - */ |
|
114 | - public function toPEMString(): string |
|
115 | - { |
|
116 | - return implode("\n", |
|
117 | - array_map( |
|
118 | - function (Certificate $cert) { |
|
119 | - return $cert->toPEM()->string(); |
|
120 | - }, $this->_certs)); |
|
121 | - } |
|
109 | + /** |
|
110 | + * Convert certificate chain to string of PEM blocks. |
|
111 | + * |
|
112 | + * @return string |
|
113 | + */ |
|
114 | + public function toPEMString(): string |
|
115 | + { |
|
116 | + return implode("\n", |
|
117 | + array_map( |
|
118 | + function (Certificate $cert) { |
|
119 | + return $cert->toPEM()->string(); |
|
120 | + }, $this->_certs)); |
|
121 | + } |
|
122 | 122 | |
123 | - /** |
|
124 | - * |
|
125 | - * @see \Countable::count() |
|
126 | - * @return int |
|
127 | - */ |
|
128 | - public function count(): int |
|
129 | - { |
|
130 | - return count($this->_certs); |
|
131 | - } |
|
123 | + /** |
|
124 | + * |
|
125 | + * @see \Countable::count() |
|
126 | + * @return int |
|
127 | + */ |
|
128 | + public function count(): int |
|
129 | + { |
|
130 | + return count($this->_certs); |
|
131 | + } |
|
132 | 132 | |
133 | - /** |
|
134 | - * Get iterator for certificates. |
|
135 | - * |
|
136 | - * @see \IteratorAggregate::getIterator() |
|
137 | - * @return \ArrayIterator |
|
138 | - */ |
|
139 | - public function getIterator(): \ArrayIterator |
|
140 | - { |
|
141 | - return new \ArrayIterator($this->_certs); |
|
142 | - } |
|
133 | + /** |
|
134 | + * Get iterator for certificates. |
|
135 | + * |
|
136 | + * @see \IteratorAggregate::getIterator() |
|
137 | + * @return \ArrayIterator |
|
138 | + */ |
|
139 | + public function getIterator(): \ArrayIterator |
|
140 | + { |
|
141 | + return new \ArrayIterator($this->_certs); |
|
142 | + } |
|
143 | 143 | } |
@@ -13,86 +13,86 @@ |
||
13 | 13 | */ |
14 | 14 | class Validity |
15 | 15 | { |
16 | - /** |
|
17 | - * Not before time. |
|
18 | - * |
|
19 | - * @var Time $_notBefore |
|
20 | - */ |
|
21 | - protected $_notBefore; |
|
16 | + /** |
|
17 | + * Not before time. |
|
18 | + * |
|
19 | + * @var Time $_notBefore |
|
20 | + */ |
|
21 | + protected $_notBefore; |
|
22 | 22 | |
23 | - /** |
|
24 | - * Not after time. |
|
25 | - * |
|
26 | - * @var Time $_notAfter |
|
27 | - */ |
|
28 | - protected $_notAfter; |
|
23 | + /** |
|
24 | + * Not after time. |
|
25 | + * |
|
26 | + * @var Time $_notAfter |
|
27 | + */ |
|
28 | + protected $_notAfter; |
|
29 | 29 | |
30 | - /** |
|
31 | - * Constructor. |
|
32 | - * |
|
33 | - * @param Time $not_before |
|
34 | - * @param Time $not_after |
|
35 | - */ |
|
36 | - public function __construct(Time $not_before, Time $not_after) |
|
37 | - { |
|
38 | - $this->_notBefore = $not_before; |
|
39 | - $this->_notAfter = $not_after; |
|
40 | - } |
|
30 | + /** |
|
31 | + * Constructor. |
|
32 | + * |
|
33 | + * @param Time $not_before |
|
34 | + * @param Time $not_after |
|
35 | + */ |
|
36 | + public function __construct(Time $not_before, Time $not_after) |
|
37 | + { |
|
38 | + $this->_notBefore = $not_before; |
|
39 | + $this->_notAfter = $not_after; |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * Initialize from ASN.1. |
|
44 | - * |
|
45 | - * @param Sequence $seq |
|
46 | - */ |
|
47 | - public static function fromASN1(Sequence $seq): self |
|
48 | - { |
|
49 | - $nb = Time::fromASN1($seq->at(0)->asTime()); |
|
50 | - $na = Time::fromASN1($seq->at(1)->asTime()); |
|
51 | - return new self($nb, $na); |
|
52 | - } |
|
42 | + /** |
|
43 | + * Initialize from ASN.1. |
|
44 | + * |
|
45 | + * @param Sequence $seq |
|
46 | + */ |
|
47 | + public static function fromASN1(Sequence $seq): self |
|
48 | + { |
|
49 | + $nb = Time::fromASN1($seq->at(0)->asTime()); |
|
50 | + $na = Time::fromASN1($seq->at(1)->asTime()); |
|
51 | + return new self($nb, $na); |
|
52 | + } |
|
53 | 53 | |
54 | - /** |
|
55 | - * Initialize from date strings. |
|
56 | - * |
|
57 | - * @param string|null $nb_date Not before date |
|
58 | - * @param string|null $na_date Not after date |
|
59 | - * @param string|null $tz Timezone string |
|
60 | - * @return self |
|
61 | - */ |
|
62 | - public static function fromStrings($nb_date, $na_date, $tz = null): self |
|
63 | - { |
|
64 | - return new self(Time::fromString($nb_date, $tz), |
|
65 | - Time::fromString($na_date, $tz)); |
|
66 | - } |
|
54 | + /** |
|
55 | + * Initialize from date strings. |
|
56 | + * |
|
57 | + * @param string|null $nb_date Not before date |
|
58 | + * @param string|null $na_date Not after date |
|
59 | + * @param string|null $tz Timezone string |
|
60 | + * @return self |
|
61 | + */ |
|
62 | + public static function fromStrings($nb_date, $na_date, $tz = null): self |
|
63 | + { |
|
64 | + return new self(Time::fromString($nb_date, $tz), |
|
65 | + Time::fromString($na_date, $tz)); |
|
66 | + } |
|
67 | 67 | |
68 | - /** |
|
69 | - * Get not before time. |
|
70 | - * |
|
71 | - * @return Time |
|
72 | - */ |
|
73 | - public function notBefore(): Time |
|
74 | - { |
|
75 | - return $this->_notBefore; |
|
76 | - } |
|
68 | + /** |
|
69 | + * Get not before time. |
|
70 | + * |
|
71 | + * @return Time |
|
72 | + */ |
|
73 | + public function notBefore(): Time |
|
74 | + { |
|
75 | + return $this->_notBefore; |
|
76 | + } |
|
77 | 77 | |
78 | - /** |
|
79 | - * Get not after time. |
|
80 | - * |
|
81 | - * @return Time |
|
82 | - */ |
|
83 | - public function notAfter(): Time |
|
84 | - { |
|
85 | - return $this->_notAfter; |
|
86 | - } |
|
78 | + /** |
|
79 | + * Get not after time. |
|
80 | + * |
|
81 | + * @return Time |
|
82 | + */ |
|
83 | + public function notAfter(): Time |
|
84 | + { |
|
85 | + return $this->_notAfter; |
|
86 | + } |
|
87 | 87 | |
88 | - /** |
|
89 | - * Generate ASN.1 structure. |
|
90 | - * |
|
91 | - * @return Sequence |
|
92 | - */ |
|
93 | - public function toASN1(): Sequence |
|
94 | - { |
|
95 | - return new Sequence($this->_notBefore->toASN1(), |
|
96 | - $this->_notAfter->toASN1()); |
|
97 | - } |
|
88 | + /** |
|
89 | + * Generate ASN.1 structure. |
|
90 | + * |
|
91 | + * @return Sequence |
|
92 | + */ |
|
93 | + public function toASN1(): Sequence |
|
94 | + { |
|
95 | + return new Sequence($this->_notBefore->toASN1(), |
|
96 | + $this->_notAfter->toASN1()); |
|
97 | + } |
|
98 | 98 | } |