diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-05-31 10:59:11 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-05-31 10:59:11 +0200 |
| commit | 316fee93f7f7df92db514de961b74a71556fdb63 (patch) | |
| tree | 896fd1d53ccb3863380653d1b065c7fc4ef7a641 /include/crypto.php | |
| parent | 1523e116b91824394244c4f76a9e105a3cecd5b6 (diff) | |
| parent | 670e83b30050201e3ac069c9dfa86a92aff2431d (diff) | |
| download | volse-hubzilla-316fee93f7f7df92db514de961b74a71556fdb63.tar.gz volse-hubzilla-316fee93f7f7df92db514de961b74a71556fdb63.tar.bz2 volse-hubzilla-316fee93f7f7df92db514de961b74a71556fdb63.zip | |
Merge branch 'dev' into sabre32
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') { |