From 8d33a9a4a8ac924678ae5bba6387ca7fce206f4b Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 5 Feb 2014 23:11:23 +0200 Subject: CI_Encryption: HMAC to not be derived from the encryption key --- tests/codeigniter/libraries/Encryption_test.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'tests/codeigniter/libraries') diff --git a/tests/codeigniter/libraries/Encryption_test.php b/tests/codeigniter/libraries/Encryption_test.php index ca1a4cd60..da9870fc5 100644 --- a/tests/codeigniter/libraries/Encryption_test.php +++ b/tests/codeigniter/libraries/Encryption_test.php @@ -74,18 +74,20 @@ class Encryption_test extends CI_TestCase { // Add some randomness to the selected driver $driver = mt_rand(0,1); $params = array( + 'driver' => $driver_index[$driver], 'cipher' => $test[0], 'mode' => $test[1], 'key' => openssl_random_pseudo_bytes($test[2]) ); - $this->encryption->initialize(array('driver' => $driver_index[$driver])); - $ciphertext = $this->encryption->encrypt($message, $params); + $this->encryption->initialize($params); + $ciphertext = $this->encryption->encrypt($message); $driver = (int) ! $driver; + $params['driver'] = $driver_index[$driver]; - $this->encryption->initialize(array('driver' => $driver_index[$driver])); - $this->assertEquals($message, $this->encryption->decrypt($ciphertext, $params)); + $this->encryption->initialize($params); + $this->assertEquals($message, $this->encryption->decrypt($ciphertext)); } } -- cgit v1.2.3-24-g4f1b