@@ -16,15 +16,15 @@ |
||
16 | 16 | $mask = null; |
17 | 17 | $bytes = unpack("C*", $octets); |
18 | 18 | switch (count($bytes)) { |
19 | - case 4: |
|
20 | - $ip = implode(".", $bytes); |
|
21 | - break; |
|
22 | - case 8: |
|
23 | - $ip = implode(".", array_slice($bytes, 0, 4)); |
|
24 | - $mask = implode(".", array_slice($bytes, 4, 4)); |
|
25 | - break; |
|
26 | - default: |
|
27 | - throw new \UnexpectedValueException("Invalid IPv4 octet length."); |
|
19 | + case 4: |
|
20 | + $ip = implode(".", $bytes); |
|
21 | + break; |
|
22 | + case 8: |
|
23 | + $ip = implode(".", array_slice($bytes, 0, 4)); |
|
24 | + $mask = implode(".", array_slice($bytes, 4, 4)); |
|
25 | + break; |
|
26 | + default: |
|
27 | + throw new \UnexpectedValueException("Invalid IPv4 octet length."); |
|
28 | 28 | } |
29 | 29 | return new self($ip, $mask); |
30 | 30 | } |
@@ -59,15 +59,15 @@ |
||
59 | 59 | { |
60 | 60 | $octets = $el->asOctetString()->string(); |
61 | 61 | switch (strlen($octets)) { |
62 | - case 4: |
|
63 | - case 8: |
|
64 | - return IPv4Address::fromOctets($octets); |
|
65 | - case 16: |
|
66 | - case 32: |
|
67 | - return IPv6Address::fromOctets($octets); |
|
68 | - default: |
|
69 | - throw new \UnexpectedValueException( |
|
70 | - "Invalid octet length for IP address."); |
|
62 | + case 4: |
|
63 | + case 8: |
|
64 | + return IPv4Address::fromOctets($octets); |
|
65 | + case 16: |
|
66 | + case 32: |
|
67 | + return IPv6Address::fromOctets($octets); |
|
68 | + default: |
|
69 | + throw new \UnexpectedValueException( |
|
70 | + "Invalid octet length for IP address."); |
|
71 | 71 | } |
72 | 72 | } |
73 | 73 |
@@ -16,15 +16,15 @@ |
||
16 | 16 | $mask = null; |
17 | 17 | $words = unpack("n*", $octets); |
18 | 18 | switch (count($words)) { |
19 | - case 8: |
|
20 | - $ip = self::_wordsToIPv6String($words); |
|
21 | - break; |
|
22 | - case 16: |
|
23 | - $ip = self::_wordsToIPv6String(array_slice($words, 0, 8)); |
|
24 | - $mask = self::_wordsToIPv6String(array_slice($words, 8, 8)); |
|
25 | - break; |
|
26 | - default: |
|
27 | - throw new \UnexpectedValueException("Invalid IPv6 octet length."); |
|
19 | + case 8: |
|
20 | + $ip = self::_wordsToIPv6String($words); |
|
21 | + break; |
|
22 | + case 16: |
|
23 | + $ip = self::_wordsToIPv6String(array_slice($words, 0, 8)); |
|
24 | + $mask = self::_wordsToIPv6String(array_slice($words, 8, 8)); |
|
25 | + break; |
|
26 | + default: |
|
27 | + throw new \UnexpectedValueException("Invalid IPv6 octet length."); |
|
28 | 28 | } |
29 | 29 | return new self($ip, $mask); |
30 | 30 | } |
@@ -68,43 +68,43 @@ |
||
68 | 68 | { |
69 | 69 | switch ($el->tag()) { |
70 | 70 | // otherName |
71 | - case self::TAG_OTHER_NAME: |
|
72 | - return OtherName::fromChosenASN1( |
|
73 | - $el->asImplicit(Element::TYPE_SEQUENCE)); |
|
74 | - // rfc822Name |
|
75 | - case self::TAG_RFC822_NAME: |
|
76 | - return RFC822Name::fromChosenASN1( |
|
77 | - $el->asImplicit(Element::TYPE_IA5_STRING)); |
|
78 | - // dNSName |
|
79 | - case self::TAG_DNS_NAME: |
|
80 | - return DNSName::fromChosenASN1( |
|
81 | - $el->asImplicit(Element::TYPE_IA5_STRING)); |
|
82 | - // x400Address |
|
83 | - case self::TAG_X400_ADDRESS: |
|
84 | - return X400Address::fromChosenASN1( |
|
85 | - $el->asImplicit(Element::TYPE_SEQUENCE)); |
|
86 | - // directoryName |
|
87 | - case self::TAG_DIRECTORY_NAME: |
|
88 | - // because Name is a CHOICE, albeit having only one option, |
|
89 | - // explicit tagging must be used |
|
90 | - // (see X.680 07/2002 30.6.c) |
|
91 | - return DirectoryName::fromChosenASN1($el->asExplicit()); |
|
92 | - // ediPartyName |
|
93 | - case self::TAG_EDI_PARTY_NAME: |
|
94 | - return EDIPartyName::fromChosenASN1( |
|
95 | - $el->asImplicit(Element::TYPE_SEQUENCE)); |
|
96 | - // uniformResourceIdentifier |
|
97 | - case self::TAG_URI: |
|
98 | - return UniformResourceIdentifier::fromChosenASN1( |
|
99 | - $el->asImplicit(Element::TYPE_IA5_STRING)); |
|
100 | - // iPAddress |
|
101 | - case self::TAG_IP_ADDRESS: |
|
102 | - return IPAddress::fromChosenASN1( |
|
103 | - $el->asImplicit(Element::TYPE_OCTET_STRING)); |
|
104 | - // registeredID |
|
105 | - case self::TAG_REGISTERED_ID: |
|
106 | - return RegisteredID::fromChosenASN1( |
|
107 | - $el->asImplicit(Element::TYPE_OBJECT_IDENTIFIER)); |
|
71 | + case self::TAG_OTHER_NAME: |
|
72 | + return OtherName::fromChosenASN1( |
|
73 | + $el->asImplicit(Element::TYPE_SEQUENCE)); |
|
74 | + // rfc822Name |
|
75 | + case self::TAG_RFC822_NAME: |
|
76 | + return RFC822Name::fromChosenASN1( |
|
77 | + $el->asImplicit(Element::TYPE_IA5_STRING)); |
|
78 | + // dNSName |
|
79 | + case self::TAG_DNS_NAME: |
|
80 | + return DNSName::fromChosenASN1( |
|
81 | + $el->asImplicit(Element::TYPE_IA5_STRING)); |
|
82 | + // x400Address |
|
83 | + case self::TAG_X400_ADDRESS: |
|
84 | + return X400Address::fromChosenASN1( |
|
85 | + $el->asImplicit(Element::TYPE_SEQUENCE)); |
|
86 | + // directoryName |
|
87 | + case self::TAG_DIRECTORY_NAME: |
|
88 | + // because Name is a CHOICE, albeit having only one option, |
|
89 | + // explicit tagging must be used |
|
90 | + // (see X.680 07/2002 30.6.c) |
|
91 | + return DirectoryName::fromChosenASN1($el->asExplicit()); |
|
92 | + // ediPartyName |
|
93 | + case self::TAG_EDI_PARTY_NAME: |
|
94 | + return EDIPartyName::fromChosenASN1( |
|
95 | + $el->asImplicit(Element::TYPE_SEQUENCE)); |
|
96 | + // uniformResourceIdentifier |
|
97 | + case self::TAG_URI: |
|
98 | + return UniformResourceIdentifier::fromChosenASN1( |
|
99 | + $el->asImplicit(Element::TYPE_IA5_STRING)); |
|
100 | + // iPAddress |
|
101 | + case self::TAG_IP_ADDRESS: |
|
102 | + return IPAddress::fromChosenASN1( |
|
103 | + $el->asImplicit(Element::TYPE_OCTET_STRING)); |
|
104 | + // registeredID |
|
105 | + case self::TAG_REGISTERED_ID: |
|
106 | + return RegisteredID::fromChosenASN1( |
|
107 | + $el->asImplicit(Element::TYPE_OBJECT_IDENTIFIER)); |
|
108 | 108 | } |
109 | 109 | throw new \UnexpectedValueException( |
110 | 110 | "GeneralName type " . $el->tag() . " not supported."); |
@@ -67,10 +67,10 @@ |
||
67 | 67 | ->asObjectIdentifier() |
68 | 68 | ->oid(); |
69 | 69 | switch ($oid) { |
70 | - case self::OID_CPS: |
|
71 | - return CPSQualifier::fromQualifierASN1($seq->at(1)); |
|
72 | - case self::OID_UNOTICE: |
|
73 | - return UserNoticeQualifier::fromQualifierASN1($seq->at(1)); |
|
70 | + case self::OID_CPS: |
|
71 | + return CPSQualifier::fromQualifierASN1($seq->at(1)); |
|
72 | + case self::OID_UNOTICE: |
|
73 | + return UserNoticeQualifier::fromQualifierASN1($seq->at(1)); |
|
74 | 74 | } |
75 | 75 | throw new \UnexpectedValueException("Qualifier $oid not supported."); |
76 | 76 | } |
@@ -72,9 +72,9 @@ |
||
72 | 72 | } |
73 | 73 | $tagged = $el->asTagged(); |
74 | 74 | switch ($tagged->tag()) { |
75 | - case 0: |
|
76 | - return V2Form::fromV2ASN1( |
|
77 | - $tagged->asImplicit(Element::TYPE_SEQUENCE)->asSequence()); |
|
75 | + case 0: |
|
76 | + return V2Form::fromV2ASN1( |
|
77 | + $tagged->asImplicit(Element::TYPE_SEQUENCE)->asSequence()); |
|
78 | 78 | } |
79 | 79 | throw new \UnexpectedValueException("Unsupported issuer type."); |
80 | 80 | } |
@@ -89,16 +89,16 @@ |
||
89 | 89 | { |
90 | 90 | $dt = $this->_dt; |
91 | 91 | switch ($this->_type) { |
92 | - case Element::TYPE_UTC_TIME: |
|
93 | - return new UTCTime($dt); |
|
94 | - case Element::TYPE_GENERALIZED_TIME: |
|
95 | - // GeneralizedTime must not contain fractional seconds |
|
96 | - // (rfc5280 4.1.2.5.2) |
|
97 | - if ($dt->format("u") != 0) { |
|
98 | - // remove fractional seconds (round down) |
|
99 | - $dt = self::_roundDownFractionalSeconds($dt); |
|
100 | - } |
|
101 | - return new GeneralizedTime($dt); |
|
92 | + case Element::TYPE_UTC_TIME: |
|
93 | + return new UTCTime($dt); |
|
94 | + case Element::TYPE_GENERALIZED_TIME: |
|
95 | + // GeneralizedTime must not contain fractional seconds |
|
96 | + // (rfc5280 4.1.2.5.2) |
|
97 | + if ($dt->format("u") != 0) { |
|
98 | + // remove fractional seconds (round down) |
|
99 | + $dt = self::_roundDownFractionalSeconds($dt); |
|
100 | + } |
|
101 | + return new GeneralizedTime($dt); |
|
102 | 102 | } |
103 | 103 | throw new \UnexpectedValueException( |
104 | 104 | "Time type " . Element::tagToName($this->_type) . " not supported."); |
@@ -60,13 +60,13 @@ |
||
60 | 60 | public static function fromASN1(TaggedType $el): self |
61 | 61 | { |
62 | 62 | switch ($el->tag()) { |
63 | - case self::TYPE_NAME: |
|
64 | - return TargetName::fromChosenASN1($el->asExplicit()->asTagged()); |
|
65 | - case self::TYPE_GROUP: |
|
66 | - return TargetGroup::fromChosenASN1( |
|
67 | - $el->asExplicit()->asTagged()); |
|
68 | - case self::TYPE_CERT: |
|
69 | - throw new \RuntimeException("targetCert not supported."); |
|
63 | + case self::TYPE_NAME: |
|
64 | + return TargetName::fromChosenASN1($el->asExplicit()->asTagged()); |
|
65 | + case self::TYPE_GROUP: |
|
66 | + return TargetGroup::fromChosenASN1( |
|
67 | + $el->asExplicit()->asTagged()); |
|
68 | + case self::TYPE_CERT: |
|
69 | + throw new \RuntimeException("targetCert not supported."); |
|
70 | 70 | } |
71 | 71 | throw new \UnexpectedValueException( |
72 | 72 | "Target type " . $el->tag() . " not supported."); |
@@ -86,17 +86,17 @@ |
||
86 | 86 | public function toASN1(): StringType |
87 | 87 | { |
88 | 88 | switch ($this->_tag) { |
89 | - case Element::TYPE_IA5_STRING: |
|
90 | - return new IA5String($this->_text); |
|
91 | - case Element::TYPE_VISIBLE_STRING: |
|
92 | - return new VisibleString($this->_text); |
|
93 | - case Element::TYPE_BMP_STRING: |
|
94 | - return new BMPString($this->_text); |
|
95 | - case Element::TYPE_UTF8_STRING: |
|
96 | - return new UTF8String($this->_text); |
|
97 | - default: |
|
98 | - throw new \UnexpectedValueException( |
|
99 | - "Type " . Element::tagToName($this->_tag) . " not supported."); |
|
89 | + case Element::TYPE_IA5_STRING: |
|
90 | + return new IA5String($this->_text); |
|
91 | + case Element::TYPE_VISIBLE_STRING: |
|
92 | + return new VisibleString($this->_text); |
|
93 | + case Element::TYPE_BMP_STRING: |
|
94 | + return new BMPString($this->_text); |
|
95 | + case Element::TYPE_UTF8_STRING: |
|
96 | + return new UTF8String($this->_text); |
|
97 | + default: |
|
98 | + throw new \UnexpectedValueException( |
|
99 | + "Type " . Element::tagToName($this->_tag) . " not supported."); |
|
100 | 100 | } |
101 | 101 | } |
102 | 102 |