@@ -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 | } |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | protected static function _wordsToIPv6String(array $words): string |
| 41 | 41 | { |
| 42 | 42 | $groups = array_map( |
| 43 | - function ($word) { |
|
| 43 | + function($word) { |
|
| 44 | 44 | return sprintf("%04x", $word); |
| 45 | 45 | }, $words); |
| 46 | 46 | return implode(":", $groups); |
@@ -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."); |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | ->asImplicit(Element::TYPE_SEQUENCE) |
| 92 | 92 | ->asSequence(); |
| 93 | 93 | $permitted = array_map( |
| 94 | - function (UnspecifiedType $el) { |
|
| 94 | + function(UnspecifiedType $el) { |
|
| 95 | 95 | return $el->asObjectIdentifier()->oid(); |
| 96 | 96 | }, $attr_seq->elements()); |
| 97 | 97 | $idx++; |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | ->asImplicit(Element::TYPE_SEQUENCE) |
| 102 | 102 | ->asSequence(); |
| 103 | 103 | $excluded = array_map( |
| 104 | - function (UnspecifiedType $el) { |
|
| 104 | + function(UnspecifiedType $el) { |
|
| 105 | 105 | return $el->asObjectIdentifier()->oid(); |
| 106 | 106 | }, $attr_seq->elements()); |
| 107 | 107 | $idx++; |
@@ -211,14 +211,14 @@ discard block |
||
| 211 | 211 | } |
| 212 | 212 | if (isset($this->_permittedAttrs)) { |
| 213 | 213 | $oids = array_map( |
| 214 | - function ($oid) { |
|
| 214 | + function($oid) { |
|
| 215 | 215 | return new ObjectIdentifier($oid); |
| 216 | 216 | }, $this->_permittedAttrs); |
| 217 | 217 | $elements[] = new ImplicitlyTaggedType(0, new Sequence(...$oids)); |
| 218 | 218 | } |
| 219 | 219 | if (isset($this->_excludedAttrs)) { |
| 220 | 220 | $oids = array_map( |
| 221 | - function ($oid) { |
|
| 221 | + function($oid) { |
|
| 222 | 222 | return new ObjectIdentifier($oid); |
| 223 | 223 | }, $this->_excludedAttrs); |
| 224 | 224 | $elements[] = new ImplicitlyTaggedType(1, new Sequence(...$oids)); |
@@ -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 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | $qualifiers = array(); |
| 65 | 65 | if (count($seq) > 1) { |
| 66 | 66 | $qualifiers = array_map( |
| 67 | - function (UnspecifiedType $el) { |
|
| 67 | + function(UnspecifiedType $el) { |
|
| 68 | 68 | return PolicyQualifierInfo::fromASN1($el->asSequence()); |
| 69 | 69 | }, |
| 70 | 70 | $seq->at(1) |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | $elements = array(new ObjectIdentifier($this->_oid)); |
| 189 | 189 | if (count($this->_qualifiers)) { |
| 190 | 190 | $qualifiers = array_map( |
| 191 | - function (PolicyQualifierInfo $pqi) { |
|
| 191 | + function(PolicyQualifierInfo $pqi) { |
|
| 192 | 192 | return $pqi->toASN1(); |
| 193 | 193 | }, array_values($this->_qualifiers)); |
| 194 | 194 | $elements[] = new Sequence(...$qualifiers); |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | { |
| 74 | 74 | $oid = AttributeType::attrNameToOID($name); |
| 75 | 75 | $attrs = array_filter($this->_attributes, |
| 76 | - function (Attribute $attr) use ($oid) { |
|
| 76 | + function(Attribute $attr) use ($oid) { |
|
| 77 | 77 | return $attr->oid() == $oid; |
| 78 | 78 | }); |
| 79 | 79 | return array_values($attrs); |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | { |
| 117 | 117 | $obj = clone $this; |
| 118 | 118 | $obj->_attributes = array_filter($obj->_attributes, |
| 119 | - function (Attribute $a) use ($attr) { |
|
| 119 | + function(Attribute $a) use ($attr) { |
|
| 120 | 120 | return $a->oid() != $attr->oid(); |
| 121 | 121 | }); |
| 122 | 122 | $obj->_attributes[] = $attr; |
@@ -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 | } |