diff options
author | redmatrix <git@macgirvin.com> | 2016-05-30 13:25:58 -0700 |
---|---|---|
committer | redmatrix <git@macgirvin.com> | 2016-05-30 13:25:58 -0700 |
commit | f35609d26cd9e6fb2c177ca1e422d0f0729f4f2e (patch) | |
tree | 416aea395a6c7360c9f87f631e88c336e95d2384 /include/crypto.php | |
parent | f2ebe41a509d6e7f332fdc4cb43d14d555375bdf (diff) | |
download | volse-hubzilla-f35609d26cd9e6fb2c177ca1e422d0f0729f4f2e.tar.gz volse-hubzilla-f35609d26cd9e6fb2c177ca1e422d0f0729f4f2e.tar.bz2 volse-hubzilla-f35609d26cd9e6fb2c177ca1e422d0f0729f4f2e.zip |
redundant dev line from an earlier modification causes issue #404
Diffstat (limited to 'include/crypto.php')
-rw-r--r-- | include/crypto.php | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/include/crypto.php b/include/crypto.php index 42aa45b72..bc798d919 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -49,26 +49,12 @@ function AES256CBC_encrypt($data,$key,$iv) { 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) { + 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') { |