From 88ed9fbe7f871248fc06a1fc32581139c1cd65c0 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Thu, 27 Aug 2009 13:45:26 +0000
Subject: [PATCH] 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
---
modules/ldapstatus/www/hobbit.php | 4 ++--
modules/ldapstatus/www/index.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/ldapstatus/www/hobbit.php b/modules/ldapstatus/www/hobbit.php
index 268cd9e5e..d05b2e119 100644
--- a/modules/ldapstatus/www/hobbit.php
+++ b/modules/ldapstatus/www/hobbit.php
@@ -4,7 +4,7 @@
$config = SimpleSAML_Configuration::getInstance();
$session = SimpleSAML_Session::getInstance();
-$authTokenContactsSP = sha1('ldapstatus:hobbit|' . $config->getValue('secret'));
+$authTokenContactsSP = sha1('ldapstatus:hobbit|' . SimpleSAML_Utilities::getSecretSalt());
if (isset($_REQUEST['getToken'])) {
@@ -43,7 +43,7 @@ $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(
SimpleSAML_Utilities::selfURLNoQuery(), array(
'key' => $secretKey,
diff --git a/modules/ldapstatus/www/index.php b/modules/ldapstatus/www/index.php
index 1f52f8eb0..ea707c3d3 100644
--- a/modules/ldapstatus/www/index.php
+++ b/modules/ldapstatus/www/index.php
@@ -18,7 +18,7 @@ if (array_key_exists('orgtest', $_REQUEST)) {
}
$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(
SimpleSAML_Utilities::selfURLNoQuery(), array(
'orgtest' => $_REQUEST['orgtest'],
--
GitLab