diff options
| author | Andrew Dolgov <[email protected]> | 2018-08-13 15:59:24 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2018-08-13 15:59:24 +0300 |
| commit | 069aea5989ec7fe4090cf3f1151f99476fa038be (patch) | |
| tree | 23c48c13d8baf5d9dc72e2c7fe6615e2ae32d6c6 /include | |
| parent | eb43d9f4a8a8609b7f30ef4e2add425b9c91fe00 (diff) | |
remove FEED_CRYPT_KEY and everything related to it
always assume auth_pass_encrypted is false
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypt.php | 20 | ||||
| -rwxr-xr-x | include/sanity_check.php | 8 | ||||
| -rw-r--r-- | include/sanity_config.php | 4 |
3 files changed, 2 insertions, 30 deletions
diff --git a/include/crypt.php b/include/crypt.php deleted file mode 100644 index 3e26dfd5a..000000000 --- a/include/crypt.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php - function decrypt_string($str) { - $pair = explode(":", $str); - - if (count($pair) == 2) { - @$iv = base64_decode($pair[0]); - @$encstr = base64_decode($pair[1]); - - if ($iv && $encstr) { - $key = hash('SHA256', FEED_CRYPT_KEY, true); - - $str = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $key, $encstr, - MCRYPT_MODE_CBC, $iv); - - if ($str) return rtrim($str); - } - } - - return false; - }
\ No newline at end of file diff --git a/include/sanity_check.php b/include/sanity_check.php index 94578b404..5166adee0 100755 --- a/include/sanity_check.php +++ b/include/sanity_check.php @@ -70,14 +70,6 @@ array_push($errors, "Javascript cache is not writable (chmod -R 777 ".CACHE_DIR."/js)"); } - if (strlen(FEED_CRYPT_KEY) > 0 && strlen(FEED_CRYPT_KEY) != 24) { - array_push($errors, "FEED_CRYPT_KEY should be exactly 24 characters in length."); - } - - if (strlen(FEED_CRYPT_KEY) > 0 && !function_exists("mcrypt_decrypt")) { - array_push($errors, "FEED_CRYPT_KEY requires mcrypt functions which are not found."); - } - if (GENERATED_CONFIG_CHECK != EXPECTED_CONFIG_VERSION) { array_push($errors, "Configuration option checker sanity_config.php is outdated, please recreate it using ./utils/regen_config_checks.sh"); diff --git a/include/sanity_config.php b/include/sanity_config.php index 0e9944361..d9ae18a8b 100644 --- a/include/sanity_config.php +++ b/include/sanity_config.php @@ -1,3 +1,3 @@ -<?php # This file has been generated at: Tue, May 16, 2017 10:37:57 AM +<?php # This file has been generated at: Mon Aug 13 15:48:51 MSK 2018 define('GENERATED_CONFIG_CHECK', 26); -$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'SMTP_SECURE', 'CHECK_FOR_UPDATES', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?> +$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'SMTP_SECURE', 'CHECK_FOR_UPDATES', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?> |