aFix logic for multiple PrefixList + fix some old whitespace issues

Author: bazzadp

lib/signed-xml.js

@@ -18,8 +18,8 @@ function FileKeyInfo(file) {
   this.file = file
 
   this.getKeyInfo = function(key, prefix) {
-	prefix = prefix || ''
-	prefix = prefix ? prefix + ':' : prefix
+    prefix = prefix || ''
+    prefix = prefix ? prefix + ':' : prefix
     return "<" + prefix + "X509Data></" + prefix + "X509Data>"
   }
 
@@ -450,16 +450,15 @@ SignedXml.prototype.validateReferences = function(doc) {
     /**
      * Search for ancestor namespaces before validating references.
      */
-    if(Array.isArray(ref.transforms)){
-	  
-        ref.ancestorNamespaces = findAncestorNs(doc, elemXpath);
+    if(Array.isArray(ref.transforms)){  
+      ref.ancestorNamespaces = findAncestorNs(doc, elemXpath);
     }
 
     var c14nOptions = {
       inclusiveNamespacesPrefixList: ref.inclusiveNamespacesPrefixList,
       ancestorNamespaces: ref.ancestorNamespaces
     };
-	
+
     var canonXml = this.getCanonXml(ref.transforms, elem[0], c14nOptions);
 
     var hash = this.findHashAlgorithm(ref.digestAlgorithm)
@@ -578,7 +577,11 @@ SignedXml.prototype.loadReference = function(ref) {
     if (inclusiveNamespaces.length > 0) {
       //Should really only be one prefix list, but maybe there's some circumstances where more than one to lets handle it
       for (var i = 0; i<inclusiveNamespaces.length; i++) {
-        inclusiveNamespacesPrefixList = inclusiveNamespaces[i].getAttribute('PrefixList');
+        if (inclusiveNamespacesPrefixList) {
+          inclusiveNamespacesPrefixList = inclusiveNamespacesPrefixList + " " + inclusiveNamespaces[i].getAttribute('PrefixList');
+        } else {
+          inclusiveNamespacesPrefixList = inclusiveNamespaces[i].getAttribute('PrefixList');
+        }
       }
     }
   }
@@ -881,10 +884,10 @@ SignedXml.prototype.createSignature = function(signedInfo, prefix) {
   var xmlNsAttr = 'xmlns'
 
   if (prefix) {
-	xmlNsAttr += ':' + prefix;
-	prefix += ':';
+    xmlNsAttr += ':' + prefix;
+    prefix += ':';
   } else {
-	prefix = '';
+    prefix = '';
   }
 
   //the canonicalization requires to get a valid xml node.