Merge branch 'patch-6' of https://github.com/tvdijen/simplesamlphp into tvdijen-patch-6

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);
 

modules/adfs/lib/XMLSecurityDSig.php

-<?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;
-    }
-}