@@ -50,6 +50,7 @@ |
||
| 50 | 50 | * @param Crypto $crypto |
| 51 | 51 | * @param PathValidationConfig $config |
| 52 | 52 | * @param Certificate ...$certificates |
| 53 | + * @param Certificate[] $certificates |
|
| 53 | 54 | */ |
| 54 | 55 | public function __construct(Crypto $crypto, PathValidationConfig $config, |
| 55 | 56 | Certificate ...$certificates) { |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use CryptoUtil\Crypto\Crypto; |
| 6 | 6 | use X509\Certificate\Certificate; |
| 7 | -use X509\Certificate\Extension\Extension; |
|
| 8 | 7 | use X509\Certificate\TBSCertificate; |
| 9 | 8 | use X509\CertificationPath\Exception\PathValidationException; |
| 10 | 9 | |
@@ -197,7 +197,6 @@ |
||
| 197 | 197 | * |
| 198 | 198 | * @param Crypto $crypto Crypto engine |
| 199 | 199 | * @param SignatureAlgorithmIdentifier $algo Algorithm used for signing |
| 200 | - * @param PrivateKey $private_key Private key used for signing |
|
| 201 | 200 | * @return CertificationRequest |
| 202 | 201 | */ |
| 203 | 202 | public function sign(Crypto $crypto, SignatureAlgorithmIdentifier $algo, |
@@ -28,6 +28,7 @@ |
||
| 28 | 28 | * Constructor |
| 29 | 29 | * |
| 30 | 30 | * @param GeneralName ...$names One or more GeneralName objects |
| 31 | + * @param GeneralName[] $names |
|
| 31 | 32 | */ |
| 32 | 33 | public function __construct(GeneralName ...$names) { |
| 33 | 34 | $this->_names = $names; |
@@ -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); |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | */ |
| 101 | 101 | public function allOf($tag) { |
| 102 | 102 | $names = array_filter($this->_names, |
| 103 | - function (GeneralName $name) use ($tag) { |
|
| 103 | + function(GeneralName $name) use ($tag) { |
|
| 104 | 104 | return $name->tag() == $tag; |
| 105 | 105 | }); |
| 106 | 106 | return array_values($names); |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | "GeneralNames must have at least one GeneralName."); |
| 145 | 145 | } |
| 146 | 146 | $elements = array_map( |
| 147 | - function (GeneralName $name) { |
|
| 147 | + function(GeneralName $name) { |
|
| 148 | 148 | return $name->toASN1(); |
| 149 | 149 | }, $this->_names); |
| 150 | 150 | return new Sequence(...$elements); |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | |
| 33 | 33 | protected static function _wordsToIPv6String(array $words) { |
| 34 | 34 | $groups = array_map( |
| 35 | - function ($word) { |
|
| 35 | + function($word) { |
|
| 36 | 36 | return sprintf("%04x", $word); |
| 37 | 37 | }, $words); |
| 38 | 38 | return implode(":", $groups); |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | */ |
| 36 | 36 | public static function fromPEMs(PEM ...$pems) { |
| 37 | 37 | $certs = array_map( |
| 38 | - function ($pem) { |
|
| 38 | + function($pem) { |
|
| 39 | 39 | return Certificate::fromPEM($pem); |
| 40 | 40 | }, $pems); |
| 41 | 41 | return new self(...$certs); |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | public function allOf($name) { |
| 71 | 71 | $oid = AttributeType::attrNameToOID($name); |
| 72 | 72 | $attrs = array_filter($this->_attributes, |
| 73 | - function (Attribute $attr) use ($oid) { |
|
| 73 | + function(Attribute $attr) use ($oid) { |
|
| 74 | 74 | return $attr->oid() == $oid; |
| 75 | 75 | }); |
| 76 | 76 | return array_values($attrs); |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | public function withUnique(Attribute $attr) { |
| 111 | 111 | $obj = clone $this; |
| 112 | 112 | $obj->_attributes = array_filter($obj->_attributes, |
| 113 | - function (Attribute $a) use ($attr) { |
|
| 113 | + function(Attribute $a) use ($attr) { |
|
| 114 | 114 | return $a->oid() != $attr->oid(); |
| 115 | 115 | }); |
| 116 | 116 | $obj->_attributes[] = $attr; |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | $paths = $this->_resolvePathsToTarget($target, $intermediate); |
| 46 | 46 | // map paths to CertificationPath objects |
| 47 | 47 | return array_map( |
| 48 | - function ($certs) { |
|
| 48 | + function($certs) { |
|
| 49 | 49 | return new CertificationPath(...$certs); |
| 50 | 50 | }, $paths); |
| 51 | 51 | } |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | throw new PathBuildingException("No certification paths."); |
| 109 | 109 | } |
| 110 | 110 | usort($paths, |
| 111 | - function ($a, $b) { |
|
| 111 | + function($a, $b) { |
|
| 112 | 112 | return count($a) < count($b) ? -1 : 1; |
| 113 | 113 | }); |
| 114 | 114 | return reset($paths); |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | protected static function _fromDER($data, $critical) { |
| 33 | 33 | $attribs = array_map( |
| 34 | - function (UnspecifiedType $el) { |
|
| 34 | + function(UnspecifiedType $el) { |
|
| 35 | 35 | return Attribute::fromASN1($el->asSequence()); |
| 36 | 36 | }, Sequence::fromDER($data)->elements()); |
| 37 | 37 | if (!count($attribs)) { |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | throw new \LogicException("No attributes"); |
| 47 | 47 | } |
| 48 | 48 | $elements = array_map( |
| 49 | - function (Attribute $attr) { |
|
| 49 | + function(Attribute $attr) { |
|
| 50 | 50 | return $attr->toASN1(); |
| 51 | 51 | }, array_values($this->_attributes)); |
| 52 | 52 | return new Sequence(...$elements); |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | protected static function _fromDER($data, $critical) { |
| 50 | 50 | $targets = array_map( |
| 51 | - function (UnspecifiedType $el) { |
|
| 51 | + function(UnspecifiedType $el) { |
|
| 52 | 52 | return Targets::fromASN1($el->asSequence()); |
| 53 | 53 | }, Sequence::fromDER($data)->elements()); |
| 54 | 54 | return new self($critical, ...$targets); |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | */ |
| 78 | 78 | public function names() { |
| 79 | 79 | $targets = array_filter($this->targets(), |
| 80 | - function (Target $target) { |
|
| 80 | + function(Target $target) { |
|
| 81 | 81 | return $target->type() == Target::TYPE_NAME; |
| 82 | 82 | }); |
| 83 | 83 | return array_values($targets); |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | */ |
| 91 | 91 | public function groups() { |
| 92 | 92 | $targets = array_filter($this->targets(), |
| 93 | - function (Target $target) { |
|
| 93 | + function(Target $target) { |
|
| 94 | 94 | return $target->type() == Target::TYPE_GROUP; |
| 95 | 95 | }); |
| 96 | 96 | return array_values($targets); |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | |
| 99 | 99 | protected function _valueASN1() { |
| 100 | 100 | $elements = array_map( |
| 101 | - function (Targets $targets) { |
|
| 101 | + function(Targets $targets) { |
|
| 102 | 102 | return $targets->toASN1(); |
| 103 | 103 | }, $this->_targets); |
| 104 | 104 | return new Sequence(...$elements); |