3 files changed, 11 insertions, 11 deletions

diff --git a/www/saml2/idp/SingleLogoutService.php b/www/saml2/idp/SingleLogoutService.php
index 032027a..1ecaf01 100644
--- a/www/saml2/idp/SingleLogoutService.php
+++ b/www/saml2/idp/SingleLogoutService.php
@@ -17,7 +17,7 @@ $idpEntityId = $metadata->getMetaDataCurrentEntityID('saml20-idp-hosted');
 $idp = SimpleSAML_IdP::getById('saml2:' . $idpEntityId);
 
 if (isset($_REQUEST['ReturnTo'])) {
-	$idp->doLogoutRedirect(SimpleSAML_Utilities::checkURLAllowed((string)$_REQUEST['ReturnTo']));
+	$idp->doLogoutRedirect(\SimpleSAML\Utils\HTTP::checkURLAllowed((string)$_REQUEST['ReturnTo']));
 } else {
     try {
         sspmod_saml_IdP_SAML2::receiveLogoutMessage($idp);
diff --git a/www/saml2/idp/initSLO.php b/www/saml2/idp/initSLO.php
index 87191b7..52c73b7 100644
--- a/www/saml2/idp/initSLO.php
+++ b/www/saml2/idp/initSLO.php
@@ -11,5 +11,5 @@ if (!isset($_GET['RelayState'])) {
 	throw new SimpleSAML_Error_Error('NORELAYSTATE');
 }
 
-$idp->doLogoutRedirect(SimpleSAML_Utilities::checkURLAllowed((string)$_GET['RelayState']));
+$idp->doLogoutRedirect(\SimpleSAML\Utils\HTTP::checkURLAllowed((string)$_GET['RelayState']));
 assert('FALSE');
\ No newline at end of file
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index de515e8..631865a 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -11,7 +11,7 @@ if (!$config->getBoolean('enable.saml20-idp', false))
 
 /* Check if valid local session exists.. */
 if ($config->getBoolean('admin.protectmetadata', false)) {
-	SimpleSAML_Utilities::requireAdmin();
+    SimpleSAML\Utils\Auth::requireAdmin();
 }
 
 
@@ -22,7 +22,7 @@ try {
 	$availableCerts = array();
 
 	$keys = array();
-	$certInfo = SimpleSAML_Utilities::loadPublicKey($idpmeta, FALSE, 'new_');
+	$certInfo = SimpleSAML\Utils\Crypto::loadPublicKey($idpmeta, FALSE, 'new_');
 	if ($certInfo !== NULL) {
 		$availableCerts['new_idp.crt'] = $certInfo;
 		$keys[] = array(
@@ -36,7 +36,7 @@ try {
 		$hasNewCert = FALSE;
 	}
 
-	$certInfo = SimpleSAML_Utilities::loadPublicKey($idpmeta, TRUE);
+	$certInfo = SimpleSAML\Utils\Crypto::loadPublicKey($idpmeta, TRUE);
 	$availableCerts['idp.crt'] = $certInfo;
 	$keys[] = array(
 		'type' => 'X509Certificate',
@@ -46,7 +46,7 @@ try {
 	);
 
 	if ($idpmeta->hasValue('https.certificate')) {
-		$httpsCert = SimpleSAML_Utilities::loadPublicKey($idpmeta, TRUE, 'https.');
+		$httpsCert = SimpleSAML\Utils\Crypto::loadPublicKey($idpmeta, TRUE, 'https.');
 		assert('isset($httpsCert["certData"])');
 		$availableCerts['https.crt'] = $httpsCert;
 		$keys[] = array(
@@ -105,7 +105,7 @@ try {
 		/* Artifact sending enabled. */
 		$metaArray['ArtifactResolutionService'][] = array(
 			'index' => 0,
-			'Location' => SimpleSAML_Utilities::getBaseURL() . 'saml2/idp/ArtifactResolutionService.php',
+			'Location' => \SimpleSAML\Utils\HTTP::getBaseURL() . 'saml2/idp/ArtifactResolutionService.php',
 			'Binding' => SAML2_Const::BINDING_SOAP,
 		);
 	}
@@ -115,7 +115,7 @@ try {
 		array_unshift($metaArray['SingleSignOnService'], array(
 			'hoksso:ProtocolBinding' => SAML2_Const::BINDING_HTTP_REDIRECT,
 			'Binding' => SAML2_Const::BINDING_HOK_SSO,
-			'Location' => SimpleSAML_Utilities::getBaseURL() . 'saml2/idp/SSOService.php'));
+			'Location' => \SimpleSAML\Utils\HTTP::getBaseURL() . 'saml2/idp/SSOService.php'));
 	}
 
 	$metaArray['NameIDFormat'] = $idpmeta->getString('NameIDFormat', 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient');
@@ -161,7 +161,7 @@ try {
 	if ($idpmeta->hasValue('contacts')) {
 		$contacts = $idpmeta->getArray('contacts');
 		foreach ($contacts as $contact) {
-			$metaArray['contacts'][] = SimpleSAML_Utils_Config_Metadata::getContact($contact);
+			$metaArray['contacts'][] = \SimpleSAML\Utils\Config\Metadata::getContact($contact);
 		}
 	}
 
@@ -170,7 +170,7 @@ try {
 		$techcontact['emailAddress'] = $technicalContactEmail;
 		$techcontact['name'] = $config->getString('technicalcontact_name', NULL);
 		$techcontact['contactType'] = 'technical';
-		$metaArray['contacts'][] = SimpleSAML_Utils_Config_Metadata::getContact($techcontact);
+		$metaArray['contacts'][] = \SimpleSAML\Utils\Config\Metadata::getContact($techcontact);
 	}
 
 	$metaBuilder = new SimpleSAML_Metadata_SAMLBuilder($idpentityid);
@@ -191,7 +191,7 @@ try {
 
 		$t->data['available_certs'] = $availableCerts;
 		$t->data['header'] = 'saml20-idp';
-		$t->data['metaurl'] = SimpleSAML_Utilities::selfURLNoQuery();
+		$t->data['metaurl'] = \SimpleSAML\Utils\HTTP::getSelfURLNoQuery();
 		$t->data['metadata'] = htmlspecialchars($metaxml);
 		$t->data['metadataflat'] = htmlspecialchars($metaflat);
 		$t->data['defaultidp'] = $defaultidp;