|
@@ -154,7 +154,7 @@ discard block |
|
|
block discarded – undo |
|
154
|
154
|
*/ |
|
155
|
155
|
public static function verifyFile($file) |
|
156
|
156
|
{ |
|
157
|
|
- $shellCommand = 'yes "n" 2> '.self::getDevNull().' | ' . escapeshellarg(self::$cryptcpExec) . ' -verify -verall ' . escapeshellarg($file); |
|
|
157
|
+ $shellCommand = 'yes "n" 2> ' . self::getDevNull() . ' | ' . escapeshellarg(self::$cryptcpExec) . ' -verify -verall ' . escapeshellarg($file); |
|
158
|
158
|
$result = shell_exec($shellCommand); |
|
159
|
159
|
if (strpos($result, "[ErrorCode: 0x00000000]") === false && strpos($result, "[ReturnCode: 0]") === false) { |
|
160
|
160
|
preg_match('#\[ErrorCode: (.+)\]#', $result, $matches); |
|
@@ -177,7 +177,7 @@ discard block |
|
|
block discarded – undo |
|
177
|
177
|
public static function verifyFileDetached($fileSign, $fileToBeSigned) |
|
178
|
178
|
{ |
|
179
|
179
|
//Пример cryptcp.exe -verify y:\text.txt -detached -nochain -f y:\signature.sig -dir y:\ |
|
180
|
|
- $shellCommand = 'yes "n" 2> '.self::getDevNull() . ' | ' . escapeshellarg(self::$cryptcpExec) . ' -verify -verall ' . escapeshellarg($fileSign) |
|
|
180
|
+ $shellCommand = 'yes "n" 2> ' . self::getDevNull() . ' | ' . escapeshellarg(self::$cryptcpExec) . ' -verify -verall ' . escapeshellarg($fileSign) |
|
181
|
181
|
. ' -detached -f ' . escapeshellarg($fileToBeSigned); |
|
182
|
182
|
$result = shell_exec($shellCommand); |
|
183
|
183
|
if (strpos($result, "[ErrorCode: 0x00000000]") === false && strpos($result, "[ReturnCode: 0]") === false) { |
Please login to merge, or discard this patch.