aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-11 14:58:47 -0800
committerfriendica <info@friendica.com>2015-01-11 14:58:47 -0800
commit6f7b1960af1fe8480a7072b689f86b194cd88643 (patch)
tree341a5b1089815c4d58ef9ff330ae0f563848254a
parent0259051a87233f32efaaa7f0b4dafc71c2f3c13d (diff)
downloadvolse-hubzilla-6f7b1960af1fe8480a7072b689f86b194cd88643.tar.gz
volse-hubzilla-6f7b1960af1fe8480a7072b689f86b194cd88643.tar.bz2
volse-hubzilla-6f7b1960af1fe8480a7072b689f86b194cd88643.zip
allow the use of openssl crypto
-rw-r--r--include/crypto.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/crypto.php b/include/crypto.php
index 07655e24f..41143f04e 100644
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -39,6 +39,9 @@ function pkcs5_unpad($text)
}
function AES256CBC_encrypt($data,$key,$iv) {
+ if(get_config('system','openssl_encrypt')) {
+ return openssl_encrypt(pkcs5_pad($data,16),'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"),
@@ -48,6 +51,9 @@ function AES256CBC_encrypt($data,$key,$iv) {
}
function AES256CBC_decrypt($data,$key,$iv) {
+ if(get_config('system','openssl_encrypt')) {
+ return openssl_decrypt(pkcs5_unpad($data,16),'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"),