Fix the encrypter to actually use AES encryption by default.

ezzatron · ezzatron · commit 02fee79e57d3 · 2014-04-03T10:36:58.000+10:00
diff --git a/src/Illuminate/Encryption/Encrypter.php b/src/Illuminate/Encryption/Encrypter.php
@@ -16,21 +16,21 @@ class Encrypter {
 	 *
 	 * @var string
 	 */
-	protected $cipher = 'rijndael-256';
+	protected $cipher = MCRYPT_RIJNDAEL_128;
 
 	/**
 	 * The mode used for encryption.
 	 *
 	 * @var string
 	 */
-	protected $mode = 'cbc';
+	protected $mode = MCRYPT_MODE_CBC;
 
 	/**
 	 * The block size of the cipher.
 	 *
 	 * @var int
 	 */
-	protected $block = 32;
+	protected $block = 16;
 
 	/**
 	 * Create a new encrypter instance.
@@ -257,6 +257,7 @@ public function setKey($key)
 	public function setCipher($cipher)
 	{
 		$this->cipher = $cipher;
+		$this->updateBlockSize();
 	}
 
 	/**
@@ -268,6 +269,12 @@ public function setCipher($cipher)
 	public function setMode($mode)
 	{
 		$this->mode = $mode;
+		$this->updateBlockSize();
+	}
+
+	private function updateBlockSize()
+	{
+		$this->block = mcrypt_get_iv_size($this->cipher, $this->mode);
 	}
 
 }
diff --git a/tests/Encryption/EncrypterTest.php b/tests/Encryption/EncrypterTest.php
@@ -12,6 +12,14 @@ public function testEncryption()
 		$this->assertTrue('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' == $e->decrypt($encrypted));
 	}
 
+	public function testEncryptionWithCustomCipher()
+	{
+		$e = $this->getEncrypter();
+		$e->setCipher(MCRYPT_RIJNDAEL_256);
+		$this->assertFalse('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' == $e->encrypt('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'));
+		$encrypted = $e->encrypt('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
+		$this->assertTrue('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' == $e->decrypt($encrypted));
+	}
 
 	/**
 	 * @expectedException Illuminate\Encryption\DecryptException

Original file line number	Diff line number	Diff line change
`@@ -16,21 +16,21 @@ class Encrypter {`
`16`	`16`	`*`
`17`	`17`	`* @var string`
`18`	`18`	`*/`
`19`		`- protected $cipher = 'rijndael-256';`
	`19`	`+ protected $cipher = MCRYPT_RIJNDAEL_128;`
`20`	`20`
`21`	`21`	`/**`
`22`	`22`	`* The mode used for encryption.`
`23`	`23`	`*`
`24`	`24`	`* @var string`
`25`	`25`	`*/`
`26`		`- protected $mode = 'cbc';`
	`26`	`+ protected $mode = MCRYPT_MODE_CBC;`
`27`	`27`
`28`	`28`	`/**`
`29`	`29`	`* The block size of the cipher.`
`30`	`30`	`*`
`31`	`31`	`* @var int`
`32`	`32`	`*/`
`33`		`- protected $block = 32;`
	`33`	`+ protected $block = 16;`
`34`	`34`
`35`	`35`	`/**`
`36`	`36`	`* Create a new encrypter instance.`
`@@ -257,6 +257,7 @@ public function setKey($key)`
`257`	`257`	`public function setCipher($cipher)`
`258`	`258`	`{`
`259`	`259`	`$this->cipher = $cipher;`
	`260`	`+ $this->updateBlockSize();`
`260`	`261`	`}`
`261`	`262`
`262`	`263`	`/**`
`@@ -268,6 +269,12 @@ public function setCipher($cipher)`
`268`	`269`	`public function setMode($mode)`
`269`	`270`	`{`
`270`	`271`	`$this->mode = $mode;`
	`272`	`+ $this->updateBlockSize();`
	`273`	`+ }`
	`274`	`+`
	`275`	`+ private function updateBlockSize()`
	`276`	`+ {`
	`277`	`+ $this->block = mcrypt_get_iv_size($this->cipher, $this->mode);`
`271`	`278`	`}`
`272`	`279`
`273`	`280`	`}`