diff --git a/lib/SimpleSAML/XML/SAML20/LogoutRequest.php b/lib/SimpleSAML/XML/SAML20/LogoutRequest.php index 7c1e6e10d12da853f15f896654f9d557b893f588..e3ba3310460a68a743b636a0f79b63b44bad4892 100644 --- a/lib/SimpleSAML/XML/SAML20/LogoutRequest.php +++ b/lib/SimpleSAML/XML/SAML20/LogoutRequest.php @@ -1,6 +1,7 @@ <?php require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php'); +require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php'); require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Metadata/MetaDataStorageHandler.php'); /** @@ -127,8 +128,8 @@ class SimpleSAML_XML_SAML20_LogoutRequest { $spnamequalifier = isset($issuermd['SPNameQualifier']) ? $issuermd['SPNameQualifier'] : $issuermd['entityid']; } - $id = self::generateID(); - $issueInstant = self::generateIssueInstant(); + $id = SimpleSAML_Utilities::generateID(); + $issueInstant = SimpleSAML_Utilities::generateTimestamp(); $destination = $receivermd['SingleLogoutService']; @@ -146,22 +147,6 @@ class SimpleSAML_XML_SAML20_LogoutRequest { return $logoutRequest; } - - public static function generateID() { - - $length = 42; - $key = "_"; - for ( $i=0; $i < $length; $i++ ) - { - $key .= dechex( rand(0,15) ); - } - return $key; - } - - public static function generateIssueInstant() { - return gmdate("Y-m-d\TH:i:s\Z"); - } - } ?> \ No newline at end of file diff --git a/lib/SimpleSAML/XML/SAML20/LogoutResponse.php b/lib/SimpleSAML/XML/SAML20/LogoutResponse.php index 83436c9c7e42a71591ae1c0e2a6334d107a37727..95d68862ecf78c3d4ce34833b171acf5e3b665c9 100644 --- a/lib/SimpleSAML/XML/SAML20/LogoutResponse.php +++ b/lib/SimpleSAML/XML/SAML20/LogoutResponse.php @@ -100,8 +100,8 @@ class SimpleSAML_XML_SAML20_LogoutResponse { $issuermd = $this->metadata->getMetaData($issuer, $issuerset); $receivermd = $this->metadata->getMetaData($receiver, $receiverset); - $id = self::generateID(); - $issueInstant = self::generateIssueInstant(); + $id = SimpleSAML_Utilities::generateID(); + $issueInstant = SimpleSAML_Utilities::generateTimestamp(); $destination = $receivermd['SingleLogoutService']; @@ -123,24 +123,6 @@ class SimpleSAML_XML_SAML20_LogoutResponse { return $samlResponse; } - - - - public static function generateID() { - - $length = 42; - $key = "_"; - for ( $i=0; $i < $length; $i++ ) - { - $key .= dechex( rand(0,15) ); - } - return $key; - } - - public static function generateIssueInstant($offset = 0) { - return gmdate("Y-m-d\TH:i:s\Z", time() + $offset); - } - } ?> \ No newline at end of file