Skip to content
Snippets Groups Projects
Commit 88ed9fbe authored by Olav Morken's avatar Olav Morken
Browse files

Replace use of $config->getValue('secret') with SimpleSAML_utilities::getSecretSalt().

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1720 44740490-163a-0410-bde0-09ae8108e29a
parent b7a3c60a
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
$config = SimpleSAML_Configuration::getInstance(); $config = SimpleSAML_Configuration::getInstance();
$session = SimpleSAML_Session::getInstance(); $session = SimpleSAML_Session::getInstance();
$authTokenContactsSP = sha1('ldapstatus:hobbit|' . $config->getValue('secret')); $authTokenContactsSP = sha1('ldapstatus:hobbit|' . SimpleSAML_Utilities::getSecretSalt());
if (isset($_REQUEST['getToken'])) { if (isset($_REQUEST['getToken'])) {
...@@ -43,7 +43,7 @@ $ignore = ''; ...@@ -43,7 +43,7 @@ $ignore = '';
if (array_key_exists('ignore', $_REQUEST)) $ignore = '&ignore=' . $_REQUEST['ignore']; if (array_key_exists('ignore', $_REQUEST)) $ignore = '&ignore=' . $_REQUEST['ignore'];
$secretKey = sha1('ldapstatus|' . $config->getValue('secret') . '|hobbit'); $secretKey = sha1('ldapstatus|' . SimpleSAML_Utilities::getSecretSalt() . '|hobbit');
$secretURL = SimpleSAML_Utilities::addURLparameter( $secretURL = SimpleSAML_Utilities::addURLparameter(
SimpleSAML_Utilities::selfURLNoQuery(), array( SimpleSAML_Utilities::selfURLNoQuery(), array(
'key' => $secretKey, 'key' => $secretKey,
......
...@@ -18,7 +18,7 @@ if (array_key_exists('orgtest', $_REQUEST)) { ...@@ -18,7 +18,7 @@ if (array_key_exists('orgtest', $_REQUEST)) {
} }
$orgConfig = SimpleSAML_Configuration::loadFromArray($orgs[$orgtest], 'org:[' . $orgtest . ']'); $orgConfig = SimpleSAML_Configuration::loadFromArray($orgs[$orgtest], 'org:[' . $orgtest . ']');
$secretKey = sha1('ldapstatus|' . $config->getValue('secret') . '|' . $_REQUEST['orgtest']); $secretKey = sha1('ldapstatus|' . SimpleSAML_Utilities::getSecretSalt() . '|' . $_REQUEST['orgtest']);
$secretURL = SimpleSAML_Utilities::addURLparameter( $secretURL = SimpleSAML_Utilities::addURLparameter(
SimpleSAML_Utilities::selfURLNoQuery(), array( SimpleSAML_Utilities::selfURLNoQuery(), array(
'orgtest' => $_REQUEST['orgtest'], 'orgtest' => $_REQUEST['orgtest'],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment