Changed the order of the parameters passed to the Mode Constructor to be

consistent with the rest of the API
gilfether · Jul 19, 2013 · 2d3af13 · 2d3af13
1 parent 8adfab1
commit 2d3af13
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/modes/CBC.php b/modes/CBC.php
@@ -45,7 +45,7 @@ class Mode_CBC extends Mode
 	 */
 	function __construct($cipher)
 	{
-		parent::__construct($cipher, PHP_Crypt::MODE_CBC);
+		parent::__construct(PHP_Crypt::MODE_CBC, $cipher);
 
 		// get the bit size the Cipher requires
 		$this->blockSize($cipher->bitSize() / 8);

diff --git a/modes/CFB.php b/modes/CFB.php
@@ -45,7 +45,7 @@ class Mode_CFB extends Mode
 	 */
 	public function __construct($cipher)
 	{
-		parent::__construct($cipher, PHP_Crypt::MODE_CFB);
+		parent::__construct(PHP_Crypt::MODE_CFB, $cipher);
 
 		// our block size will be the size required by the cipher
 		$this->blockSize($cipher->bitSize() / 8);

diff --git a/modes/CTR.php b/modes/CTR.php
@@ -47,7 +47,7 @@ class Mode_CTR extends Mode
 	 */
 	function __construct($cipher)
 	{
-		parent::__construct($cipher, PHP_CRYPT::MODE_CTR);
+		parent::__construct(PHP_CRYPT::MODE_CTR, $cipher);
 
 		// set the block size, in bits
 		$this->blockSize($cipher->bitSize() / 8);

diff --git a/modes/ECB.php b/modes/ECB.php
@@ -46,7 +46,7 @@ class Mode_ECB extends Mode
 	 */
 	public function __construct($cipher)
 	{
-		parent::__construct($cipher, PHP_Crypt::MODE_ECB);
+		parent::__construct(PHP_Crypt::MODE_ECB, $cipher);
 
 		// get the bit size the Cipher requires, divide by 8
 		// to set the number of bytes each block of data will be

diff --git a/modes/NCFB.php b/modes/NCFB.php
@@ -45,7 +45,7 @@ class Mode_NCFB extends Mode
 	 */
 	public function __construct($cipher)
 	{
-		parent::__construct($cipher, PHP_Crypt::MODE_NCFB);
+		parent::__construct(PHP_Crypt::MODE_NCFB, $cipher);
 
 		// our block size will be the size required by the cipher
 		$this->blockSize($cipher->bitSize() / 8);

diff --git a/modes/NOFB.php b/modes/NOFB.php
@@ -46,7 +46,7 @@ class Mode_NOFB extends Mode
 	 */
 	public function __construct($cipher)
 	{
-		parent::__construct($cipher, PHP_Crypt::MODE_NOFB);
+		parent::__construct(PHP_Crypt::MODE_NOFB, $cipher);
 
 		// our block size will be the size required by the cipher
 		$this->blockSize($cipher->bitSize() / 8);

diff --git a/modes/OFB.php b/modes/OFB.php
@@ -45,7 +45,7 @@ class Mode_OFB extends Mode
 	 */
 	public function __construct($cipher)
 	{
-		parent::__construct($cipher, PHP_Crypt::MODE_OFB);
+		parent::__construct(PHP_Crypt::MODE_OFB, $cipher);
 
 		// our block size will be the size required by the cipher
 		$this->blockSize($cipher->bitSize() / 8);

diff --git a/modes/PCBC.php b/modes/PCBC.php
@@ -45,7 +45,7 @@ class Mode_PCBC extends Mode
 	 */
 	function __construct($cipher)
 	{
-		parent::__construct($cipher, PHP_Crypt::MODE_PCBC);
+		parent::__construct(PHP_Crypt::MODE_PCBC, $cipher);
 
 		$this->blockSize($cipher->bitSize() / 8);
 

diff --git a/modes/Raw.php b/modes/Raw.php
@@ -48,7 +48,7 @@ class Mode_Raw extends Mode
 	 */
 	public function __construct($cipher)
 	{
-		parent::__construct($cipher, PHP_Crypt::MODE_RAW);
+		parent::__construct(PHP_Crypt::MODE_RAW, $cipher);
 
 		// get the bit size the Cipher requires
 		if($cipher->type() == Cipher::BLOCK)
@@ -66,9 +66,9 @@ public function __construct($cipher)
 	 * @param integer $mode The mode constant identifier
 	 * @return void
 	 */
-	protected function __construct1($cipher, $mode)
+	protected function __construct1($mode, $cipher)
 	{
-		parent::__construct($cipher, $mode);
+		parent::__construct($mode, $cipher);
 	}
 
 

diff --git a/modes/Stream.php b/modes/Stream.php
@@ -48,7 +48,7 @@ class Mode_Stream extends Mode_Raw
 	public function __construct($cipher)
 	{
 		// call the secondary 'constructor' from the parent
-		parent::__construct1($cipher, PHP_Crypt::MODE_STREAM);
+		parent::__construct1(PHP_Crypt::MODE_STREAM, $cipher);
 
 		// Stream ciphers don't use block sizes, set to 0
 		$this->blockSize(0);