kill off mcrypt

This commit is contained in:
redmatrix 2016-05-26 13:21:43 -07:00
parent 30d0f21079
commit 7b91e551c4
2 changed files with 11 additions and 10 deletions

View File

@ -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') {

View File

@ -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.