Merge pull request #1 from iZucken/master

Замалчивание ошибок yes
nikserg · Jun 19, 2020 · 5b0b924 · 5b0b924
2 parents ff47922 + 91757c6
commit 5b0b924
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/CryptoProCli.php b/CryptoProCli.php
@@ -103,6 +103,14 @@ public static function verifyFileContent($fileContent)
         }
     }
 
+    private static function getDevNull()
+    {
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+            return 'NUL';
+        }
+        return '/dev/null';
+    }
+
     /**
      * Проверить, что файл подписан правильной подписью
      *
@@ -112,8 +120,7 @@ public static function verifyFileContent($fileContent)
      */
     public static function verifyFile($file)
     {
-        $shellCommand = 'yes "n" | ' . self::getCryptcpExec() .
-            ' -verify -verall ' . $file;
+        $shellCommand = 'yes "n" 2> '.self::getDevNull().' | ' . escapeshellarg(self::$cryptcpExec) . ' -verify -verall ' . escapeshellarg($file);
         $result = shell_exec($shellCommand);
         if (strpos($result, "[ErrorCode: 0x00000000]") === false && strpos($result, "[ReturnCode: 0]") === false) {
             //Проверка неуспешна