jruby: use a modern c14n library

ext/java/nokogiri/NokogiriService.java

@@ -92,6 +92,8 @@ public class NokogiriService implements BasicLibraryService
     createSaxModule(ruby, xmlSaxModule, htmlSaxModule);
     createXsltModule(ruby, xsltModule);
     nokogiri.setInternalVariable("cache", populateNokogiriClassCahce(ruby));
+
+    org.apache.xml.security.Init.init();
   }
 
   private void

ext/java/nokogiri/XmlDocument.java

@@ -8,6 +8,7 @@
 import static nokogiri.internals.NokogiriHelpers.stringOrNil;
 
 import java.util.List;
+import java.io.ByteArrayOutputStream;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -36,13 +37,13 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import org.apache.xml.security.exceptions.XMLSecurityException;
+import org.apache.xml.security.c14n.Canonicalizer;
+
 import nokogiri.internals.NokogiriHelpers;
 import nokogiri.internals.NokogiriNamespaceCache;
 import nokogiri.internals.SaveContextVisitor;
 import nokogiri.internals.XmlDomParserContext;
-import nokogiri.internals.c14n.CanonicalFilter;
-import nokogiri.internals.c14n.CanonicalizationException;
-import nokogiri.internals.c14n.Canonicalizer;
 
 /**
  * Class for Nokogiri::XML::Document
@@ -673,15 +674,14 @@ private static class DocumentBuilderFactoryHolder
     try {
       Canonicalizer canonicalizer = Canonicalizer.getInstance(algorithmURI);
       XmlNode startingNode = getStartingNode(block);
-      byte[] result;
-      CanonicalFilter filter = new CanonicalFilter(context, block);
+      ByteArrayOutputStream writer = new ByteArrayOutputStream();
       if (inclusive_namespace == null) {
-        result = canonicalizer.canonicalizeSubtree(startingNode.getNode(), filter);
+        canonicalizer.canonicalizeSubtree(startingNode.getNode(), writer);
       } else {
-        result = canonicalizer.canonicalizeSubtree(startingNode.getNode(), inclusive_namespace, filter);
+        canonicalizer.canonicalizeSubtree(startingNode.getNode(), inclusive_namespace, writer);
       }
-      return RubyString.newString(context.runtime, new ByteList(result, UTF8Encoding.INSTANCE));
-    } catch (Exception e) {
+      return RubyString.newString(context.runtime, writer.toString());
+    } catch (XMLSecurityException e) {
       throw context.getRuntime().newRuntimeError(e.getMessage());
     }
   }