diff options
| author | Ben Fuhrmannek | 2016-03-01 14:55:46 +0100 |
|---|---|---|
| committer | Ben Fuhrmannek | 2016-03-01 14:55:46 +0100 |
| commit | c180da6de0851521cae98a1b385e03a120d5cf61 (patch) | |
| tree | ddd49425cf08f6b70b6cb88858fbe0d1f50d2456 /suhosin.c | |
| parent | 7060d15d6d2624f81cb3a57ee319fa61ba06ad89 (diff) | |
added secure configuration loader (#28)secureconfig
Diffstat (limited to 'suhosin.c')
| -rw-r--r-- | suhosin.c | 7 |
1 files changed, 6 insertions, 1 deletions
| @@ -907,6 +907,8 @@ PHP_INI_BEGIN() | |||
| 907 | STD_ZEND_INI_BOOLEAN("suhosin.srand.ignore", "1", ZEND_INI_SYSTEM|ZEND_INI_PERDIR, OnUpdateMiscBool, srand_ignore,zend_suhosin_globals, suhosin_globals) | 907 | STD_ZEND_INI_BOOLEAN("suhosin.srand.ignore", "1", ZEND_INI_SYSTEM|ZEND_INI_PERDIR, OnUpdateMiscBool, srand_ignore,zend_suhosin_globals, suhosin_globals) |
| 908 | STD_ZEND_INI_BOOLEAN("suhosin.mt_srand.ignore", "1", ZEND_INI_SYSTEM|ZEND_INI_PERDIR, OnUpdateMiscBool, mt_srand_ignore,zend_suhosin_globals, suhosin_globals) | 908 | STD_ZEND_INI_BOOLEAN("suhosin.mt_srand.ignore", "1", ZEND_INI_SYSTEM|ZEND_INI_PERDIR, OnUpdateMiscBool, mt_srand_ignore,zend_suhosin_globals, suhosin_globals) |
| 909 | 909 | ||
| 910 | STD_PHP_INI_ENTRY("suhosin.secureconfig.cryptkey", "", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateMiscString, secureconfig_cryptkey, zend_suhosin_globals, suhosin_globals) | ||
| 911 | |||
| 910 | PHP_INI_END() | 912 | PHP_INI_END() |
| 911 | /* }}} */ | 913 | /* }}} */ |
| 912 | 914 | ||
| @@ -1051,7 +1053,10 @@ PHP_MINIT_FUNCTION(suhosin) | |||
| 1051 | suhosin_hook_memory_limit(TSRMLS_C); | 1053 | suhosin_hook_memory_limit(TSRMLS_C); |
| 1052 | suhosin_hook_sha256(TSRMLS_C); | 1054 | suhosin_hook_sha256(TSRMLS_C); |
| 1053 | suhosin_hook_ex_imp(TSRMLS_C); | 1055 | suhosin_hook_ex_imp(TSRMLS_C); |
| 1054 | 1056 | #ifdef SUHOSIN_EXPERIMENTAL | |
| 1057 | suhosin_hook_secureconfig(TSRMLS_C); | ||
| 1058 | #endif | ||
| 1059 | |||
| 1055 | #if PHP_VERSION_ID < 50500 | 1060 | #if PHP_VERSION_ID < 50500 |
| 1056 | /* register the logo for phpinfo */ | 1061 | /* register the logo for phpinfo */ |
| 1057 | php_register_info_logo(SUHOSIN_LOGO_GUID, "image/jpeg", suhosin_logo, sizeof(suhosin_logo)); | 1062 | php_register_info_logo(SUHOSIN_LOGO_GUID, "image/jpeg", suhosin_logo, sizeof(suhosin_logo)); |
