@@ -40,7 +40,7 @@ |
||
| 40 | 40 | * @param Certificate $certificate |
| 41 | 41 | * @param string $content xml for signed |
| 42 | 42 | * @param string $tagname |
| 43 | - * @param string $marker for URI (opcional) |
|
| 43 | + * @param string $mark for URI (opcional) |
|
| 44 | 44 | * @param string $algorithm (opcional) |
| 45 | 45 | * @param array $canonical parameters to format node for signature (opcional) |
| 46 | 46 | * @param string $rootname name of tag to insert signature block (opcional) |
@@ -25,11 +25,9 @@ |
||
| 25 | 25 | use NFePHP\Common\Certificate; |
| 26 | 26 | use NFePHP\Common\Certificate\PublicKey; |
| 27 | 27 | use NFePHP\Common\Exception\SignerException; |
| 28 | -use NFePHP\Common\Strings; |
|
| 29 | 28 | use NFePHP\Common\Validator; |
| 30 | 29 | use DOMDocument; |
| 31 | 30 | use DOMNode; |
| 32 | -use DOMElement; |
|
| 33 | 31 | |
| 34 | 32 | class Signer |
| 35 | 33 | { |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | class Signer |
| 35 | 35 | { |
| 36 | - private static $canonical = [true,false,null,null]; |
|
| 36 | + private static $canonical = [true, false, null, null]; |
|
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | 39 | * Make Signature tag |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | $tagname, |
| 54 | 54 | $mark = 'Id', |
| 55 | 55 | $algorithm = OPENSSL_ALGO_SHA1, |
| 56 | - $canonical = [true,false,null,null], |
|
| 56 | + $canonical = [true, false, null, null], |
|
| 57 | 57 | $rootname = '' |
| 58 | 58 | ) { |
| 59 | 59 | if (!empty($canonical)) { |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | if (empty($content)) { |
| 63 | 63 | throw SignerException::isNotXml(); |
| 64 | 64 | } |
| 65 | - if (! Validator::isXML($content)) { |
|
| 65 | + if (!Validator::isXML($content)) { |
|
| 66 | 66 | throw SignerException::isNotXml(); |
| 67 | 67 | } |
| 68 | 68 | $dom = new DOMDocument('1.0', 'UTF-8'); |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | if (empty($node) || empty($root)) { |
| 78 | 78 | throw SignerException::tagNotFound($tagname); |
| 79 | 79 | } |
| 80 | - if (! self::existsSignature($content)) { |
|
| 80 | + if (!self::existsSignature($content)) { |
|
| 81 | 81 | $dom = self::createSignature( |
| 82 | 82 | $certificate, |
| 83 | 83 | $dom, |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | DOMNode $node, |
| 111 | 111 | $mark, |
| 112 | 112 | $algorithm = OPENSSL_ALGO_SHA1, |
| 113 | - $canonical = [true,false,null,null] |
|
| 113 | + $canonical = [true, false, null, null] |
|
| 114 | 114 | ) { |
| 115 | 115 | $nsDSIG = 'http://www.w3.org/2000/09/xmldsig#'; |
| 116 | 116 | $nsCannonMethod = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315'; |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | $nsSignatureMethod = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256'; |
| 123 | 123 | $nsDigestMethod = 'http://www.w3.org/2001/04/xmlenc#sha256'; |
| 124 | 124 | } |
| 125 | - $nsTransformMethod1 ='http://www.w3.org/2000/09/xmldsig#enveloped-signature'; |
|
| 125 | + $nsTransformMethod1 = 'http://www.w3.org/2000/09/xmldsig#enveloped-signature'; |
|
| 126 | 126 | $nsTransformMethod2 = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315'; |
| 127 | 127 | $idSigned = trim($node->getAttribute($mark)); |
| 128 | 128 | $digestValue = self::makeDigest($node, $digestAlgorithm, $canonical); |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | */ |
| 178 | 178 | public static function removeSignature($content) |
| 179 | 179 | { |
| 180 | - if (! self::existsSignature($content)) { |
|
| 180 | + if (!self::existsSignature($content)) { |
|
| 181 | 181 | return $content; |
| 182 | 182 | } |
| 183 | 183 | $dom = new \DOMDocument('1.0', 'utf-8'); |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | public static function isSigned( |
| 206 | 206 | $content, |
| 207 | 207 | $tagname = '', |
| 208 | - $canonical = [true,false,null,null] |
|
| 208 | + $canonical = [true, false, null, null] |
|
| 209 | 209 | ) { |
| 210 | 210 | if (self::existsSignature($content)) { |
| 211 | 211 | if (self::digestCheck($content, $tagname, $canonical)) { |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | */ |
| 225 | 225 | public static function existsSignature($content) |
| 226 | 226 | { |
| 227 | - if (! Validator::isXML($content)) { |
|
| 227 | + if (!Validator::isXML($content)) { |
|
| 228 | 228 | throw SignerException::isNotXml(); |
| 229 | 229 | } |
| 230 | 230 | $dom = new \DOMDocument('1.0', 'utf-8'); |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | */ |
| 247 | 247 | private static function signatureCheck( |
| 248 | 248 | $xml, |
| 249 | - $canonical = [true,false,null,null] |
|
| 249 | + $canonical = [true, false, null, null] |
|
| 250 | 250 | ) { |
| 251 | 251 | $dom = new \DOMDocument('1.0', 'utf-8'); |
| 252 | 252 | $dom->formatOutput = false; |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | $decodedSignature = base64_decode( |
| 273 | 273 | str_replace(array("\r", "\n"), '', $signatureValue) |
| 274 | 274 | ); |
| 275 | - if (! $publicKey->verify($signInfoNode, $decodedSignature, $algorithm)) { |
|
| 275 | + if (!$publicKey->verify($signInfoNode, $decodedSignature, $algorithm)) { |
|
| 276 | 276 | throw SignerException::signatureComparisonFailed(); |
| 277 | 277 | } |
| 278 | 278 | return true; |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | private static function digestCheck( |
| 289 | 289 | $xml, |
| 290 | 290 | $tagname = '', |
| 291 | - $canonical = [true,false,null,null] |
|
| 291 | + $canonical = [true, false, null, null] |
|
| 292 | 292 | ) { |
| 293 | 293 | $dom = new \DOMDocument('1.0', 'utf-8'); |
| 294 | 294 | $dom->formatOutput = false; |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | private static function makeDigest( |
| 345 | 345 | DOMNode $node, |
| 346 | 346 | $algorithm, |
| 347 | - $canonical = [true,false,null,null] |
|
| 347 | + $canonical = [true, false, null, null] |
|
| 348 | 348 | ) { |
| 349 | 349 | //calcular o hash dos dados |
| 350 | 350 | $c14n = self::canonize($node, $canonical); |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | */ |
| 361 | 361 | private static function canonize( |
| 362 | 362 | DOMNode $node, |
| 363 | - $canonical = [true,false,null,null] |
|
| 363 | + $canonical = [true, false, null, null] |
|
| 364 | 364 | ) { |
| 365 | 365 | return $node->C14N( |
| 366 | 366 | $canonical[0], |
@@ -20,13 +20,13 @@ |
||
| 20 | 20 | public static function digestComparisonFailed() |
| 21 | 21 | { |
| 22 | 22 | return new static('The XML content does not match the Digest Value. ' |
| 23 | - . 'Probably modified after it was signed'); |
|
| 23 | + . 'Probably modified after it was signed'); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | public static function signatureComparisonFailed() |
| 27 | 27 | { |
| 28 | 28 | return new static('The XML SIGNATURE does not match. ' |
| 29 | - . 'Probably modified after it was signed.'); |
|
| 29 | + . 'Probably modified after it was signed.'); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | |