diff options
Diffstat (limited to 'swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php')
-rw-r--r-- | swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php b/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php index 9a26abd3..ec82dc05 100644 --- a/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php +++ b/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php @@ -469,7 +469,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner */ public function ignoreHeader($header_name) { - $this->ignoredHeaders[strtolower($header_name)] = true; + $this->ignoredHeaders[strtolower($header_name ?? '')] = true; return $this; } @@ -486,7 +486,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner $listHeaders = $headers->listAll(); foreach ($listHeaders as $hName) { // Check if we need to ignore Header - if (!isset($this->ignoredHeaders[strtolower($hName)])) { + if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) { if ($headers->has($hName)) { $tmp = $headers->getAll($hName); foreach ($tmp as $header) { @@ -510,7 +510,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner public function addSignature(Swift_Mime_SimpleHeaderSet $headers) { // Prepare the DKIM-Signature - $params = ['v' => '1', 'a' => $this->hashAlgorithm, 'bh' => base64_encode($this->bodyHash), 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'i' => $this->signerIdentity, 's' => $this->selector]; + $params = ['v' => '1', 'a' => $this->hashAlgorithm, 'bh' => base64_encode($this->bodyHash ?? ''), 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'i' => $this->signerIdentity, 's' => $this->selector]; if ('simple' != $this->bodyCanon) { $params['c'] = $this->headerCanon.'/'.$this->bodyCanon; } elseif ('simple' != $this->headerCanon) { @@ -544,11 +544,11 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner // Add the last DKIM-Signature $tmp = $headers->getAll('DKIM-Signature'); $this->dkimHeader = end($tmp); - $this->addHeader(trim($this->dkimHeader->toString())."\r\n b=", true); + $this->addHeader(trim($this->dkimHeader->toString() ?? '')."\r\n b=", true); if ($this->debugHeaders) { - $headers->addTextHeader('X-DebugHash', base64_encode($this->headerHash)); + $headers->addTextHeader('X-DebugHash', base64_encode($this->headerHash ?? '')); } - $this->dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->getEncryptedHash()), 73, ' '))); + $this->dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->getEncryptedHash() ?? ''), 73, ' '))); return $this; } @@ -649,7 +649,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner private function addToHeaderHash($header) { if ($this->debugHeaders) { - $this->debugHeadersData[] = trim($header); + $this->debugHeadersData[] = trim($header ?? ''); } $this->headerCanonData .= $header; } |