diff --git a/lib/SimpleSAML/Metadata/Signer.php b/lib/SimpleSAML/Metadata/Signer.php index 5e11918b54e07715c2f8b3054e2cad84d9797ad5..47828f4946dd4c44e6ef4e03e229ab9645b9ac18 100644 --- a/lib/SimpleSAML/Metadata/Signer.php +++ b/lib/SimpleSAML/Metadata/Signer.php @@ -263,11 +263,7 @@ class SimpleSAML_Metadata_Signer $rootNode = $xml->firstChild; // sign the metadata with our private key - if ($type == 'ADFS IdP') { - $objXMLSecDSig = new sspmod_adfs_XMLSecurityDSig($metadataString); - } else { - $objXMLSecDSig = new XMLSecurityDSig(); - } + $objXMLSecDSig = new XMLSecurityDSig(); $objXMLSecDSig->setCanonicalMethod(XMLSecurityDSig::EXC_C14N); diff --git a/modules/adfs/lib/XMLSecurityDSig.php b/modules/adfs/lib/XMLSecurityDSig.php deleted file mode 100644 index b851a18cdadaa01dfa1ec4897f0231fe65dd1766..0000000000000000000000000000000000000000 --- a/modules/adfs/lib/XMLSecurityDSig.php +++ /dev/null @@ -1,30 +0,0 @@ -<?php - -/** - * This class should be considered a temporary workaround to - * solve the lack of custom formatting in XMLSecurityDSig - * (xmlseclibs). It should be possible to either configure - * the original class to avoid formatting, or to use a custom - * template for the signature. - * - * @todo Move this functionality to xmlseclibs. - * - * @author Daniel Tsosie - * @package SimpleSAMLphp - */ -class sspmod_adfs_XMLSecurityDSig extends XMLSecurityDSig { - - function __construct($metaxml) { - $template = ''; - - if (strpos("\n", $metaxml) === FALSE) { - foreach (explode("\n", self::template) as $line) - $template .= trim($line); - } else { - $template = self::template; - } - - $sigdoc = \SAML2\DOMDocumentFactory::fromString($template); - $this->sigNode = $sigdoc->documentElement; - } -}