Merge pull request #2767 from tobiasd/20160906-credits

[friendica.git] / include / crypto.php

diff --git a/include/crypto.php b/include/crypto.php
index 87744d2d6a305630c16ccdf468bd866845ec5202..f5163a9dacbeb2bb8ccf8b3be23ff6de27a62546 100644 (file)
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -185,8 +185,9 @@ function salmon_key($pubkey) {
 }
 
 
-/** disable rino 
+
 if(! function_exists('aes_decrypt')) {
+// DEPRECATED IN 3.4.1
 function aes_decrypt($val,$ky)
 {
     $key="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
@@ -200,6 +201,7 @@ function aes_decrypt($val,$ky)
 
 
 if(! function_exists('aes_encrypt')) {
+// DEPRECATED IN 3.4.1
 function aes_encrypt($val,$ky)
 {
     $key="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
@@ -210,7 +212,6 @@ function aes_encrypt($val,$ky)
     $val=str_pad($val, (16*(floor(strlen($val) / 16)+(strlen($val) % 16==0?2:1))), chr(16-(strlen($val) % 16)));
     return mcrypt_encrypt($enc, $key, $val, $mode, mcrypt_create_iv( mcrypt_get_iv_size($enc, $mode), MCRYPT_DEV_URANDOM));
 }} 
-**/
 
 function pkcs5_pad ($text, $blocksize)
 {