1 files changed, 18 insertions, 6 deletions
diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/utils/MOAeIDASMetadataGenerator.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/utils/MOAeIDASMetadataGenerator.java
index dd14972e3..171d5c8e2 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/utils/MOAeIDASMetadataGenerator.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/utils/MOAeIDASMetadataGenerator.java
@@ -210,10 +210,15 @@ public class MOAeIDASMetadataGenerator extends MetadataGenerator {
             addAssertionConsumerService();
         }
         fillNameIDFormat(spSSODescriptor);
-        if (params.getSpEngine() != null) {
-            ProtocolEngineI spEngine = params.getSpEngine();
-            ((MetadataSignerI) spEngine.getSigner()).signMetadata(spSSODescriptor);
-        }
+        
+        /**FIXME:
+         * 	Double signing of SPSSODescribtor is not required
+         */
+//        if (params.getSpEngine() != null) {
+//            ProtocolEngineI spEngine = params.getSpEngine();
+//            ((MetadataSignerI) spEngine.getSigner()).signMetadata(spSSODescriptor);
+//        }
+        
         entityDescriptor.getRoleDescriptors().add(spSSODescriptor);
 
     }
@@ -266,6 +271,8 @@ public class MOAeIDASMetadataGenerator extends MetadataGenerator {
         }
         idpSSODescriptor.addSupportedProtocol(params.getIdpSamlProtocol());
         fillNameIDFormat(idpSSODescriptor);
+        
+        
         if (params.getIdpEngine() != null) {
             if (params.getIdpEngine().getProtocolProcessor() != null
                     && params.getIdpEngine().getProtocolProcessor().getFormat() == SAMLExtensionFormat.EIDAS10) {
@@ -277,8 +284,13 @@ public class MOAeIDASMetadataGenerator extends MetadataGenerator {
                  */
             	generateSupportedAttributes(idpSSODescriptor, getAllSupportedAttributes());
             }
-            ProtocolEngineI idpEngine = params.getIdpEngine();
-            ((MetadataSignerI) idpEngine.getSigner()).signMetadata(idpSSODescriptor);
+            
+            
+            /**FIXME:
+             * 	Double signing of IDPSSODescribtor is not required
+             */
+//          ProtocolEngineI idpEngine = params.getIdpEngine();
+//          ((MetadataSignerI) idpEngine.getSigner()).signMetadata(idpSSODescriptor);
         }
 
         idpSSODescriptor.getSingleSignOnServices().addAll(buildSingleSignOnServicesBindingLocations());