Merge pull request #6 from redmatrix/dev

Dev

1 files changed, 6 insertions, 18 deletions

diff --git a/include/crypto.php b/include/crypto.php
index d636c6848..bc798d919 100644
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -46,27 +46,15 @@ function pkcs5_unpad($text)
 } 
 
 function AES256CBC_encrypt($data,$key,$iv) {
-	if(get_config('system','openssl_encrypt')) {
-		return openssl_encrypt($data,'aes-256-cbc',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
-	}
-	return mcrypt_encrypt(
-		MCRYPT_RIJNDAEL_128, 
-		str_pad($key,32,"\0"), 
-		pkcs5_pad($data,16), 
-		MCRYPT_MODE_CBC, 
-		str_pad($iv,16,"\0"));
+
+	return openssl_encrypt($data,'aes-256-cbc',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
+
 }
 
 function AES256CBC_decrypt($data,$key,$iv) {
-	if(get_config('system','openssl_encrypt')) {
-		return openssl_decrypt($data,'aes-256-cbc',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
-	}
-	return pkcs5_unpad(mcrypt_decrypt(
-		MCRYPT_RIJNDAEL_128, 
-		str_pad($key,32,"\0"), 
-		$data, 
-		MCRYPT_MODE_CBC, 
-		str_pad($iv,16,"\0")));
+
+	return openssl_decrypt($data,'aes-256-cbc',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
+
 }
 
 function crypto_encapsulate($data,$pubkey,$alg='aes256cbc') {