protectkey + tests

3 files changed, 55 insertions, 1 deletions

diff --git a/suhosin7.c b/suhosin7.c
index 14b7fa0..7986f2a 100644
--- a/suhosin7.c
+++ b/suhosin7.c
@@ -378,7 +378,7 @@ PHP_INI_BEGIN()
 
 #ifdef HAVE_PHP_SESSION
         // STD_S7_INI_BOOLEAN("suhosin.session.encrypt",                "1",            PHP_INI_PERDIR|PHP_INI_SYSTEM,  OnUpdateMiscBool, session_encrypt)
-        // STD_S7_INI_ENTRY("suhosin.session.cryptkey", "", PHP_INI_ALL, OnUpdateMiscString, session_cryptkey)
+        STD_S7_INI_ENTRY("suhosin.session.cryptkey", "", PHP_INI_ALL, OnUpdateMiscString, session_cryptkey)
         // STD_S7_INI_BOOLEAN("suhosin.session.cryptua",                "0",            PHP_INI_PERDIR|PHP_INI_SYSTEM,  OnUpdateMiscBool, session_cryptua)
         // STD_S7_INI_BOOLEAN("suhosin.session.cryptdocroot",           "1",            PHP_INI_PERDIR|PHP_INI_SYSTEM,  OnUpdateMiscBool, session_cryptdocroot)
         // STD_S7_INI_ENTRY("suhosin.session.cryptraddr", "0", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateMiscLong, session_cryptraddr)     
diff --git a/tests/misc/protectkey_off.phpt b/tests/misc/protectkey_off.phpt
new file mode 100644
index 0000000..3120e58
--- /dev/null
+++ b/tests/misc/protectkey_off.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Testing: suhosin.protectkey=On
+--SKIPIF--
+<?php include "../skipifnotcli.inc"; ?>
+--INI--
+suhosin.log.sapi=0
+suhosin.log.stdout=255
+suhosin.log.script=0
+suhosin.log.syslog=0
+suhosin.protectkey=0
+suhosin.session.cryptkey=SUHOSIN_TEST_SESSION_CRYPTKEY
+suhosin.cookie.cryptkey=SUHOSIN_TEST_COOKIE_CRYPTKEY
+suhosin.rand.seedingkey=SUHOSIN_TEST_SEEDINGKEY
+--FILE--
+<?php
+ob_start();
+phpinfo();
+$data = ob_get_contents();
+ob_clean();
+var_dump(strpos($data, "SUHOSIN_TEST_SESSION_CRYPTKEY")===FALSE);
+var_dump(strpos($data, "SUHOSIN_TEST_COOKIE_CRYPTKEY")===FALSE);
+var_dump(strpos($data, "SUHOSIN_TEST_SEEDINGKEY")===FALSE);
+?>
+--EXPECTF--
+bool(false)
+bool(false)
+bool(false)
diff --git a/tests/misc/protectkey_on.phpt b/tests/misc/protectkey_on.phpt
new file mode 100644
index 0000000..969d556
--- /dev/null
+++ b/tests/misc/protectkey_on.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Testing: suhosin.protectkey=On
+--SKIPIF--
+<?php include "../skipifnotcli.inc"; ?>
+--INI--
+suhosin.log.sapi=0
+suhosin.log.stdout=255
+suhosin.log.script=0
+suhosin.log.syslog=0
+suhosin.protectkey=1
+suhosin.session.cryptkey=SUHOSIN_TEST_SESSION_CRYPTKEY
+suhosin.cookie.cryptkey=SUHOSIN_TEST_COOKIE_CRYPTKEY
+suhosin.rand.seedingkey=SUHOSIN_TEST_SEEDINGKEY
+--FILE--
+<?php
+ob_start();
+phpinfo();
+$data = ob_get_contents();
+ob_clean();
+var_dump(strpos($data, "SUHOSIN_TEST_SESSION_CRYPTKEY")===FALSE);
+var_dump(strpos($data, "SUHOSIN_TEST_COOKIE_CRYPTKEY")===FALSE);
+var_dump(strpos($data, "SUHOSIN_TEST_SEEDINGKEY")===FALSE);
+?>
+--EXPECTF--
+bool(true)
+bool(true)
+bool(true)