Completed
Pull Request — master (#19)
by Michael
09:53
created
src/OpensslStatic.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,6 +102,6 @@
 block discarded – undo
102 102
         $chk = \hash_hmac($algo, $msg, $key->authenticationKey(), true);
103 103
 
104 104
         // Return iv + checksum + tag + cyphertext
105
-        return $ivr . $chk . $tag . $msg;
105
+        return $ivr.$chk.$tag.$msg;
106 106
     }
107 107
 }
Please login to merge, or discard this patch.
src/Aes256Ecb.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,8 @@
 block discarded – undo
23 23
  * @license  http://opensource.org/licenses/MIT The MIT License (MIT)
24 24
  * @link     https://github.com/mmeyer2k/dcrypt
25 25
  */
26
-class Aes256Ecb extends Aes256Gcm
27
-{
26
+class Aes256Ecb extends Aes256Gcm
27
+{
28 28
     /**
29 29
      * AES-256 cipher identifier that will be passed to openssl
30 30
      *
Please login to merge, or discard this patch.
examples/vectors.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 use \Dcrypt\OpensslStatic;
4 4
 
5
-require __DIR__ . '/../vendor/autoload.php';
5
+require __DIR__.'/../vendor/autoload.php';
6 6
 
7 7
 $out = [];
8 8
 
@@ -14,12 +14,12 @@  discard block
 block discarded – undo
14 14
 
15 15
     try {
16 16
         $out[$cipher] = base64_encode(OpensslStatic::encrypt('hello', 'world', $cipher, 'sha256', 10));
17
-    } catch (\Exception|\Error $e) {
17
+    } catch (\Exception | \Error $e) {
18 18
 
19 19
     }
20 20
 }
21 21
 
22
-file_put_contents(__DIR__ . '/../tests/vectors/openssl-static-ciphers.json', \json_encode($out, JSON_PRETTY_PRINT));
22
+file_put_contents(__DIR__.'/../tests/vectors/openssl-static-ciphers.json', \json_encode($out, JSON_PRETTY_PRINT));
23 23
 
24 24
 $out = [];
25 25
 
@@ -31,4 +31,4 @@  discard block
 block discarded – undo
31 31
     $out[$algo] = base64_encode(OpensslStatic::encrypt('hello', 'world', 'aes-256-gcm', $algo, 10));
32 32
 }
33 33
 
34
-file_put_contents(__DIR__ . '/../tests/vectors/openssl-static-algos.json', \json_encode($out, JSON_PRETTY_PRINT));
35 34
\ No newline at end of file
35
+file_put_contents(__DIR__.'/../tests/vectors/openssl-static-algos.json', \json_encode($out, JSON_PRETTY_PRINT));
36 36
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 
9 9
 foreach (\Dcrypt\OpensslSupported::ciphers() as $cipher) {
10 10
     $cipher = strtolower($cipher);
11
-    if (isset($out[$cipher])) {
11
+    if (isset($out[$cipher])) {
12 12
         continue;
13 13
     }
14 14
 
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
 foreach (\Dcrypt\OpensslSupported::algos() as $algo) {
27 27
     $cipher = strtolower($algo);
28
-    if (isset($out[$algo])) {
28
+    if (isset($out[$algo])) {
29 29
         continue;
30 30
     }
31 31
     $out[$algo] = base64_encode(OpensslStatic::encrypt('hello', 'world', 'aes-256-gcm', $algo, 10));
Please login to merge, or discard this patch.
examples/TinyFish.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,8 +7,8 @@
 block discarded – undo
7 7
  *
8 8
  * This is useful for medium security situations where minimal space consumption is important.
9 9
  */
10
-class TinyFish extends \Dcrypt\OpensslBridge
11
-{
10
+class TinyFish extends \Dcrypt\OpensslBridge
11
+{
12 12
     /**
13 13
      * Specify using blowfish ofb cipher method
14 14
      *
Please login to merge, or discard this patch.
examples/Aes256Base64.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-class Aes256Base64 extends \Dcrypt\OpensslBridge
4
-{
3
+class Aes256Base64 extends \Dcrypt\OpensslBridge
4
+{
5 5
     const CIPHER = 'aes-256-cfb';
6 6
 
7 7
     const ALGO = 'sha256';
Please login to merge, or discard this patch.
src/OpensslKeyGenerator.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
102 102
      */
103 103
     public function deriveKey(string $authinfo): string
104 104
     {
105
-        $key = \hash_hkdf($this->algo, $this->key, 0, ($authinfo . '|' . $this->cipher), $this->ivr);
105
+        $key = \hash_hkdf($this->algo, $this->key, 0, ($authinfo.'|'.$this->cipher), $this->ivr);
106 106
 
107 107
         if ($key === false) {
108 108
             throw new \Exception("Hash algo $this->algo is not supported");
Please login to merge, or discard this patch.
Braces   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
23 23
  * @license  http://opensource.org/licenses/MIT The MIT License (MIT)
24 24
  * @link     https://github.com/mmeyer2k/dcrypt
25 25
  */
26
-final class OpensslKeyGenerator
27
-{
26
+final class OpensslKeyGenerator
27
+{
28 28
     /**
29 29
      * @var string
30 30
      */
@@ -54,16 +54,16 @@  discard block
 block discarded – undo
54 54
      * @param string $ivr
55 55
      * @param int    $cost
56 56
      */
57
-    public function __construct(string $algo, string $passkey, string $cipher, string $ivr, int $cost)
58
-    {
59
-        if ($cost === 0) {
57
+    public function __construct(string $algo, string $passkey, string $cipher, string $ivr, int $cost)
58
+    {
59
+        if ($cost === 0) {
60 60
             $this->key = $passkey;
61 61
 
62 62
             // Make sure key meets minimum required length
63
-            if (Str::strlen($passkey) < 256) {
63
+            if (Str::strlen($passkey) < 256) {
64 64
                 throw new Exceptions\InvalidKeyException("Key must be at least 2048 bits long.");
65 65
             }
66
-        } else {
66
+        } else {
67 67
             // Derive the key from the password and store in object
68 68
             $this->key = \hash_pbkdf2($algo, $passkey, $ivr, $cost, 0, true);
69 69
         }
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
     {
109 109
         $key = \hash_hkdf($this->algo, $this->key, 0, ($authinfo . '|' . $this->cipher), $this->ivr);
110 110
 
111
-        if ($key === false) {
111
+        if ($key === false) {
112 112
             throw new \Exception("Hash algo $this->algo is not supported");
113 113
         }
114 114
 
Please login to merge, or discard this patch.
src/Exceptions/InvalidKeyException.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 
3 3
 namespace Dcrypt\Exceptions;
4 4
 
5
-class InvalidKeyException extends \Exception
6
-{
5
+class InvalidKeyException extends \Exception
6
+{
7 7
 
8 8
 }
9 9
\ No newline at end of file
Please login to merge, or discard this patch.
src/Exceptions/InvalidChecksumException.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 
3 3
 namespace Dcrypt\Exceptions;
4 4
 
5
-class InvalidChecksumException extends \Exception
6
-{
5
+class InvalidChecksumException extends \Exception
6
+{
7 7
 
8 8
 }
9 9
\ No newline at end of file
Please login to merge, or discard this patch.