From 18767e31711656e9e2648fbe051b74ebbefd3f2e Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 4 Mar 2014 22:21:35 +0200 Subject: CI_Encryption: Remove MCrypt 'work-arounds' for CAST-128 compatibility Turns out it's OpenSSL's fault for performing 16 rounds instead of 12 for key sizes of 5-11 bytes. Reference: http://tools.ietf.org/rfc/rfc2144.txt --- tests/codeigniter/libraries/Encryption_test.php | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'tests/codeigniter/libraries') diff --git a/tests/codeigniter/libraries/Encryption_test.php b/tests/codeigniter/libraries/Encryption_test.php index 5f2382482..cb9326d11 100644 --- a/tests/codeigniter/libraries/Encryption_test.php +++ b/tests/codeigniter/libraries/Encryption_test.php @@ -330,18 +330,10 @@ class Encryption_test extends CI_TestCase { array('blowfish', 'cfb', 56), array('blowfish', 'ofb', 56), array('blowfish', 'ecb', 56), - array('cast5', 'cbc', 5), - array('cast5', 'cfb', 5), - array('cast5', 'ofb', 5), - array('cast5', 'ecb', 5), - array('cast5', 'cbc', 8), - array('cast5', 'cfb', 8), - array('cast5', 'ofb', 8), - array('cast5', 'ecb', 8), - array('cast5', 'cbc', 10), - array('cast5', 'cfb', 10), - array('cast5', 'ofb', 10), - array('cast5', 'ecb', 10), + array('cast5', 'cbc', 11), + array('cast5', 'cfb', 11), + array('cast5', 'ofb', 11), + array('cast5', 'ecb', 11), array('cast5', 'cbc', 16), array('cast5', 'cfb', 16), array('cast5', 'ofb', 16), -- cgit v1.2.3-24-g4f1b