update patch 1
This commit is contained in:
+2
-2
@@ -62,7 +62,7 @@ final class DkimSigner
|
||||
{
|
||||
$options += $this->defaultOptions;
|
||||
if (!\in_array($options['algorithm'], [self::ALGO_SHA256, self::ALGO_ED25519], true)) {
|
||||
throw new InvalidArgumentException(sprintf('Invalid DKIM signing algorithm "%s".', $options['algorithm']));
|
||||
throw new InvalidArgumentException(\sprintf('Invalid DKIM signing algorithm "%s".', $options['algorithm']));
|
||||
}
|
||||
$headersToIgnore['return-path'] = true;
|
||||
$headersToIgnore['x-transport'] = true;
|
||||
@@ -119,7 +119,7 @@ final class DkimSigner
|
||||
throw new RuntimeException('Unable to sign DKIM hash: '.openssl_error_string());
|
||||
}
|
||||
} else {
|
||||
throw new \RuntimeException(sprintf('The "%s" DKIM signing algorithm is not supported yet.', self::ALGO_ED25519));
|
||||
throw new \RuntimeException(\sprintf('The "%s" DKIM signing algorithm is not supported yet.', self::ALGO_ED25519));
|
||||
}
|
||||
$header->setValue($value.' b='.trim(chunk_split(base64_encode($signature), 73, ' ')));
|
||||
$headers->add($header);
|
||||
|
||||
Vendored
+1
-1
@@ -24,7 +24,7 @@ abstract class SMime
|
||||
protected function normalizeFilePath(string $path): string
|
||||
{
|
||||
if (!file_exists($path)) {
|
||||
throw new RuntimeException(sprintf('File does not exist: "%s".', $path));
|
||||
throw new RuntimeException(\sprintf('File does not exist: "%s".', $path));
|
||||
}
|
||||
|
||||
return 'file://'.str_replace('\\', '/', realpath($path));
|
||||
|
||||
+1
-1
@@ -49,7 +49,7 @@ final class SMimeEncrypter extends SMime
|
||||
$this->iteratorToFile($message->toIterable(), $bufferFile);
|
||||
|
||||
if (!@openssl_pkcs7_encrypt(stream_get_meta_data($bufferFile)['uri'], stream_get_meta_data($outputFile)['uri'], $this->certs, [], 0, $this->cipher)) {
|
||||
throw new RuntimeException(sprintf('Failed to encrypt S/Mime message. Error: "%s".', openssl_error_string()));
|
||||
throw new RuntimeException(\sprintf('Failed to encrypt S/Mime message. Error: "%s".', openssl_error_string()));
|
||||
}
|
||||
|
||||
$mimePart = $this->convertMessageToSMimePart($outputFile, 'application', 'pkcs7-mime');
|
||||
|
||||
+1
-1
@@ -57,7 +57,7 @@ final class SMimeSigner extends SMime
|
||||
$this->iteratorToFile($message->getBody()->toIterable(), $bufferFile);
|
||||
|
||||
if (!@openssl_pkcs7_sign(stream_get_meta_data($bufferFile)['uri'], stream_get_meta_data($outputFile)['uri'], $this->signCertificate, $this->signPrivateKey, [], $this->signOptions, $this->extraCerts)) {
|
||||
throw new RuntimeException(sprintf('Failed to sign S/Mime message. Error: "%s".', openssl_error_string()));
|
||||
throw new RuntimeException(\sprintf('Failed to sign S/Mime message. Error: "%s".', openssl_error_string()));
|
||||
}
|
||||
|
||||
return new Message($message->getHeaders(), $this->convertMessageToSMimePart($outputFile, 'multipart', 'signed'));
|
||||
|
||||
Reference in New Issue
Block a user