ECB stateless, so no Context

lt · lt · commit d4954a216594 · 2016-04-11T18:45:02.000+01:00
diff --git a/lib/Mode/ECB.php b/lib/Mode/ECB.php
@@ -7,35 +7,28 @@
 
 class ECB extends Cipher
 {
-    private $key;
-
-    function __construct(Key $key)
-    {
-        $this->key = $key;
-    }
-    
-    function encrypt(string $message): string
+    function encrypt(Key $key, string $message): string
     {
         $offset = 0;
         $out = '';
         
         $blocks = strlen($message) >> 4;
         while ($blocks--) {
-            $out .= $this->encryptBlock($this->key, substr($message, $offset, 16));
+            $out .= $this->encryptBlock($key, substr($message, $offset, 16));
             $offset += 16;
         }
 
         return $out;
     }
 
-    function decrypt(string $message): string
+    function decrypt(Key $key, string $message): string
     {
         $offset = 0;
         $out = '';
 
         $blocks = strlen($message) >> 4;
         while ($blocks--) {
-            $out .= $this->decryptBlock($this->key, substr($message, $offset, 16));
+            $out .= $this->decryptBlock($key, substr($message, $offset, 16));
             $offset += 16;
         }
 
diff --git a/test/ECB/ECBGFSbox128Test.php b/test/ECB/ECBGFSbox128Test.php
@@ -32,8 +32,9 @@ function caseProvider()
      */
     function testEncrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->encrypt(hex2bin($plaintext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->encrypt($key, hex2bin($plaintext));
         $this->assertSame(hex2bin($ciphertext), $result);
     }
 
@@ -42,8 +43,9 @@ function testEncrypt($key, $plaintext, $ciphertext)
      */
     function testDecrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->decrypt(hex2bin($ciphertext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->decrypt($key, hex2bin($ciphertext));
         $this->assertSame(hex2bin($plaintext), $result);
     }
 }
diff --git a/test/ECB/ECBGFSbox192Test.php b/test/ECB/ECBGFSbox192Test.php
@@ -31,8 +31,9 @@ function caseProvider()
      */
     function testEncrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->encrypt(hex2bin($plaintext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->encrypt($key, hex2bin($plaintext));
         $this->assertSame(hex2bin($ciphertext), $result);
     }
 
@@ -41,8 +42,9 @@ function testEncrypt($key, $plaintext, $ciphertext)
      */
     function testDecrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->decrypt(hex2bin($ciphertext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->decrypt($key, hex2bin($ciphertext));
         $this->assertSame(hex2bin($plaintext), $result);
     }
 }
diff --git a/test/ECB/ECBGFSbox256Test.php b/test/ECB/ECBGFSbox256Test.php
@@ -30,8 +30,9 @@ function caseProvider()
      */
     function testEncrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->encrypt(hex2bin($plaintext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->encrypt($key, hex2bin($plaintext));
         $this->assertSame(hex2bin($ciphertext), $result);
     }
 
@@ -40,8 +41,9 @@ function testEncrypt($key, $plaintext, $ciphertext)
      */
     function testDecrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->decrypt(hex2bin($ciphertext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->decrypt($key, hex2bin($ciphertext));
         $this->assertSame(hex2bin($plaintext), $result);
     }
 }
diff --git a/test/ECB/ECBKeySbox128Test.php b/test/ECB/ECBKeySbox128Test.php
@@ -46,8 +46,9 @@ function caseProvider()
      */
     function testEncrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->encrypt(hex2bin($plaintext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->encrypt($key, hex2bin($plaintext));
         $this->assertSame(hex2bin($ciphertext), $result);
     }
 
@@ -56,8 +57,9 @@ function testEncrypt($key, $plaintext, $ciphertext)
      */
     function testDecrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->decrypt(hex2bin($ciphertext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->decrypt($key, hex2bin($ciphertext));
         $this->assertSame(hex2bin($plaintext), $result);
     }
 }
diff --git a/test/ECB/ECBKeySbox192Test.php b/test/ECB/ECBKeySbox192Test.php
@@ -49,8 +49,9 @@ function caseProvider()
      */
     function testEncrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->encrypt(hex2bin($plaintext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->encrypt($key, hex2bin($plaintext));
         $this->assertSame(hex2bin($ciphertext), $result);
     }
 
@@ -59,8 +60,9 @@ function testEncrypt($key, $plaintext, $ciphertext)
      */
     function testDecrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->decrypt(hex2bin($ciphertext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->decrypt($key, hex2bin($ciphertext));
         $this->assertSame(hex2bin($plaintext), $result);
     }
 }
diff --git a/test/ECB/ECBKeySbox256Test.php b/test/ECB/ECBKeySbox256Test.php
@@ -41,8 +41,9 @@ function caseProvider()
      */
     function testEncrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->encrypt(hex2bin($plaintext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->encrypt($key, hex2bin($plaintext));
         $this->assertSame(hex2bin($ciphertext), $result);
     }
 
@@ -51,8 +52,9 @@ function testEncrypt($key, $plaintext, $ciphertext)
      */
     function testDecrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->decrypt(hex2bin($ciphertext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->decrypt($key, hex2bin($ciphertext));
         $this->assertSame(hex2bin($plaintext), $result);
     }
 }
diff --git a/test/ECB/ECBMCT128Test.php b/test/ECB/ECBMCT128Test.php
@@ -231,10 +231,11 @@ function decryptProvider()
      */
     function testEncrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
         $result = hex2bin($plaintext);
         for ($i = 0; $i < 1000; $i++) {
-            $result = $ecb->encrypt($result);
+            $result = $ecb->encrypt($key, $result);
 
         }
         $this->assertSame(hex2bin($ciphertext), $result);
@@ -245,10 +246,11 @@ function testEncrypt($key, $plaintext, $ciphertext)
      */
     function testDecrypt($key, $ciphertext, $plaintext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
         $result = hex2bin($ciphertext);
         for ($i = 0; $i < 1000; $i++) {
-            $result = $ecb->decrypt($result);
+            $result = $ecb->decrypt($key, $result);
         }
         $this->assertSame(hex2bin($plaintext), $result);
     }
diff --git a/test/ECB/ECBMCT192Test.php b/test/ECB/ECBMCT192Test.php
@@ -231,10 +231,11 @@ function decryptProvider()
      */
     function testEncrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
         $result = hex2bin($plaintext);
         for ($i = 0; $i < 1000; $i++) {
-            $result = $ecb->encrypt($result);
+            $result = $ecb->encrypt($key, $result);
 
         }
         $this->assertSame(hex2bin($ciphertext), $result);
@@ -245,10 +246,11 @@ function testEncrypt($key, $plaintext, $ciphertext)
      */
     function testDecrypt($key, $ciphertext, $plaintext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
         $result = hex2bin($ciphertext);
         for ($i = 0; $i < 1000; $i++) {
-            $result = $ecb->decrypt($result);
+            $result = $ecb->decrypt($key, $result);
         }
         $this->assertSame(hex2bin($plaintext), $result);
     }
diff --git a/test/ECB/ECBMCT256Test.php b/test/ECB/ECBMCT256Test.php
@@ -231,10 +231,11 @@ function decryptProvider()
      */
     function testEncrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
         $result = hex2bin($plaintext);
         for ($i = 0; $i < 1000; $i++) {
-            $result = $ecb->encrypt($result);
+            $result = $ecb->encrypt($key, $result);
 
         }
         $this->assertSame(hex2bin($ciphertext), $result);
@@ -245,10 +246,11 @@ function testEncrypt($key, $plaintext, $ciphertext)
      */
     function testDecrypt($key, $ciphertext, $plaintext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
         $result = hex2bin($ciphertext);
         for ($i = 0; $i < 1000; $i++) {
-            $result = $ecb->decrypt($result);
+            $result = $ecb->decrypt($key, $result);
         }
         $this->assertSame(hex2bin($plaintext), $result);
     }
diff --git a/test/ECB/ECBMMT128Test.php b/test/ECB/ECBMMT128Test.php
@@ -51,8 +51,9 @@ function decryptProvider()
      */
     function testEncrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->encrypt(hex2bin($plaintext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->encrypt($key, hex2bin($plaintext));
         $this->assertSame(hex2bin($ciphertext), $result);
     }
 
@@ -61,8 +62,9 @@ function testEncrypt($key, $plaintext, $ciphertext)
      */
     function testDecrypt($key, $ciphertext, $plaintext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->decrypt(hex2bin($ciphertext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->decrypt($key, hex2bin($ciphertext));
         $this->assertSame(hex2bin($plaintext), $result);
     }
 }
diff --git a/test/ECB/ECBMMT192Test.php b/test/ECB/ECBMMT192Test.php
@@ -51,8 +51,9 @@ function decryptProvider()
      */
     function testEncrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->encrypt(hex2bin($plaintext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->encrypt($key, hex2bin($plaintext));
         $this->assertSame(hex2bin($ciphertext), $result);
     }
 
@@ -61,8 +62,9 @@ function testEncrypt($key, $plaintext, $ciphertext)
      */
     function testDecrypt($key, $ciphertext, $plaintext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->decrypt(hex2bin($ciphertext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->decrypt($key, hex2bin($ciphertext));
         $this->assertSame(hex2bin($plaintext), $result);
     }
 }
diff --git a/test/ECB/ECBMMT256Test.php b/test/ECB/ECBMMT256Test.php
@@ -51,8 +51,9 @@ function decryptProvider()
      */
     function testEncrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->encrypt(hex2bin($plaintext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->encrypt($key, hex2bin($plaintext));
         $this->assertSame(hex2bin($ciphertext), $result);
     }
 
@@ -61,8 +62,9 @@ function testEncrypt($key, $plaintext, $ciphertext)
      */
     function testDecrypt($key, $ciphertext, $plaintext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->decrypt(hex2bin($ciphertext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->decrypt($key, hex2bin($ciphertext));
         $this->assertSame(hex2bin($plaintext), $result);
     }
 }
diff --git a/test/ECB/ECBVarKey128Test.php b/test/ECB/ECBVarKey128Test.php
@@ -153,8 +153,9 @@ function caseProvider()
      */
     function testEncrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->encrypt(hex2bin($plaintext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->encrypt($key, hex2bin($plaintext));
         $this->assertSame(hex2bin($ciphertext), $result);
     }
 
@@ -163,8 +164,9 @@ function testEncrypt($key, $plaintext, $ciphertext)
      */
     function testDecrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->decrypt(hex2bin($ciphertext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->decrypt($key, hex2bin($ciphertext));
         $this->assertSame(hex2bin($plaintext), $result);
     }
 }
diff --git a/test/ECB/ECBVarKey192Test.php b/test/ECB/ECBVarKey192Test.php
@@ -217,8 +217,9 @@ function caseProvider()
      */
     function testEncrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->encrypt(hex2bin($plaintext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->encrypt($key, hex2bin($plaintext));
         $this->assertSame(hex2bin($ciphertext), $result);
     }
 
@@ -227,8 +228,9 @@ function testEncrypt($key, $plaintext, $ciphertext)
      */
     function testDecrypt($key, $plaintext, $ciphertext)
     {
-        $ecb = new ECB(new Key(hex2bin($key)));
-        $result = $ecb->decrypt(hex2bin($ciphertext));
+        $key = new Key(hex2bin($key));
+        $ecb = new ECB;
+        $result = $ecb->decrypt($key, hex2bin($ciphertext));
         $this->assertSame(hex2bin($plaintext), $result);
     }
 }
diff --git a/test/ECB/ECBVarKey256Test.php b/test/ECB/ECBVarKey256Test.php
diff --git a/test/ECB/ECBVarTxt128Test.php b/test/ECB/ECBVarTxt128Test.php
diff --git a/test/ECB/ECBVarTxt192Test.php b/test/ECB/ECBVarTxt192Test.php
diff --git a/test/ECB/ECBVarTxt256Test.php b/test/ECB/ECBVarTxt256Test.php

Original file line number	Diff line number	Diff line change
`@@ -7,35 +7,28 @@`
`7`	`7`
`8`	`8`	`class ECB extends Cipher`
`9`	`9`	`{`
`10`		`- private $key;`
`11`		`-`
`12`		`- function __construct(Key $key)`
`13`		`- {`
`14`		`- $this->key = $key;`
`15`		`- }`
`16`		`-`
`17`		`- function encrypt(string $message): string`
	`10`	`+ function encrypt(Key $key, string $message): string`
`18`	`11`	`{`
`19`	`12`	`$offset = 0;`
`20`	`13`	`$out = '';`
`21`	`14`
`22`	`15`	`$blocks = strlen($message) >> 4;`
`23`	`16`	`while ($blocks--) {`
`24`		`- $out .= $this->encryptBlock($this->key, substr($message, $offset, 16));`
	`17`	`+ $out .= $this->encryptBlock($key, substr($message, $offset, 16));`
`25`	`18`	`$offset += 16;`
`26`	`19`	`}`
`27`	`20`
`28`	`21`	`return $out;`
`29`	`22`	`}`
`30`	`23`
`31`		`- function decrypt(string $message): string`
	`24`	`+ function decrypt(Key $key, string $message): string`
`32`	`25`	`{`
`33`	`26`	`$offset = 0;`
`34`	`27`	`$out = '';`
`35`	`28`
`36`	`29`	`$blocks = strlen($message) >> 4;`
`37`	`30`	`while ($blocks--) {`
`38`		`- $out .= $this->decryptBlock($this->key, substr($message, $offset, 16));`
	`31`	`+ $out .= $this->decryptBlock($key, substr($message, $offset, 16));`
`39`	`32`	`$offset += 16;`
`40`	`33`	`}`
`41`	`34`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,9 @@ function caseProvider()`
`32`	`32`	`*/`
`33`	`33`	`function testEncrypt($key, $plaintext, $ciphertext)`
`34`	`34`	`{`
`35`		`- $ecb = new ECB(new Key(hex2bin($key)));`
`36`		`- $result = $ecb->encrypt(hex2bin($plaintext));`
	`35`	`+ $key = new Key(hex2bin($key));`
	`36`	`+ $ecb = new ECB;`
	`37`	`+ $result = $ecb->encrypt($key, hex2bin($plaintext));`
`37`	`38`	`$this->assertSame(hex2bin($ciphertext), $result);`
`38`	`39`	`}`
`39`	`40`
`@@ -42,8 +43,9 @@ function testEncrypt($key, $plaintext, $ciphertext)`
`42`	`43`	`*/`
`43`	`44`	`function testDecrypt($key, $plaintext, $ciphertext)`
`44`	`45`	`{`
`45`		`- $ecb = new ECB(new Key(hex2bin($key)));`
`46`		`- $result = $ecb->decrypt(hex2bin($ciphertext));`
	`46`	`+ $key = new Key(hex2bin($key));`
	`47`	`+ $ecb = new ECB;`
	`48`	`+ $result = $ecb->decrypt($key, hex2bin($ciphertext));`
`47`	`49`	`$this->assertSame(hex2bin($plaintext), $result);`
`48`	`50`	`}`
`49`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,9 @@ function caseProvider()`
`31`	`31`	`*/`
`32`	`32`	`function testEncrypt($key, $plaintext, $ciphertext)`
`33`	`33`	`{`
`34`		`- $ecb = new ECB(new Key(hex2bin($key)));`
`35`		`- $result = $ecb->encrypt(hex2bin($plaintext));`
	`34`	`+ $key = new Key(hex2bin($key));`
	`35`	`+ $ecb = new ECB;`
	`36`	`+ $result = $ecb->encrypt($key, hex2bin($plaintext));`
`36`	`37`	`$this->assertSame(hex2bin($ciphertext), $result);`
`37`	`38`	`}`
`38`	`39`
`@@ -41,8 +42,9 @@ function testEncrypt($key, $plaintext, $ciphertext)`
`41`	`42`	`*/`
`42`	`43`	`function testDecrypt($key, $plaintext, $ciphertext)`
`43`	`44`	`{`
`44`		`- $ecb = new ECB(new Key(hex2bin($key)));`
`45`		`- $result = $ecb->decrypt(hex2bin($ciphertext));`
	`45`	`+ $key = new Key(hex2bin($key));`
	`46`	`+ $ecb = new ECB;`
	`47`	`+ $result = $ecb->decrypt($key, hex2bin($ciphertext));`
`46`	`48`	`$this->assertSame(hex2bin($plaintext), $result);`
`47`	`49`	`}`
`48`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,9 @@ function caseProvider()`
`30`	`30`	`*/`
`31`	`31`	`function testEncrypt($key, $plaintext, $ciphertext)`
`32`	`32`	`{`
`33`		`- $ecb = new ECB(new Key(hex2bin($key)));`
`34`		`- $result = $ecb->encrypt(hex2bin($plaintext));`
	`33`	`+ $key = new Key(hex2bin($key));`
	`34`	`+ $ecb = new ECB;`
	`35`	`+ $result = $ecb->encrypt($key, hex2bin($plaintext));`
`35`	`36`	`$this->assertSame(hex2bin($ciphertext), $result);`
`36`	`37`	`}`
`37`	`38`
`@@ -40,8 +41,9 @@ function testEncrypt($key, $plaintext, $ciphertext)`
`40`	`41`	`*/`
`41`	`42`	`function testDecrypt($key, $plaintext, $ciphertext)`
`42`	`43`	`{`
`43`		`- $ecb = new ECB(new Key(hex2bin($key)));`
`44`		`- $result = $ecb->decrypt(hex2bin($ciphertext));`
	`44`	`+ $key = new Key(hex2bin($key));`
	`45`	`+ $ecb = new ECB;`
	`46`	`+ $result = $ecb->decrypt($key, hex2bin($ciphertext));`
`45`	`47`	`$this->assertSame(hex2bin($plaintext), $result);`
`46`	`48`	`}`
`47`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,9 @@ function caseProvider()`
`46`	`46`	`*/`
`47`	`47`	`function testEncrypt($key, $plaintext, $ciphertext)`
`48`	`48`	`{`
`49`		`- $ecb = new ECB(new Key(hex2bin($key)));`
`50`		`- $result = $ecb->encrypt(hex2bin($plaintext));`
	`49`	`+ $key = new Key(hex2bin($key));`
	`50`	`+ $ecb = new ECB;`
	`51`	`+ $result = $ecb->encrypt($key, hex2bin($plaintext));`
`51`	`52`	`$this->assertSame(hex2bin($ciphertext), $result);`
`52`	`53`	`}`
`53`	`54`
`@@ -56,8 +57,9 @@ function testEncrypt($key, $plaintext, $ciphertext)`
`56`	`57`	`*/`
`57`	`58`	`function testDecrypt($key, $plaintext, $ciphertext)`
`58`	`59`	`{`
`59`		`- $ecb = new ECB(new Key(hex2bin($key)));`
`60`		`- $result = $ecb->decrypt(hex2bin($ciphertext));`
	`60`	`+ $key = new Key(hex2bin($key));`
	`61`	`+ $ecb = new ECB;`
	`62`	`+ $result = $ecb->decrypt($key, hex2bin($ciphertext));`
`61`	`63`	`$this->assertSame(hex2bin($plaintext), $result);`
`62`	`64`	`}`
`63`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,9 @@ function caseProvider()`
`49`	`49`	`*/`
`50`	`50`	`function testEncrypt($key, $plaintext, $ciphertext)`
`51`	`51`	`{`
`52`		`- $ecb = new ECB(new Key(hex2bin($key)));`
`53`		`- $result = $ecb->encrypt(hex2bin($plaintext));`
	`52`	`+ $key = new Key(hex2bin($key));`
	`53`	`+ $ecb = new ECB;`
	`54`	`+ $result = $ecb->encrypt($key, hex2bin($plaintext));`
`54`	`55`	`$this->assertSame(hex2bin($ciphertext), $result);`
`55`	`56`	`}`
`56`	`57`
`@@ -59,8 +60,9 @@ function testEncrypt($key, $plaintext, $ciphertext)`
`59`	`60`	`*/`
`60`	`61`	`function testDecrypt($key, $plaintext, $ciphertext)`
`61`	`62`	`{`
`62`		`- $ecb = new ECB(new Key(hex2bin($key)));`
`63`		`- $result = $ecb->decrypt(hex2bin($ciphertext));`
	`63`	`+ $key = new Key(hex2bin($key));`
	`64`	`+ $ecb = new ECB;`
	`65`	`+ $result = $ecb->decrypt($key, hex2bin($ciphertext));`
`64`	`66`	`$this->assertSame(hex2bin($plaintext), $result);`
`65`	`67`	`}`
`66`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,9 @@ function caseProvider()`
`41`	`41`	`*/`
`42`	`42`	`function testEncrypt($key, $plaintext, $ciphertext)`
`43`	`43`	`{`
`44`		`- $ecb = new ECB(new Key(hex2bin($key)));`
`45`		`- $result = $ecb->encrypt(hex2bin($plaintext));`
	`44`	`+ $key = new Key(hex2bin($key));`
	`45`	`+ $ecb = new ECB;`
	`46`	`+ $result = $ecb->encrypt($key, hex2bin($plaintext));`
`46`	`47`	`$this->assertSame(hex2bin($ciphertext), $result);`
`47`	`48`	`}`
`48`	`49`
`@@ -51,8 +52,9 @@ function testEncrypt($key, $plaintext, $ciphertext)`
`51`	`52`	`*/`
`52`	`53`	`function testDecrypt($key, $plaintext, $ciphertext)`
`53`	`54`	`{`
`54`		`- $ecb = new ECB(new Key(hex2bin($key)));`
`55`		`- $result = $ecb->decrypt(hex2bin($ciphertext));`
	`55`	`+ $key = new Key(hex2bin($key));`
	`56`	`+ $ecb = new ECB;`
	`57`	`+ $result = $ecb->decrypt($key, hex2bin($ciphertext));`
`56`	`58`	`$this->assertSame(hex2bin($plaintext), $result);`
`57`	`59`	`}`
`58`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -231,10 +231,11 @@ function decryptProvider()`
`231`	`231`	`*/`
`232`	`232`	`function testEncrypt($key, $plaintext, $ciphertext)`
`233`	`233`	`{`
`234`		`- $ecb = new ECB(new Key(hex2bin($key)));`
	`234`	`+ $key = new Key(hex2bin($key));`
	`235`	`+ $ecb = new ECB;`
`235`	`236`	`$result = hex2bin($plaintext);`
`236`	`237`	`for ($i = 0; $i < 1000; $i++) {`
`237`		`- $result = $ecb->encrypt($result);`
	`238`	`+ $result = $ecb->encrypt($key, $result);`
`238`	`239`
`239`	`240`	`}`
`240`	`241`	`$this->assertSame(hex2bin($ciphertext), $result);`
`@@ -245,10 +246,11 @@ function testEncrypt($key, $plaintext, $ciphertext)`
`245`	`246`	`*/`
`246`	`247`	`function testDecrypt($key, $ciphertext, $plaintext)`
`247`	`248`	`{`
`248`		`- $ecb = new ECB(new Key(hex2bin($key)));`
	`249`	`+ $key = new Key(hex2bin($key));`
	`250`	`+ $ecb = new ECB;`
`249`	`251`	`$result = hex2bin($ciphertext);`
`250`	`252`	`for ($i = 0; $i < 1000; $i++) {`
`251`		`- $result = $ecb->decrypt($result);`
	`253`	`+ $result = $ecb->decrypt($key, $result);`
`252`	`254`	`}`
`253`	`255`	`$this->assertSame(hex2bin($plaintext), $result);`
`254`	`256`	`}`