This commit has been accessed 1,066 times via Git panel.
commit 88890ee92210ecb5def20c69aab510bbe035fb78
tree b404ba27e4a32ccf568a077214c4ff6231cf845d
parent f947ab8870c1ea4fdc1e9e8dbdea46289c4d9768
author Engels Antonio <engels@kartero.org> 1443378316 +0800
committer Engels Antonio <engels@kartero.org> 1443378316 +0800
Fix kartero_smime_sign() regex
diff --git a/core.php b/core.php
index 977f22a..8e55e80 100644
--- a/core.php
+++ b/core.php
@@ -652,7 +652,7 @@ function kartero_smime_verify($e) {
function kartero_smime_sign($user, $name, $from, $body, $home, $days = 365) {
- preg_match('/^--.*\n?/m', $body, $matches);
+ preg_match('/^--\S{1,70}\n?/m', $body, $matches);
if (count($matches) > 0) {
$body = 'Content-Type: multipart/mixed; boundary="' . trim(substr($matches[0], 2)) . "\"\n" . $body;
diff --git a/rel.txt b/rel.txt
index a7d6c4f..edcf9d2 100644
--- a/rel.txt
+++ b/rel.txt
@@ -1 +1 @@
-2.0-20150918
+2.0-20150928
tree b404ba27e4a32ccf568a077214c4ff6231cf845d
parent f947ab8870c1ea4fdc1e9e8dbdea46289c4d9768
author Engels Antonio <engels@kartero.org> 1443378316 +0800
committer Engels Antonio <engels@kartero.org> 1443378316 +0800
Fix kartero_smime_sign() regex
diff --git a/core.php b/core.php
index 977f22a..8e55e80 100644
--- a/core.php
+++ b/core.php
@@ -652,7 +652,7 @@ function kartero_smime_verify($e) {
function kartero_smime_sign($user, $name, $from, $body, $home, $days = 365) {
- preg_match('/^--.*\n?/m', $body, $matches);
+ preg_match('/^--\S{1,70}\n?/m', $body, $matches);
if (count($matches) > 0) {
$body = 'Content-Type: multipart/mixed; boundary="' . trim(substr($matches[0], 2)) . "\"\n" . $body;
diff --git a/rel.txt b/rel.txt
index a7d6c4f..edcf9d2 100644
--- a/rel.txt
+++ b/rel.txt
@@ -1 +1 @@
-2.0-20150918
+2.0-20150928