diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-05-27 06:35:15 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-05-27 06:35:15 -0400 |
| commit | d554681174084e1715dfae4c21af9f6edcbad59e (patch) | |
| tree | eb585cce4ebe24d663b2e7eab28a62da612efec1 /include/crypto.php | |
| parent | e00b8a70829213a4333a53a097c2c498d529f5d6 (diff) | |
| parent | 551cf8ee9413c5c57e7b71d6016466e598636900 (diff) | |
| download | volse-hubzilla-d554681174084e1715dfae4c21af9f6edcbad59e.tar.gz volse-hubzilla-d554681174084e1715dfae4c21af9f6edcbad59e.tar.bz2 volse-hubzilla-d554681174084e1715dfae4c21af9f6edcbad59e.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'include/crypto.php')
| -rw-r--r-- | include/crypto.php | 14 |
1 files changed, 8 insertions, 6 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') { |