Skip to content

Replacing mcrypt with openssl for compatibility reasons #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ThijsFeryn wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Replacing mcrypt with openssl for compatibility reasons #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bc241b
Making this module compatible with PHP 7.3 and newer by replacing mc…
ThijsFeryn Jan 7, 2019
3a0f0cd
Make cipher checking case-insensitive
Mark-H Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 24 additions & 29 deletions core/components/filelister/model/filelister/filelister.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,20 +179,18 @@ private function _encrypt($str) {
srand((double)microtime() * 1000000); /* for MCRYPT_RAND */
$key = md5($key); /* to improve variance */

/* open module, create IV */
$td = mcrypt_module_open('des','','cfb','');
$key = substr($key,0,mcrypt_enc_get_key_size($td));
$iv_size = mcrypt_enc_get_iv_size($td);
$iv = mcrypt_create_iv($iv_size,MCRYPT_RAND);

/* initialize encryption handle */
if (mcrypt_generic_init($td,$key,$iv) != -1) {
/* Encrypt data */
$c_t = mcrypt_generic($td,$str);
mcrypt_generic_deinit($td);
mcrypt_module_close($td);
$c_t = $iv.$c_t;
return urlencode($c_t);
$cipher = "DES-CFB";
$available = openssl_get_cipher_methods();
$available = array_map('strtoupper', $available);
if (in_array($cipher, $available)) {
$ivlen = openssl_cipher_iv_length($cipher);
$iv = openssl_random_pseudo_bytes($ivlen);
$ciphertext = openssl_encrypt($str, $cipher, $key, 0, $iv);
$ciphertext = $iv . $ciphertext;
return urlencode($ciphertext);
}
else {
$this->modx->log(modX::LOG_LEVEL_ERROR, "Cipher {$cipher} is not available on the server, FileLister cannot encrypt string.");
}
}

Expand All @@ -209,20 +207,17 @@ private function _decrypt($str) {

$key = md5($key);

/* open module, create IV */
$td = mcrypt_module_open('des','','cfb','');
$key = substr($key,0,mcrypt_enc_get_key_size($td));
$iv_size = mcrypt_enc_get_iv_size($td);
$iv = substr($str,0,$iv_size);
$str = substr($str,$iv_size);

/* initialize encryption handle */
if (mcrypt_generic_init($td,$key,$iv) != -1) {
/* decrypt data */
$c_t = mdecrypt_generic($td,$str);
mcrypt_generic_deinit($td);
mcrypt_module_close($td);
return $c_t;
$cipher = "DES-CFB";
$available = openssl_get_cipher_methods();
$available = array_map('strtoupper', $available);
if (in_array($cipher, $available)) {
$ivlen = openssl_cipher_iv_length($cipher);
$iv = substr($str,0,$ivlen);
$str = substr($str,$ivlen);
return openssl_decrypt($str, $cipher, $key, 0, $iv);
}
else {
$this->modx->log(modX::LOG_LEVEL_ERROR, "Cipher {$cipher} is not available on the server, FileLister cannot decrypt string.");
}
}

Expand Down Expand Up @@ -307,4 +302,4 @@ public function renderFile($path) {
readfile($absolutePath);
}
}
}
}