aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-26 13:21:43 -0700
committerredmatrix <git@macgirvin.com>2016-05-26 13:21:43 -0700
commit7b91e551c41572768e94e97dddfc854cb003a002 (patch)
tree221a55ff8f09f089c69591ac0949e695f009649b
parent30d0f210797b6229a0d127a9c359136bf3a87d42 (diff)
downloadvolse-hubzilla-7b91e551c41572768e94e97dddfc854cb003a002.tar.gz
volse-hubzilla-7b91e551c41572768e94e97dddfc854cb003a002.tar.bz2
volse-hubzilla-7b91e551c41572768e94e97dddfc854cb003a002.zip
kill off mcrypt
-rw-r--r--include/crypto.php14
-rw-r--r--install/INSTALL.txt7
2 files changed, 11 insertions, 10 deletions
diff --git a/include/crypto.php b/include/crypto.php
index d636c6848..42aa45b72 100644
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -46,27 +46,29 @@ 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 openssl_encrypt($data,'aes-256-cbc',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
+
+/* deprecated in php 7.1
return mcrypt_encrypt(
MCRYPT_RIJNDAEL_128,
str_pad($key,32,"\0"),
pkcs5_pad($data,16),
MCRYPT_MODE_CBC,
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 openssl_decrypt($data,'aes-256-cbc',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
+/* deprecated in php 7.1
return pkcs5_unpad(mcrypt_decrypt(
MCRYPT_RIJNDAEL_128,
str_pad($key,32,"\0"),
$data,
MCRYPT_MODE_CBC,
str_pad($iv,16,"\0")));
+*/
}
function crypto_encapsulate($data,$pubkey,$alg='aes256cbc') {
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index efcf8c9af..50d755f0f 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -83,10 +83,9 @@ but may be an issue with nginx or other web server platforms.
php.ini file - and with no hosting provider restrictions on the use of
exec() and proc_open().
- - curl, gd (with at least jpeg and png support), mysqli, mbstring, mcrypt,
- and openssl extensions. The imagick extension is not required but desirable.
-
- - xml extension is required if you want webdav to work.
+ - curl, gd (with at least jpeg and png support), mysqli, mbstring, xml,
+ and openssl extensions. The imagick extension MAY be used instead of gd,
+ but is not required and MAY also be disabled via configuration option.
- some form of email server or email gateway such that PHP mail() works.