@@ -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 | |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | "GeneralNames must have at least one GeneralName."); |
| 47 | 47 | } |
| 48 | 48 | $names = array_map( |
| 49 | - function (UnspecifiedType $el) { |
|
| 49 | + function(UnspecifiedType $el) { |
|
| 50 | 50 | return GeneralName::fromASN1($el->asTagged()); |
| 51 | 51 | }, $seq->elements()); |
| 52 | 52 | return new self(...$names); |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | public function allOf($tag) |
| 105 | 105 | { |
| 106 | 106 | $names = array_filter($this->_names, |
| 107 | - function (GeneralName $name) use ($tag) { |
|
| 107 | + function(GeneralName $name) use ($tag) { |
|
| 108 | 108 | return $name->tag() == $tag; |
| 109 | 109 | }); |
| 110 | 110 | return array_values($names); |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | "GeneralNames must have at least one GeneralName."); |
| 169 | 169 | } |
| 170 | 170 | $elements = array_map( |
| 171 | - function (GeneralName $name) { |
|
| 171 | + function(GeneralName $name) { |
|
| 172 | 172 | return $name->toASN1(); |
| 173 | 173 | }, $this->_names); |
| 174 | 174 | return new Sequence(...$elements); |
@@ -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 | } |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | protected static function _wordsToIPv6String(array $words) |
| 39 | 39 | { |
| 40 | 40 | $groups = array_map( |
| 41 | - function ($word) { |
|
| 41 | + function($word) { |
|
| 42 | 42 | return sprintf("%04x", $word); |
| 43 | 43 | }, $words); |
| 44 | 44 | 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."); |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | public static function fromPEMs(PEM ...$pems) |
| 38 | 38 | { |
| 39 | 39 | $certs = array_map( |
| 40 | - function (PEM $pem) { |
|
| 40 | + function(PEM $pem) { |
|
| 41 | 41 | return Certificate::fromPEM($pem); |
| 42 | 42 | }, $pems); |
| 43 | 43 | return new self(...$certs); |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | { |
| 114 | 114 | return implode("\n", |
| 115 | 115 | array_map( |
| 116 | - function (Certificate $cert) { |
|
| 116 | + function(Certificate $cert) { |
|
| 117 | 117 | return $cert->toPEM()->string(); |
| 118 | 118 | }, $this->_certs)); |
| 119 | 119 | } |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | public static function fromASN1(Sequence $seq) |
| 46 | 46 | { |
| 47 | 47 | $extensions = array_map( |
| 48 | - function (UnspecifiedType $el) { |
|
| 48 | + function(UnspecifiedType $el) { |
|
| 49 | 49 | return Extension::fromASN1($el->asSequence()); |
| 50 | 50 | }, $seq->elements()); |
| 51 | 51 | return new self(...$extensions); |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | { |
| 61 | 61 | $elements = array_values( |
| 62 | 62 | array_map( |
| 63 | - function ($ext) { |
|
| 63 | + function($ext) { |
|
| 64 | 64 | return $ext->toASN1(); |
| 65 | 65 | }, $this->_extensions)); |
| 66 | 66 | return new Sequence(...$elements); |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | public static function fromPEMs(PEM ...$pems) |
| 52 | 52 | { |
| 53 | 53 | $certs = array_map( |
| 54 | - function ($pem) { |
|
| 54 | + function($pem) { |
|
| 55 | 55 | return Certificate::fromPEM($pem); |
| 56 | 56 | }, $pems); |
| 57 | 57 | return new self(...$certs); |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | public static function fromASN1(Sequence $seq) |
| 40 | 40 | { |
| 41 | 41 | $subtrees = array_map( |
| 42 | - function (UnspecifiedType $el) { |
|
| 42 | + function(UnspecifiedType $el) { |
|
| 43 | 43 | return GeneralSubtree::fromASN1($el->asSequence()); |
| 44 | 44 | }, $seq->elements()); |
| 45 | 45 | if (!count($subtrees)) { |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | throw new \LogicException("No subtrees."); |
| 71 | 71 | } |
| 72 | 72 | $elements = array_map( |
| 73 | - function (GeneralSubtree $gs) { |
|
| 73 | + function(GeneralSubtree $gs) { |
|
| 74 | 74 | return $gs->toASN1(); |
| 75 | 75 | }, $this->_subtrees); |
| 76 | 76 | return new Sequence(...$elements); |