Completed
Pull Request — master (#19)
by Michael
09:46
created
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/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.
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.
examples/vectors.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 
13 13
 foreach (\Dcrypt\OpensslSupported::ciphers() as $cipher) {
14 14
     $cipher = strtolower($cipher);
15
-    if (isset($out[$cipher])) {
15
+    if (isset($out[$cipher])) {
16 16
         continue;
17 17
     }
18 18
 
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 
30 30
 foreach (\Dcrypt\OpensslSupported::algos() as $algo) {
31 31
     $cipher = strtolower($algo);
32
-    if (isset($out[$algo])) {
32
+    if (isset($out[$algo])) {
33 33
         continue;
34 34
     }
35 35
     $out[$algo] = base64_encode(OpensslStatic::encrypt('hello', 'world', 'aes-256-gcm', $algo, 1000));
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
@@ -2,8 +2,8 @@
 block discarded – undo
2 2
 
3 3
 namespace Dcrypt\Examples;
4 4
 
5
-class Aes256Base64 extends \Dcrypt\OpensslBridge
6
-{
5
+class Aes256Base64 extends \Dcrypt\OpensslBridge
6
+{
7 7
     const CIPHER = 'aes-256-gcm';
8 8
 
9 9
     const ALGO = 'sha256';
Please login to merge, or discard this patch.
src/OpensslKeyGenerator.php 1 patch
Braces   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -25,8 +25,8 @@  discard block
 block discarded – undo
25 25
  * @license  http://opensource.org/licenses/MIT The MIT License (MIT)
26 26
  * @link     https://github.com/mmeyer2k/dcrypt
27 27
  */
28
-final class OpensslKeyGenerator
29
-{
28
+final class OpensslKeyGenerator
29
+{
30 30
     /**
31 31
      * @var string
32 32
      */
@@ -56,21 +56,21 @@  discard block
 block discarded – undo
56 56
      * @param string $ivr
57 57
      * @param int $cost
58 58
      */
59
-    public function __construct(string $algo, string $passkey, string $cipher, string $ivr, int $cost)
60
-    {
59
+    public function __construct(string $algo, string $passkey, string $cipher, string $ivr, int $cost)
60
+    {
61 61
         // When cost is 0 then we are in key mode
62
-        if ($cost === 0) {
62
+        if ($cost === 0) {
63 63
             // Attempt to decode the passkey
64 64
             $passkey = \base64_decode($passkey);
65 65
 
66 66
             // Make sure key was properly decoded and meets minimum required length
67
-            if (Str::strlen($passkey) < 256) {
67
+            if (Str::strlen($passkey) < 256) {
68 68
                 throw new InvalidKeyException("Key must be at least 2048 bits long and base64 encoded.");
69 69
             }
70 70
 
71 71
             // Store the key as what was supplied
72 72
             $this->key = $passkey;
73
-        } else {
73
+        } else {
74 74
             // Derive the key from the password and store in object
75 75
             $this->key = \hash_pbkdf2($algo, $passkey, $ivr, $cost, 0, true);
76 76
         }
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 
119 119
         $key = \hash_hkdf($this->algo, $this->key, 0, $info, $this->ivr);
120 120
 
121
-        if ($key === false) {
121
+        if ($key === false) {
122 122
             throw new Exceptions\InvalidAlgoException("Hash algo $this->algo is not supported by hash_hkdf.");
123 123
         }
124 124
 
@@ -134,11 +134,11 @@  discard block
 block discarded – undo
134 134
      */
135 135
     public static function newKey(int $size = 2048): string
136 136
     {
137
-        if ($size < 2048) {
137
+        if ($size < 2048) {
138 138
             throw new InvalidKeyException('Key must be at least 2048 bits long.');
139 139
         }
140 140
 
141
-        if ($size % 8 !== 0) {
141
+        if ($size % 8 !== 0) {
142 142
             throw new InvalidKeyException('Key must be divisible by 8.');
143 143
         }
144 144
 
Please login to merge, or discard this patch.
src/OpensslStack.php 1 patch
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -2,16 +2,16 @@
 block discarded – undo
2 2
 
3 3
 namespace Dcrypt;
4 4
 
5
-class OpensslStack
6
-{
5
+class OpensslStack
6
+{
7 7
     private $stack = [];
8 8
 
9 9
     private $passkey;
10 10
 
11 11
     private $cost;
12 12
 
13
-    public function __construct(string $passkey, int $cost = 0)
14
-    {
13
+    public function __construct(string $passkey, int $cost = 0)
14
+    {
15 15
         $this->passkey = $passkey;
16 16
 
17 17
         $this->cost = $cost;
Please login to merge, or discard this patch.