You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2019/02/18 15:10:05 UTC
svn commit: r1853805 [1/2] - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/jcp/xml/dsig/internal/dom/
main/java/org/apache/xml/security/utils/
test/java/javax/xml/crypto/test/dsig/
Author: coheigea
Date: Mon Feb 18 15:10:04 2019
New Revision: 1853805
URL: http://svn.apache.org/viewvc?rev=1853805&view=rev
Log:
Revert "[SANTUARIO-349] - Update JCP dsig code to simplify serialization"
This reverts commit 18b0fde1f8a5c7de811bc8ec3a886890d31276b9.
Added:
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java
Removed:
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/BaseStructure.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriter.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriterToTree.java
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyName.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMStructure.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Base64.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/DetachedTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java Mon Feb 18 15:10:04 2019
@@ -25,19 +25,23 @@ import java.security.InvalidKeyException
import java.security.SignatureException;
import java.security.spec.AlgorithmParameterSpec;
import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.SignatureMethod;
+import javax.xml.crypto.dsig.SignedInfo;
import javax.xml.crypto.dsig.XMLSignature;
import javax.xml.crypto.dsig.XMLSignatureException;
import javax.xml.crypto.dsig.XMLSignContext;
import javax.xml.crypto.dsig.XMLValidateContext;
import javax.xml.crypto.dsig.spec.SignatureMethodParameterSpec;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* An abstract class representing a SignatureMethod. Subclasses implement
* a specific XML DSig signature algorithm.
*/
-abstract class AbstractDOMSignatureMethod extends BaseStructure
+abstract class AbstractDOMSignatureMethod extends DOMStructure
implements SignatureMethod {
// denotes the type of signature algorithm
@@ -61,7 +65,7 @@ abstract class AbstractDOMSignatureMetho
* as the passed in signature is improperly encoded
* @throws XMLSignatureException if an unexpected error occurs
*/
- abstract boolean verify(Key key, DOMSignedInfo si, byte[] sig,
+ abstract boolean verify(Key key, SignedInfo si, byte[] sig,
XMLValidateContext context)
throws InvalidKeyException, SignatureException, XMLSignatureException;
@@ -79,7 +83,7 @@ abstract class AbstractDOMSignatureMetho
* the wrong type, or parameters are missing, etc
* @throws XMLSignatureException if an unexpected error occurs
*/
- abstract byte[] sign(Key key, DOMSignedInfo si, XMLSignContext context)
+ abstract byte[] sign(Key key, SignedInfo si, XMLSignContext context)
throws InvalidKeyException, XMLSignatureException;
/**
@@ -97,16 +101,21 @@ abstract class AbstractDOMSignatureMetho
* This method invokes the {@link #marshalParams marshalParams}
* method to marshal any algorithm-specific parameters.
*/
- public void marshal(XmlWriter xwriter, String dsPrefix)
+ @Override
+ public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
throws MarshalException
{
- xwriter.writeStartElement(dsPrefix, "SignatureMethod", XMLSignature.XMLNS);
- xwriter.writeAttribute("", "", "Algorithm", getAlgorithm());
+ Document ownerDoc = DOMUtils.getOwnerDocument(parent);
+
+ Element smElem = DOMUtils.createElement(ownerDoc, "SignatureMethod",
+ XMLSignature.XMLNS, dsPrefix);
+ DOMUtils.setAttribute(smElem, "Algorithm", getAlgorithm());
if (getParameterSpec() != null) {
- marshalParams(xwriter, dsPrefix);
+ marshalParams(smElem, dsPrefix);
}
- xwriter.writeEndElement(); // "SignatureMethod"
+
+ parent.appendChild(smElem);
}
/**
@@ -119,7 +128,7 @@ abstract class AbstractDOMSignatureMetho
* @param paramsPrefix the algorithm parameters prefix to use
* @throws MarshalException if the parameters cannot be marshalled
*/
- void marshalParams(XmlWriter xwriter, String paramsPrefix)
+ void marshalParams(Element parent, String paramsPrefix)
throws MarshalException
{
throw new MarshalException("no parameters should " +
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java Mon Feb 18 15:10:04 2019
@@ -65,7 +65,6 @@ public abstract class ApacheCanonicalize
return params;
}
- @Override
public void init(XMLStructure parent, XMLCryptoContext context)
throws InvalidAlgorithmParameterException
{
@@ -84,7 +83,6 @@ public abstract class ApacheCanonicalize
ownerDoc = DOMUtils.getOwnerDocument(transformElem);
}
- @Override
public void marshalParams(XMLStructure parent, XMLCryptoContext context)
throws MarshalException
{
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java Mon Feb 18 15:10:04 2019
@@ -41,7 +41,6 @@ public class ApacheOctetStreamData exten
this.xi = xi;
}
- @Override
public XMLSignatureInput getXMLSignatureInput() {
return xi;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java Mon Feb 18 15:10:04 2019
@@ -64,7 +64,6 @@ public abstract class ApacheTransform ex
return params;
}
- @Override
public void init(XMLStructure parent, XMLCryptoContext context)
throws InvalidAlgorithmParameterException
{
@@ -83,7 +82,6 @@ public abstract class ApacheTransform ex
ownerDoc = DOMUtils.getOwnerDocument(transformElem);
}
- @Override
public void marshalParams(XMLStructure parent, XMLCryptoContext context)
throws MarshalException
{
@@ -102,7 +100,6 @@ public abstract class ApacheTransform ex
ownerDoc = DOMUtils.getOwnerDocument(transformElem);
}
- @Override
public Data transform(Data data, XMLCryptoContext xc)
throws TransformException
{
@@ -112,7 +109,6 @@ public abstract class ApacheTransform ex
return transformIt(data, xc, null);
}
- @Override
public Data transform(Data data, XMLCryptoContext xc, OutputStream os)
throws TransformException
{
@@ -203,7 +199,6 @@ public abstract class ApacheTransform ex
}
}
- @Override
public final boolean isFeatureSupported(String feature) {
if (feature == null) {
throw new NullPointerException();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java Mon Feb 18 15:10:04 2019
@@ -44,7 +44,6 @@ public final class DOMCanonicalXMLC14N11
public static final String C14N_11_WITH_COMMENTS
= "http://www.w3.org/2006/12/xml-c14n11#WithComments";
- @Override
public void init(TransformParameterSpec params)
throws InvalidAlgorithmParameterException {
if (params != null) {
@@ -53,7 +52,6 @@ public final class DOMCanonicalXMLC14N11
}
}
- @Override
public Data transform(Data data, XMLCryptoContext xc)
throws TransformException {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java Mon Feb 18 15:10:04 2019
@@ -40,7 +40,6 @@ import org.apache.xml.security.c14n.Inva
*/
public final class DOMCanonicalXMLC14NMethod extends ApacheCanonicalizer {
- @Override
public void init(TransformParameterSpec params)
throws InvalidAlgorithmParameterException {
if (params != null) {
@@ -49,7 +48,6 @@ public final class DOMCanonicalXMLC14NMe
}
}
- @Override
public Data transform(Data data, XMLCryptoContext xc)
throws TransformException {
Added: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java?rev=1853805&view=auto
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java (added)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java Mon Feb 18 15:10:04 2019
@@ -0,0 +1,101 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id$
+ */
+package org.apache.jcp.xml.dsig.internal.dom;
+
+import java.math.BigInteger;
+import javax.xml.crypto.*;
+import javax.xml.crypto.dom.DOMCryptoContext;
+
+import org.apache.xml.security.utils.XMLUtils;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
+
+/**
+ * A DOM-based representation of the XML <code>CryptoBinary</code> simple type
+ * as defined in the W3C specification for XML-Signature Syntax and Processing.
+ * The XML Schema Definition is defined as:
+ *
+ * <xmp>
+ * <simpleType name="CryptoBinary">
+ * <restriction base = "base64Binary">
+ * </restriction>
+ * </simpleType>
+ * </xmp>
+ *
+ * @author Sean Mullan
+ */
+public final class DOMCryptoBinary extends DOMStructure {
+
+ private final BigInteger bigNum;
+ private final String value;
+
+ /**
+ * Create a <code>DOMCryptoBinary</code> instance from the specified
+ * <code>BigInteger</code>
+ *
+ * @param bigNum the arbitrary-length integer
+ * @throws NullPointerException if <code>bigNum</code> is <code>null</code>
+ */
+ public DOMCryptoBinary(BigInteger bigNum) {
+ if (bigNum == null) {
+ throw new NullPointerException("bigNum is null");
+ }
+ this.bigNum = bigNum;
+ // convert to bitstring
+ byte[] bytes = XMLUtils.getBytes(bigNum, bigNum.bitLength());
+ value = XMLUtils.encodeToString(bytes);
+ }
+
+ /**
+ * Creates a <code>DOMCryptoBinary</code> from a node.
+ *
+ * @param cbNode a CryptoBinary text node
+ * @throws MarshalException if value cannot be decoded (invalid format)
+ */
+ public DOMCryptoBinary(Node cbNode) throws MarshalException {
+ value = cbNode.getNodeValue();
+ try {
+ bigNum = new BigInteger(1, XMLUtils.decode(((Text) cbNode).getData()));
+ } catch (Exception ex) {
+ throw new MarshalException(ex);
+ }
+ }
+
+ /**
+ * Returns the <code>BigInteger</code> that this object contains.
+ *
+ * @return the <code>BigInteger</code> that this object contains
+ */
+ public BigInteger getBigNum() {
+ return bigNum;
+ }
+
+ @Override
+ public void marshal(Node parent, String prefix, DOMCryptoContext context)
+ throws MarshalException {
+ parent.appendChild
+ (DOMUtils.getOwnerDocument(parent).createTextNode(value));
+ }
+}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java Mon Feb 18 15:10:04 2019
@@ -25,18 +25,21 @@
package org.apache.jcp.xml.dsig.internal.dom;
import javax.xml.crypto.*;
+import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.*;
import javax.xml.crypto.dsig.spec.DigestMethodParameterSpec;
import java.security.InvalidAlgorithmParameterException;
import java.security.spec.AlgorithmParameterSpec;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* DOM-based abstract implementation of DigestMethod.
*
*/
-public abstract class DOMDigestMethod extends BaseStructure
+public abstract class DOMDigestMethod extends DOMStructure
implements DigestMethod {
static final String SHA224 =
@@ -143,7 +146,6 @@ public abstract class DOMDigestMethod ex
}
}
- @Override
public final AlgorithmParameterSpec getParameterSpec() {
return params;
}
@@ -171,17 +173,21 @@ public abstract class DOMDigestMethod ex
* This method invokes the abstract {@link #marshalParams marshalParams}
* method to marshal any algorithm-specific parameters.
*/
- public static void marshal(XmlWriter xwriter, DigestMethod digest, String prefix)
+ @Override
+ public void marshal(Node parent, String prefix, DOMCryptoContext context)
throws MarshalException
{
- xwriter.writeStartElement(prefix, "DigestMethod", XMLSignature.XMLNS);
- xwriter.writeAttribute("", "", "Algorithm", digest.getAlgorithm());
+ Document ownerDoc = DOMUtils.getOwnerDocument(parent);
- // this is totally over-engineered - nothing implements marshalParams.
- if (digest.getParameterSpec() != null && digest instanceof DOMDigestMethod) {
- ( (DOMDigestMethod) digest).marshalParams(xwriter, prefix);
+ Element dmElem = DOMUtils.createElement(ownerDoc, "DigestMethod",
+ XMLSignature.XMLNS, prefix);
+ DOMUtils.setAttribute(dmElem, "Algorithm", getAlgorithm());
+
+ if (params != null) {
+ marshalParams(dmElem, prefix);
}
- xwriter.writeEndElement(); // "DigestMethod"
+
+ parent.appendChild(dmElem);
}
@Override
@@ -222,7 +228,7 @@ public abstract class DOMDigestMethod ex
* @param the namespace prefix to use
* @throws MarshalException if the parameters cannot be marshalled
*/
- void marshalParams(XmlWriter xwriter, String prefix)
+ void marshalParams(Element parent, String prefix)
throws MarshalException
{
throw new MarshalException("no parameters should " +
@@ -244,11 +250,9 @@ public abstract class DOMDigestMethod ex
SHA1(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return DigestMethod.SHA1;
}
- @Override
String getMessageDigestAlgorithm() {
return "SHA-1";
}
@@ -280,11 +284,9 @@ public abstract class DOMDigestMethod ex
SHA256(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return DigestMethod.SHA256;
}
- @Override
String getMessageDigestAlgorithm() {
return "SHA-256";
}
@@ -298,11 +300,9 @@ public abstract class DOMDigestMethod ex
SHA384(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return SHA384;
}
- @Override
String getMessageDigestAlgorithm() {
return "SHA-384";
}
@@ -316,11 +316,9 @@ public abstract class DOMDigestMethod ex
SHA512(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return DigestMethod.SHA512;
}
- @Override
String getMessageDigestAlgorithm() {
return "SHA-512";
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java Mon Feb 18 15:10:04 2019
@@ -34,7 +34,6 @@ import javax.xml.crypto.dsig.spec.Transf
*/
public final class DOMEnvelopedTransform extends ApacheTransform {
- @Override
public void init(TransformParameterSpec params)
throws InvalidAlgorithmParameterException {
if (params != null) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java Mon Feb 18 15:10:04 2019
@@ -46,7 +46,6 @@ import org.apache.xml.security.c14n.Inva
*/
public final class DOMExcC14NMethod extends ApacheCanonicalizer {
- @Override
public void init(TransformParameterSpec params)
throws InvalidAlgorithmParameterException
{
@@ -59,7 +58,6 @@ public final class DOMExcC14NMethod exte
}
}
- @Override
public void init(XMLStructure parent, XMLCryptoContext context)
throws InvalidAlgorithmParameterException
{
@@ -105,12 +103,20 @@ public final class DOMExcC14NMethod exte
return;
}
- XmlWriterToTree xwriter = new XmlWriterToTree(Marshaller.getMarshallers(), transformElem);
-
- String prefix =
- DOMUtils.getNSPrefix(context, CanonicalizationMethod.EXCLUSIVE);
- xwriter.writeStartElement(prefix, "InclusiveNamespaces", CanonicalizationMethod.EXCLUSIVE);
- xwriter.writeNamespace(prefix, CanonicalizationMethod.EXCLUSIVE);
+ String prefix = DOMUtils.getNSPrefix(context,
+ CanonicalizationMethod.EXCLUSIVE);
+ Element eElem = DOMUtils.createElement(ownerDoc,
+ "InclusiveNamespaces",
+ CanonicalizationMethod.EXCLUSIVE,
+ prefix);
+ if (prefix == null || prefix.length() == 0) {
+ eElem.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns",
+ CanonicalizationMethod.EXCLUSIVE);
+ } else {
+ eElem.setAttributeNS("http://www.w3.org/2000/xmlns/",
+ "xmlns:" + prefix,
+ CanonicalizationMethod.EXCLUSIVE);
+ }
ExcC14NParameterSpec params = (ExcC14NParameterSpec)spec;
StringBuilder prefixListAttr = new StringBuilder("");
@@ -121,16 +127,15 @@ public final class DOMExcC14NMethod exte
prefixListAttr.append(' ');
}
}
- xwriter.writeAttribute("", "", "PrefixList", prefixListAttr.toString());
+ DOMUtils.setAttribute(eElem, "PrefixList", prefixListAttr.toString());
this.inclusiveNamespaces = prefixListAttr.toString();
- xwriter.writeEndElement(); // "InclusiveNamespaces"
+ transformElem.appendChild(eElem);
}
public String getParamsNSURI() {
return CanonicalizationMethod.EXCLUSIVE;
}
- @Override
public Data transform(Data data, XMLCryptoContext xc)
throws TransformException
{
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java Mon Feb 18 15:10:04 2019
@@ -38,6 +38,7 @@ import java.security.SignatureException;
import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.Mac;
import javax.crypto.SecretKey;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.jcp.xml.dsig.internal.MacOutputStream;
@@ -113,30 +114,32 @@ public abstract class DOMHMACSignatureMe
}
}
- @Override
public final AlgorithmParameterSpec getParameterSpec() {
return params;
}
- @Override
SignatureMethodParameterSpec unmarshalParams(Element paramsElem)
throws MarshalException
{
- outputLength = Integer.parseInt(textOfNode(paramsElem));
+ outputLength = Integer.parseInt(paramsElem.getFirstChild().getNodeValue());
outputLengthSet = true;
LOG.debug("unmarshalled outputLength: {}", outputLength);
return new HMACParameterSpec(outputLength);
}
- @Override
- void marshalParams(XmlWriter xwriter, String prefix)
+ void marshalParams(Element parent, String prefix)
throws MarshalException
{
- xwriter.writeTextElement(prefix, "HMACOutputLength", XMLSignature.XMLNS, String.valueOf(outputLength));
+ Document ownerDoc = DOMUtils.getOwnerDocument(parent);
+ Element hmacElem = DOMUtils.createElement(ownerDoc, "HMACOutputLength",
+ XMLSignature.XMLNS, prefix);
+ hmacElem.appendChild(ownerDoc.createTextNode
+ (String.valueOf(outputLength)));
+
+ parent.appendChild(hmacElem);
}
- @Override
- boolean verify(Key key, DOMSignedInfo si, byte[] sig,
+ boolean verify(Key key, SignedInfo si, byte[] sig,
XMLValidateContext context)
throws InvalidKeyException, SignatureException, XMLSignatureException
{
@@ -158,14 +161,13 @@ public abstract class DOMHMACSignatureMe
("HMACOutputLength must not be less than " + getDigestLength());
}
hmac.init(key);
- si.canonicalize(context, new MacOutputStream(hmac));
+ ((DOMSignedInfo)si).canonicalize(context, new MacOutputStream(hmac));
byte[] result = hmac.doFinal();
return MessageDigest.isEqual(sig, result);
}
- @Override
- byte[] sign(Key key, DOMSignedInfo si, XMLSignContext context)
+ byte[] sign(Key key, SignedInfo si, XMLSignContext context)
throws InvalidKeyException, XMLSignatureException
{
if (key == null || si == null) {
@@ -186,11 +188,10 @@ public abstract class DOMHMACSignatureMe
("HMACOutputLength must not be less than " + getDigestLength());
}
hmac.init(key);
- si.canonicalize(context, new MacOutputStream(hmac));
+ ((DOMSignedInfo)si).canonicalize(context, new MacOutputStream(hmac));
return hmac.doFinal();
}
- @Override
boolean paramsEqual(AlgorithmParameterSpec spec) {
if (getParameterSpec() == spec) {
return true;
@@ -203,7 +204,6 @@ public abstract class DOMHMACSignatureMe
return outputLength == ospec.getOutputLength();
}
- @Override
Type getAlgorithmType() {
return Type.HMAC;
}
@@ -221,15 +221,12 @@ public abstract class DOMHMACSignatureMe
SHA1(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return SignatureMethod.HMAC_SHA1;
}
- @Override
String getJCAAlgorithm() {
return "HmacSHA1";
}
- @Override
int getDigestLength() {
return 160;
}
@@ -265,15 +262,12 @@ public abstract class DOMHMACSignatureMe
SHA256(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return HMAC_SHA256;
}
- @Override
String getJCAAlgorithm() {
return "HmacSHA256";
}
- @Override
int getDigestLength() {
return 256;
}
@@ -287,15 +281,12 @@ public abstract class DOMHMACSignatureMe
SHA384(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return HMAC_SHA384;
}
- @Override
String getJCAAlgorithm() {
return "HmacSHA384";
}
- @Override
int getDigestLength() {
return 384;
}
@@ -309,15 +300,12 @@ public abstract class DOMHMACSignatureMe
SHA512(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return HMAC_SHA512;
}
- @Override
String getJCAAlgorithm() {
return "HmacSHA512";
}
- @Override
int getDigestLength() {
return 512;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java Mon Feb 18 15:10:04 2019
@@ -32,10 +32,13 @@ import java.util.List;
import javax.xml.crypto.MarshalException;
import javax.xml.crypto.XMLCryptoContext;
import javax.xml.crypto.XMLStructure;
+import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.XMLSignature;
import javax.xml.crypto.dsig.dom.DOMSignContext;
import javax.xml.crypto.dsig.keyinfo.KeyInfo;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -43,7 +46,7 @@ import org.w3c.dom.Node;
* DOM-based implementation of KeyInfo.
*
*/
-public final class DOMKeyInfo extends BaseStructure implements KeyInfo {
+public final class DOMKeyInfo extends DOMStructure implements KeyInfo {
private final String id;
private final List<XMLStructure> keyInfoTypes;
@@ -97,7 +100,14 @@ public final class DOMKeyInfo extends Ba
Provider provider)
throws MarshalException
{
- id = DOMUtils.getIdAttributeValue(kiElem, "Id");
+ // get Id attribute, if specified
+ Attr attr = kiElem.getAttributeNodeNS(null, "Id");
+ if (attr != null) {
+ id = attr.getValue();
+ kiElem.setIdAttributeNode(attr, true);
+ } else {
+ id = null;
+ }
// get all children nodes
List<XMLStructure> content = new ArrayList<>();
@@ -130,17 +140,14 @@ public final class DOMKeyInfo extends Ba
keyInfoTypes = Collections.unmodifiableList(content);
}
- @Override
public String getId() {
return id;
}
- @Override
public List<XMLStructure> getContent() {
return keyInfoTypes;
}
- @Override
public void marshal(XMLStructure parent, XMLCryptoContext context)
throws MarshalException
{
@@ -151,44 +158,62 @@ public final class DOMKeyInfo extends Ba
throw new ClassCastException("parent must be of type DOMStructure");
}
- internalMarshal( (javax.xml.crypto.dom.DOMStructure) parent, context);
- }
-
- private void internalMarshal(javax.xml.crypto.dom.DOMStructure parent, XMLCryptoContext context)
- throws MarshalException {
- Node pNode = parent.getNode();
+ Node pNode = ((javax.xml.crypto.dom.DOMStructure)parent).getNode();
String dsPrefix = DOMUtils.getSignaturePrefix(context);
+ Element kiElem = DOMUtils.createElement
+ (DOMUtils.getOwnerDocument(pNode), "KeyInfo",
+ XMLSignature.XMLNS, dsPrefix);
+ if (dsPrefix == null || dsPrefix.length() == 0) {
+ kiElem.setAttributeNS("http://www.w3.org/2000/xmlns/",
+ "xmlns", XMLSignature.XMLNS);
+ } else {
+ kiElem.setAttributeNS("http://www.w3.org/2000/xmlns/",
+ "xmlns:" + dsPrefix, XMLSignature.XMLNS);
+ }
Node nextSibling = null;
if (context instanceof DOMSignContext) {
nextSibling = ((DOMSignContext)context).getNextSibling();
}
-
- XmlWriterToTree xwriter = new XmlWriterToTree(Marshaller.getMarshallers(), pNode, nextSibling);
- marshalInternal(xwriter, this, dsPrefix, context, true);
+ marshal(pNode, kiElem, nextSibling, dsPrefix, (DOMCryptoContext)context);
}
- public static void marshal(XmlWriter xwriter, KeyInfo ki, String dsPrefix,
- XMLCryptoContext context) throws MarshalException {
- marshalInternal(xwriter, ki, dsPrefix, context, false);
+ @Override
+ public void marshal(Node parent, String dsPrefix,
+ DOMCryptoContext context)
+ throws MarshalException
+ {
+ marshal(parent, null, dsPrefix, context);
}
- private static void marshalInternal(XmlWriter xwriter, KeyInfo ki,
- String dsPrefix, XMLCryptoContext context, boolean declareNamespace) throws MarshalException {
-
- xwriter.writeStartElement(dsPrefix, "KeyInfo", XMLSignature.XMLNS);
- if (declareNamespace) {
- xwriter.writeNamespace(dsPrefix, XMLSignature.XMLNS);
- }
+ public void marshal(Node parent, Node nextSibling, String dsPrefix,
+ DOMCryptoContext context)
+ throws MarshalException
+ {
+ Document ownerDoc = DOMUtils.getOwnerDocument(parent);
+ Element kiElem = DOMUtils.createElement(ownerDoc, "KeyInfo",
+ XMLSignature.XMLNS, dsPrefix);
+ marshal(parent, kiElem, nextSibling, dsPrefix, context);
+ }
- xwriter.writeIdAttribute("", "", "Id", ki.getId());
+ private void marshal(Node parent, Element kiElem, Node nextSibling,
+ String dsPrefix, DOMCryptoContext context)
+ throws MarshalException
+ {
// create and append KeyInfoType elements
- List<XMLStructure> keyInfoTypes = getContent(ki);
for (XMLStructure kiType : keyInfoTypes) {
- xwriter.marshalStructure(kiType, dsPrefix, context);
+ if (kiType instanceof DOMStructure) {
+ ((DOMStructure)kiType).marshal(kiElem, dsPrefix, context);
+ } else {
+ DOMUtils.appendChild(kiElem,
+ ((javax.xml.crypto.dom.DOMStructure)kiType).getNode());
+ }
}
- xwriter.writeEndElement(); // "KeyInfo"
+ // append id attribute
+ DOMUtils.setAttributeID(kiElem, "Id", id);
+
+ parent.insertBefore(kiElem, nextSibling);
}
@Override
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java Mon Feb 18 15:10:04 2019
@@ -27,15 +27,24 @@ package org.apache.jcp.xml.dsig.internal
import java.math.BigInteger;
import java.security.KeyException;
import java.security.PublicKey;
-import java.security.interfaces.DSAPublicKey;
import java.security.interfaces.ECPublicKey;
+import java.security.interfaces.DSAPublicKey;
import java.security.interfaces.RSAPublicKey;
import java.util.List;
-import javax.xml.crypto.*;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.URIDereferencer;
+import javax.xml.crypto.XMLStructure;
import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.XMLSignature;
-import javax.xml.crypto.dsig.keyinfo.*;
+import javax.xml.crypto.dsig.keyinfo.KeyInfo;
+import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
+import javax.xml.crypto.dsig.keyinfo.KeyName;
+import javax.xml.crypto.dsig.keyinfo.KeyValue;
+import javax.xml.crypto.dsig.keyinfo.PGPData;
+import javax.xml.crypto.dsig.keyinfo.RetrievalMethod;
+import javax.xml.crypto.dsig.keyinfo.X509Data;
+import javax.xml.crypto.dsig.keyinfo.X509IssuerSerial;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -49,24 +58,20 @@ public final class DOMKeyInfoFactory ext
public DOMKeyInfoFactory() { }
- @Override
@SuppressWarnings("rawtypes")
public KeyInfo newKeyInfo(List content) {
return newKeyInfo(content, null);
}
- @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public KeyInfo newKeyInfo(List content, String id) {
return new DOMKeyInfo(content, id);
}
- @Override
public KeyName newKeyName(String name) {
return new DOMKeyName(name);
}
- @Override
public KeyValue newKeyValue(PublicKey key) throws KeyException {
String algorithm = key.getAlgorithm();
if ("DSA".equals(algorithm)) {
@@ -80,30 +85,25 @@ public final class DOMKeyInfoFactory ext
}
}
- @Override
public PGPData newPGPData(byte[] keyId) {
return newPGPData(keyId, null, null);
}
- @Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public PGPData newPGPData(byte[] keyId, byte[] keyPacket, List other) {
return new DOMPGPData(keyId, keyPacket, other);
}
- @Override
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({ "rawtypes", "unchecked" })
public PGPData newPGPData(byte[] keyPacket, List other) {
return new DOMPGPData(keyPacket, other);
}
- @Override
public RetrievalMethod newRetrievalMethod(String uri) {
return newRetrievalMethod(uri, null, null);
}
- @Override
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({ "rawtypes", "unchecked" })
public RetrievalMethod newRetrievalMethod(String uri, String type,
List transforms) {
if (uri == null) {
@@ -112,8 +112,7 @@ public final class DOMKeyInfoFactory ext
return new DOMRetrievalMethod(uri, type, transforms);
}
- @Override
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes" })
public X509Data newX509Data(List content) {
return new DOMX509Data(content);
}
@@ -124,7 +123,6 @@ public final class DOMKeyInfoFactory ext
return new DOMX509IssuerSerial(issuerName, serialNumber);
}
- @Override
public boolean isFeatureSupported(String feature) {
if (feature == null) {
throw new NullPointerException();
@@ -133,7 +131,6 @@ public final class DOMKeyInfoFactory ext
}
}
- @Override
public URIDereferencer getURIDereferencer() {
return DOMURIDereferencer.INSTANCE;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyName.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyName.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyName.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyName.java Mon Feb 18 15:10:04 2019
@@ -24,15 +24,20 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.dom.DOMCryptoContext;
+import javax.xml.crypto.dsig.XMLSignature;
import javax.xml.crypto.dsig.keyinfo.KeyName;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* DOM-based implementation of KeyName.
*
*/
-public final class DOMKeyName extends BaseStructure implements KeyName {
+public final class DOMKeyName extends DOMStructure implements KeyName {
private final String name;
@@ -55,15 +60,26 @@ public final class DOMKeyName extends Ba
* @param knElem a KeyName element
*/
public DOMKeyName(Element knElem) {
- name = textOfNode(knElem);
+ name = knElem.getFirstChild().getNodeValue();
}
- @Override
public String getName() {
return name;
}
@Override
+ public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
+ throws MarshalException
+ {
+ Document ownerDoc = DOMUtils.getOwnerDocument(parent);
+ // prepend namespace prefix, if necessary
+ Element knElem = DOMUtils.createElement(ownerDoc, "KeyName",
+ XMLSignature.XMLNS, dsPrefix);
+ knElem.appendChild(ownerDoc.createTextNode(name));
+ parent.appendChild(knElem);
+ }
+
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java Mon Feb 18 15:10:04 2019
@@ -47,19 +47,20 @@ import java.security.spec.RSAPublicKeySp
import java.util.Arrays;
import javax.xml.crypto.MarshalException;
-import javax.xml.crypto.XMLCryptoContext;
-import javax.xml.crypto.XMLStructure;
+import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.XMLSignature;
import javax.xml.crypto.dsig.keyinfo.KeyValue;
import org.apache.xml.security.utils.XMLUtils;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* DOM-based implementation of KeyValue.
*
*/
-public abstract class DOMKeyValue<K extends PublicKey> extends BaseStructure implements KeyValue {
+public abstract class DOMKeyValue<K extends PublicKey> extends DOMStructure implements KeyValue {
private static final String XMLDSIG_11_XMLNS
= "http://www.w3.org/2009/xmldsig11#";
@@ -99,7 +100,6 @@ public abstract class DOMKeyValue<K exte
}
}
- @Override
public PublicKey getPublicKey() throws KeyException {
if (publicKey == null) {
throw new KeyException("can't convert KeyValue to PublicKey");
@@ -108,17 +108,22 @@ public abstract class DOMKeyValue<K exte
}
}
- public void marshal(XmlWriter xwriter, String dsPrefix, XMLCryptoContext context)
+ @Override
+ public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
throws MarshalException
{
+ Document ownerDoc = DOMUtils.getOwnerDocument(parent);
+
// create KeyValue element
- xwriter.writeStartElement(dsPrefix, "KeyValue", XMLSignature.XMLNS);
- marshalPublicKey(xwriter, publicKey, dsPrefix, context);
- xwriter.writeEndElement(); // "KeyValue"
+ Element kvElem = DOMUtils.createElement(ownerDoc, "KeyValue",
+ XMLSignature.XMLNS, dsPrefix);
+ marshalPublicKey(kvElem, ownerDoc, dsPrefix, context);
+
+ parent.appendChild(kvElem);
}
- abstract void marshalPublicKey(XmlWriter xwriter, K key, String dsPrefix,
- XMLCryptoContext context) throws MarshalException;
+ abstract void marshalPublicKey(Node parent, Document doc, String dsPrefix,
+ DOMCryptoContext context) throws MarshalException;
abstract K unmarshalKeyValue(Element kvtElem)
throws MarshalException;
@@ -159,25 +164,13 @@ public abstract class DOMKeyValue<K exte
public static BigInteger decode(Element elem) throws MarshalException {
try {
- String base64str = BaseStructure.textOfNode(elem);
+ String base64str = elem.getFirstChild().getNodeValue();
return new BigInteger(1, XMLUtils.decode(base64str));
} catch (Exception ex) {
throw new MarshalException(ex);
}
}
- public static void writeBase64BigIntegerElement(
- XmlWriter xwriter, String prefix, String localName, String namespaceURI, BigInteger value
- ) {
- byte[] bytes = XMLUtils.getBytes(value, value.bitLength());
- xwriter.writeTextElement(prefix, localName, namespaceURI, XMLUtils.encodeToString(bytes));
- }
-
- public static void marshal(XmlWriter xwriter, BigInteger bigNum) {
- byte[] bytes = XMLUtils.getBytes(bigNum, bigNum.bitLength());
- xwriter.writeCharacters(XMLUtils.encodeToString(bytes));
- }
-
@Override
public int hashCode() {
int result = 17;
@@ -190,25 +183,36 @@ public abstract class DOMKeyValue<K exte
static final class RSA extends DOMKeyValue<RSAPublicKey> {
// RSAKeyValue CryptoBinaries
+ private DOMCryptoBinary modulus, exponent;
private KeyFactory rsakf;
RSA(RSAPublicKey key) throws KeyException {
super(key);
+ RSAPublicKey rkey = key;
+ exponent = new DOMCryptoBinary(rkey.getPublicExponent());
+ modulus = new DOMCryptoBinary(rkey.getModulus());
}
RSA(Element elem) throws MarshalException {
super(elem);
}
- @Override
- void marshalPublicKey(XmlWriter xwriter, RSAPublicKey publicKey, String dsPrefix,
- XMLCryptoContext context) throws MarshalException {
- xwriter.writeStartElement(dsPrefix, "RSAKeyValue", XMLSignature.XMLNS);
-
- writeBase64BigIntegerElement(xwriter, dsPrefix, "Modulus", XMLSignature.XMLNS, publicKey.getModulus());
- writeBase64BigIntegerElement(xwriter, dsPrefix, "Exponent", XMLSignature.XMLNS, publicKey.getPublicExponent());
-
- xwriter.writeEndElement(); // "RSAKeyValue"
+ void marshalPublicKey(Node parent, Document doc, String dsPrefix,
+ DOMCryptoContext context) throws MarshalException {
+ Element rsaElem = DOMUtils.createElement(doc, "RSAKeyValue",
+ XMLSignature.XMLNS,
+ dsPrefix);
+ Element modulusElem = DOMUtils.createElement(doc, "Modulus",
+ XMLSignature.XMLNS,
+ dsPrefix);
+ Element exponentElem = DOMUtils.createElement(doc, "Exponent",
+ XMLSignature.XMLNS,
+ dsPrefix);
+ modulus.marshal(modulusElem, dsPrefix, context);
+ exponent.marshal(exponentElem, dsPrefix, context);
+ rsaElem.appendChild(modulusElem);
+ rsaElem.appendChild(exponentElem);
+ parent.appendChild(rsaElem);
}
@Override
@@ -238,10 +242,17 @@ public abstract class DOMKeyValue<K exte
static final class DSA extends DOMKeyValue<DSAPublicKey> {
// DSAKeyValue CryptoBinaries
+ private DOMCryptoBinary p, q, g, y; //, seed, pgen;
private KeyFactory dsakf;
DSA(DSAPublicKey key) throws KeyException {
super(key);
+ DSAPublicKey dkey = key;
+ DSAParams params = dkey.getParams();
+ p = new DOMCryptoBinary(params.getP());
+ q = new DOMCryptoBinary(params.getQ());
+ g = new DOMCryptoBinary(params.getG());
+ y = new DOMCryptoBinary(dkey.getY());
}
DSA(Element elem) throws MarshalException {
@@ -249,21 +260,31 @@ public abstract class DOMKeyValue<K exte
}
@Override
- void marshalPublicKey(XmlWriter xwriter, DSAPublicKey publicKey, String dsPrefix,
- XMLCryptoContext context)
+ void marshalPublicKey(Node parent, Document doc, String dsPrefix,
+ DOMCryptoContext context)
throws MarshalException
{
- DSAParams params = publicKey.getParams();
-
- xwriter.writeStartElement(dsPrefix, "DSAKeyValue", XMLSignature.XMLNS);
-
+ Element dsaElem = DOMUtils.createElement(doc, "DSAKeyValue",
+ XMLSignature.XMLNS,
+ dsPrefix);
// parameters J, Seed & PgenCounter are not included
- writeBase64BigIntegerElement(xwriter, dsPrefix, "P", XMLSignature.XMLNS, params.getP());
- writeBase64BigIntegerElement(xwriter, dsPrefix, "Q", XMLSignature.XMLNS, params.getQ());
- writeBase64BigIntegerElement(xwriter, dsPrefix, "G", XMLSignature.XMLNS, params.getG());
- writeBase64BigIntegerElement(xwriter, dsPrefix, "Y", XMLSignature.XMLNS, publicKey.getY() );
-
- xwriter.writeEndElement(); // "DSAKeyValue"
+ Element pElem = DOMUtils.createElement(doc, "P", XMLSignature.XMLNS,
+ dsPrefix);
+ Element qElem = DOMUtils.createElement(doc, "Q", XMLSignature.XMLNS,
+ dsPrefix);
+ Element gElem = DOMUtils.createElement(doc, "G", XMLSignature.XMLNS,
+ dsPrefix);
+ Element yElem = DOMUtils.createElement(doc, "Y", XMLSignature.XMLNS,
+ dsPrefix);
+ p.marshal(pElem, dsPrefix, context);
+ q.marshal(qElem, dsPrefix, context);
+ g.marshal(gElem, dsPrefix, context);
+ y.marshal(yElem, dsPrefix, context);
+ dsaElem.appendChild(pElem);
+ dsaElem.appendChild(qElem);
+ dsaElem.appendChild(gElem);
+ dsaElem.appendChild(yElem);
+ parent.appendChild(dsaElem);
}
@Override
@@ -313,8 +334,7 @@ public abstract class DOMKeyValue<K exte
}
static final class EC extends DOMKeyValue<ECPublicKey> {
-
- // ECKeyValue CryptoBinaries
+ // ECKeyValue CryptoBinaries
private byte[] ecPublicKey;
private KeyFactory eckf;
private ECParameterSpec ecParams;
@@ -453,27 +473,35 @@ public abstract class DOMKeyValue<K exte
}
@Override
- void marshalPublicKey(XmlWriter xwriter, ECPublicKey publicKey, String dsPrefix,
- XMLCryptoContext context)
+ void marshalPublicKey(Node parent, Document doc, String dsPrefix,
+ DOMCryptoContext context)
throws MarshalException
{
String prefix = DOMUtils.getNSPrefix(context, XMLDSIG_11_XMLNS);
- xwriter.writeStartElement(prefix, "ECKeyValue", XMLDSIG_11_XMLNS);
-
- xwriter.writeStartElement(prefix, "NamedCurve", XMLDSIG_11_XMLNS);
- xwriter.writeNamespace(prefix, XMLDSIG_11_XMLNS);
+ Element ecKeyValueElem = DOMUtils.createElement(doc, "ECKeyValue",
+ XMLDSIG_11_XMLNS,
+ prefix);
+ Element namedCurveElem = DOMUtils.createElement(doc, "NamedCurve",
+ XMLDSIG_11_XMLNS,
+ prefix);
+ Element publicKeyElem = DOMUtils.createElement(doc, "PublicKey",
+ XMLDSIG_11_XMLNS,
+ prefix);
String oid = getCurveOid(ecParams);
if (oid == null) {
throw new MarshalException("Invalid ECParameterSpec");
}
- xwriter.writeAttribute("", "", "URI", "urn:oid:" + oid);
- xwriter.writeEndElement();
-
- xwriter.writeStartElement(prefix, "PublicKey", XMLDSIG_11_XMLNS);
+ DOMUtils.setAttribute(namedCurveElem, "URI", "urn:oid:" + oid);
+ String qname = (prefix == null || prefix.length() == 0)
+ ? "xmlns" : "xmlns:" + prefix;
+ namedCurveElem.setAttributeNS("http://www.w3.org/2000/xmlns/",
+ qname, XMLDSIG_11_XMLNS);
+ ecKeyValueElem.appendChild(namedCurveElem);
String encoded = XMLUtils.encodeToString(ecPublicKey);
- xwriter.writeCharacters(encoded);
- xwriter.writeEndElement(); // "PublicKey"
- xwriter.writeEndElement(); // "ECKeyValue"
+ publicKeyElem.appendChild
+ (DOMUtils.getOwnerDocument(publicKeyElem).createTextNode(encoded));
+ ecKeyValueElem.appendChild(publicKeyElem);
+ parent.appendChild(ecKeyValueElem);
}
@Override
@@ -567,21 +595,23 @@ public abstract class DOMKeyValue<K exte
}
static final class Unknown extends DOMKeyValue<PublicKey> {
- private XMLStructure externalPublicKey;
+ private javax.xml.crypto.dom.DOMStructure externalPublicKey;
Unknown(Element elem) throws MarshalException {
super(elem);
}
+
@Override
PublicKey unmarshalKeyValue(Element kvElem) throws MarshalException {
externalPublicKey = new javax.xml.crypto.dom.DOMStructure(kvElem);
return null;
}
+
@Override
- void marshalPublicKey(XmlWriter xwriter, PublicKey publicKey, String dsPrefix,
- XMLCryptoContext context)
+ void marshalPublicKey(Node parent, Document doc, String dsPrefix,
+ DOMCryptoContext context)
throws MarshalException
{
- xwriter.marshalStructure(externalPublicKey, dsPrefix, context);
+ parent.appendChild(externalPublicKey.getNode());
}
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java Mon Feb 18 15:10:04 2019
@@ -25,18 +25,21 @@
package org.apache.jcp.xml.dsig.internal.dom;
import javax.xml.crypto.*;
+import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.*;
import java.security.Provider;
import java.util.*;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* DOM-based implementation of Manifest.
*
*/
-public final class DOMManifest extends BaseStructure implements Manifest {
+public final class DOMManifest extends DOMStructure implements Manifest {
private final List<Reference> references;
private final String id;
@@ -54,7 +57,7 @@ public final class DOMManifest extends B
* @throws ClassCastException if <code>references</code> contains any
* entries that are not of type {@link Reference}
*/
- public DOMManifest(List<DOMReference> references, String id) {
+ public DOMManifest(List<? extends Reference> references, String id) {
if (references == null) {
throw new NullPointerException("references cannot be null");
}
@@ -109,7 +112,6 @@ public final class DOMManifest extends B
this.references = Collections.unmodifiableList(refs);
}
- @Override
public String getId() {
return id;
}
@@ -124,18 +126,21 @@ public final class DOMManifest extends B
return references;
}
- public static void marshal(XmlWriter xwriter, Manifest manif, String dsPrefix, XMLCryptoContext context)
- throws MarshalException {
- xwriter.writeStartElement(dsPrefix, "Manifest", XMLSignature.XMLNS);
- xwriter.writeIdAttribute("", "", "Id", manif.getId());
+ @Override
+ public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
+ throws MarshalException
+ {
+ Document ownerDoc = DOMUtils.getOwnerDocument(parent);
+ Element manElem = DOMUtils.createElement(ownerDoc, "Manifest",
+ XMLSignature.XMLNS, dsPrefix);
+
+ DOMUtils.setAttributeID(manElem, "Id", id);
// add references
- @SuppressWarnings("unchecked")
- List<Reference> references = manif.getReferences();
for (Reference ref : references) {
- ((DOMReference)ref).marshal(xwriter, dsPrefix, context);
+ ((DOMReference)ref).marshal(manElem, dsPrefix, context);
}
- xwriter.writeEndElement(); // "Manifest"
+ parent.appendChild(manElem);
}
@Override
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java Mon Feb 18 15:10:04 2019
@@ -27,9 +27,11 @@ package org.apache.jcp.xml.dsig.internal
import java.util.*;
import javax.xml.crypto.*;
+import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.XMLSignature;
import javax.xml.crypto.dsig.keyinfo.PGPData;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -39,7 +41,7 @@ import org.apache.xml.security.utils.XML
* DOM-based implementation of PGPData.
*
*/
-public final class DOMPGPData extends BaseStructure implements PGPData {
+public final class DOMPGPData extends DOMStructure implements PGPData {
private final byte[] keyId;
private final byte[] keyPacket;
@@ -168,21 +170,56 @@ public final class DOMPGPData extends Ba
this.externalElements = Collections.unmodifiableList(other);
}
- @Override
public byte[] getKeyId() {
return keyId == null ? null : keyId.clone();
}
- @Override
public byte[] getKeyPacket() {
return keyPacket == null ? null : keyPacket.clone();
}
- @Override
public List<XMLStructure> getExternalElements() {
return externalElements;
}
+ @Override
+ public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
+ throws MarshalException
+ {
+ Document ownerDoc = DOMUtils.getOwnerDocument(parent);
+ Element pdElem = DOMUtils.createElement(ownerDoc, "PGPData",
+ XMLSignature.XMLNS, dsPrefix);
+
+ // create and append PGPKeyID element
+ if (keyId != null) {
+ Element keyIdElem = DOMUtils.createElement(ownerDoc, "PGPKeyID",
+ XMLSignature.XMLNS,
+ dsPrefix);
+ keyIdElem.appendChild
+ (ownerDoc.createTextNode(XMLUtils.encodeToString(keyId)));
+ pdElem.appendChild(keyIdElem);
+ }
+
+ // create and append PGPKeyPacket element
+ if (keyPacket != null) {
+ Element keyPktElem = DOMUtils.createElement(ownerDoc,
+ "PGPKeyPacket",
+ XMLSignature.XMLNS,
+ dsPrefix);
+ keyPktElem.appendChild
+ (ownerDoc.createTextNode(XMLUtils.encodeToString(keyPacket)));
+ pdElem.appendChild(keyPktElem);
+ }
+
+ // create and append any elements
+ for (XMLStructure extElem : externalElements) {
+ DOMUtils.appendChild(pdElem, ((javax.xml.crypto.dom.DOMStructure)
+ extElem).getNode());
+ }
+
+ parent.appendChild(pdElem);
+ }
+
/**
* We assume packets use the new format packet syntax, as specified in
* section 4 of RFC 2440.
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java Mon Feb 18 15:10:04 2019
@@ -33,6 +33,7 @@ package org.apache.jcp.xml.dsig.internal
import javax.xml.crypto.*;
import javax.xml.crypto.dsig.*;
+import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dom.DOMURIReference;
import java.io.*;
@@ -42,6 +43,7 @@ import java.security.*;
import java.util.*;
import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -248,7 +250,14 @@ public final class DOMReference extends
// unmarshal attributes
this.uri = DOMUtils.getAttributeValue(refElem, "URI");
- this.id = DOMUtils.getIdAttributeValue(refElem, "Id");
+
+ Attr attr = refElem.getAttributeNodeNS(null, "Id");
+ if (attr != null) {
+ this.id = attr.getValue();
+ refElem.setIdAttributeNode(attr, true);
+ } else {
+ this.id = null;
+ }
this.type = DOMUtils.getAttributeValue(refElem, "Type");
this.here = refElem.getAttributeNodeNS(null, "URI");
@@ -259,76 +268,80 @@ public final class DOMReference extends
this.provider = provider;
}
- @Override
public DigestMethod getDigestMethod() {
return digestMethod;
}
- @Override
public String getId() {
return id;
}
- @Override
public String getURI() {
return uri;
}
- @Override
public String getType() {
return type;
}
- @Override
public List<Transform> getTransforms() {
return Collections.unmodifiableList(allTransforms);
}
- @Override
public byte[] getDigestValue() {
return digestValue == null ? null : digestValue.clone();
}
- @Override
public byte[] getCalculatedDigestValue() {
return calcDigestValue == null ? null
: calcDigestValue.clone();
}
@Override
- public void marshal(XmlWriter xwriter, String dsPrefix, XMLCryptoContext context)
+ public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
throws MarshalException
{
LOG.debug("Marshalling Reference");
- xwriter.writeStartElement(dsPrefix, "Reference", XMLSignature.XMLNS);
- XMLStructure refStruct = xwriter.getCurrentNodeAsStructure();
- refElem = (Element) ((javax.xml.crypto.dom.DOMStructure) refStruct).getNode();
+ Document ownerDoc = DOMUtils.getOwnerDocument(parent);
+
+ refElem = DOMUtils.createElement(ownerDoc, "Reference",
+ XMLSignature.XMLNS, dsPrefix);
// set attributes
- xwriter.writeIdAttribute("", "", "Id", id);
- here = xwriter.writeAttribute("", "", "URI", uri);
- xwriter.writeAttribute("", "", "Type", type);
+ DOMUtils.setAttributeID(refElem, "Id", id);
+ DOMUtils.setAttribute(refElem, "URI", uri);
+ DOMUtils.setAttribute(refElem, "Type", type);
// create and append Transforms element
if (!allTransforms.isEmpty()) {
- xwriter.writeStartElement(dsPrefix, "Transforms", XMLSignature.XMLNS);
+ Element transformsElem = DOMUtils.createElement(ownerDoc,
+ "Transforms",
+ XMLSignature.XMLNS,
+ dsPrefix);
+ refElem.appendChild(transformsElem);
for (Transform transform : allTransforms) {
- xwriter.marshalStructure(transform, dsPrefix, context);
+ ((DOMStructure)transform).marshal(transformsElem,
+ dsPrefix, context);
}
- xwriter.writeEndElement(); // "Transforms"
}
// create and append DigestMethod element
- DOMDigestMethod.marshal(xwriter, digestMethod, dsPrefix);
+ ((DOMDigestMethod)digestMethod).marshal(refElem, dsPrefix, context);
// create and append DigestValue element
LOG.debug("Adding digestValueElem");
- xwriter.writeStartElement(dsPrefix, "DigestValue", XMLSignature.XMLNS);
+ Element digestValueElem = DOMUtils.createElement(ownerDoc,
+ "DigestValue",
+ XMLSignature.XMLNS,
+ dsPrefix);
if (digestValue != null) {
- xwriter.writeCharacters(XMLUtils.encodeToString(digestValue));
+ digestValueElem.appendChild
+ (ownerDoc.createTextNode(XMLUtils.encodeToString(digestValue)));
}
- xwriter.writeEndElement(); // "DigestValue"
- xwriter.writeEndElement(); // "Reference"
+ refElem.appendChild(digestValueElem);
+
+ parent.appendChild(refElem);
+ here = refElem.getAttributeNodeNS(null, "URI");
}
public void digest(XMLSignContext signContext)
@@ -357,7 +370,6 @@ public final class DOMReference extends
LOG.debug("Reference digesting completed");
}
- @Override
public boolean validate(XMLValidateContext validateContext)
throws XMLSignatureException
{
@@ -380,12 +392,10 @@ public final class DOMReference extends
return validationStatus;
}
- @Override
public Data getDereferencedData() {
return derefData;
}
- @Override
public InputStream getDigestInputStream() {
return dis;
}
@@ -512,8 +522,8 @@ public final class DOMReference extends
} else {
transformsElem = DOMUtils.getFirstChildElement(refElem);
}
- XmlWriter xwriter = new XmlWriterToTree(Marshaller.getMarshallers(), transformsElem);
- t.marshal(xwriter, dsPrefix, context);
+ t.marshal(transformsElem, dsPrefix,
+ (DOMCryptoContext)context);
allTransforms.add(t);
xi.updateOutputStream(os, true);
} else {
@@ -546,7 +556,6 @@ public final class DOMReference extends
}
}
- @Override
public Node getHere() {
return here;
}
@@ -610,7 +619,6 @@ public final class DOMReference extends
try {
final Set<Node> s = xsi.getNodeSet();
return new NodeSetData() {
- @Override
public Iterator<Node> iterator() { return s.iterator(); }
};
} catch (Exception e) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java Mon Feb 18 15:10:04 2019
@@ -48,6 +48,7 @@ import javax.xml.crypto.URIDereferencer;
import javax.xml.crypto.URIReferenceException;
import javax.xml.crypto.XMLCryptoContext;
import javax.xml.crypto.XMLStructure;
+import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dom.DOMURIReference;
import javax.xml.crypto.dsig.Transform;
import javax.xml.crypto.dsig.XMLSignature;
@@ -173,50 +174,53 @@ public final class DOMRetrievalMethod ex
}
}
- @Override
public String getURI() {
return uri;
}
- @Override
public String getType() {
return type;
}
- @Override
public List<Transform> getTransforms() {
return transforms;
}
@Override
- public void marshal(XmlWriter xwriter, String dsPrefix, XMLCryptoContext context)
+ public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
throws MarshalException
{
- xwriter.writeStartElement(dsPrefix, "RetrievalMethod", XMLSignature.XMLNS);
+ Document ownerDoc = DOMUtils.getOwnerDocument(parent);
+ Element rmElem = DOMUtils.createElement(ownerDoc, "RetrievalMethod",
+ XMLSignature.XMLNS, dsPrefix);
- // TODO - see whether it is important to capture the "here" attribute as part of the
- // marshalling - do any of the tests fail?
// add URI and Type attributes
- here = xwriter.writeAttribute("", "", "URI", uri);
- xwriter.writeAttribute("", "", "Type", type);
+ DOMUtils.setAttribute(rmElem, "URI", uri);
+ DOMUtils.setAttribute(rmElem, "Type", type);
// add Transforms elements
if (!transforms.isEmpty()) {
- xwriter.writeStartElement(dsPrefix, "Transforms", XMLSignature.XMLNS);
+ Element transformsElem = DOMUtils.createElement(ownerDoc,
+ "Transforms",
+ XMLSignature.XMLNS,
+ dsPrefix);
+ rmElem.appendChild(transformsElem);
for (Transform transform : transforms) {
- ((DOMTransform)transform).marshal(xwriter, dsPrefix, context);
+ ((DOMTransform)transform).marshal(transformsElem,
+ dsPrefix, context);
}
- xwriter.writeEndElement(); // "Transforms"
}
- xwriter.writeEndElement(); // "RetrievalMethod"
+
+ parent.appendChild(rmElem);
+
+ // save here node
+ here = rmElem.getAttributeNodeNS(null, "URI");
}
- @Override
public Node getHere() {
return here;
}
- @Override
public Data dereference(XMLCryptoContext context)
throws URIReferenceException
{
@@ -238,7 +242,7 @@ public final class DOMRetrievalMethod ex
// pass dereferenced data through Transforms
try {
for (Transform transform : transforms) {
- data = transform.transform(data, context);
+ data = ((DOMTransform)transform).transform(data, context);
}
} catch (Exception e) {
throw new URIReferenceException(e);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java Mon Feb 18 15:10:04 2019
@@ -188,13 +188,11 @@ public abstract class DOMSignatureMethod
}
}
- @Override
public final AlgorithmParameterSpec getParameterSpec() {
return params;
}
- @Override
- boolean verify(Key key, DOMSignedInfo si, byte[] sig,
+ boolean verify(Key key, SignedInfo si, byte[] sig,
XMLValidateContext context)
throws InvalidKeyException, SignatureException, XMLSignatureException
{
@@ -223,7 +221,7 @@ public abstract class DOMSignatureMethod
LOG.debug("Signature Bytes length: {}", sig.length);
try (SignerOutputStream outputStream = new SignerOutputStream(signature)) {
- si.canonicalize(context, outputStream);
+ ((DOMSignedInfo)si).canonicalize(context, outputStream);
Type type = getAlgorithmType();
if (type == Type.DSA) {
@@ -240,8 +238,7 @@ public abstract class DOMSignatureMethod
}
}
- @Override
- byte[] sign(Key key, DOMSignedInfo si, XMLSignContext context)
+ byte[] sign(Key key, SignedInfo si, XMLSignContext context)
throws InvalidKeyException, XMLSignatureException
{
if (key == null || si == null) {
@@ -268,7 +265,7 @@ public abstract class DOMSignatureMethod
LOG.debug("JCA Algorithm: {}", getJCAAlgorithm());
try (SignerOutputStream outputStream = new SignerOutputStream(signature)) {
- si.canonicalize(context, outputStream);
+ ((DOMSignedInfo)si).canonicalize(context, outputStream);
Type type = getAlgorithmType();
if (type == Type.DSA) {
@@ -317,15 +314,12 @@ public abstract class DOMSignatureMethod
SHA224withRSA(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return RSA_SHA224;
}
- @Override
String getJCAAlgorithm() {
return "SHA224withRSA";
}
- @Override
Type getAlgorithmType() {
return Type.RSA;
}
@@ -339,15 +333,12 @@ public abstract class DOMSignatureMethod
SHA256withRSA(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return RSA_SHA256;
}
- @Override
String getJCAAlgorithm() {
return "SHA256withRSA";
}
- @Override
Type getAlgorithmType() {
return Type.RSA;
}
@@ -361,15 +352,12 @@ public abstract class DOMSignatureMethod
SHA384withRSA(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return RSA_SHA384;
}
- @Override
String getJCAAlgorithm() {
return "SHA384withRSA";
}
- @Override
Type getAlgorithmType() {
return Type.RSA;
}
@@ -383,15 +371,12 @@ public abstract class DOMSignatureMethod
SHA512withRSA(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return RSA_SHA512;
}
- @Override
String getJCAAlgorithm() {
return "SHA512withRSA";
}
- @Override
Type getAlgorithmType() {
return Type.RSA;
}
@@ -559,15 +544,12 @@ public abstract class DOMSignatureMethod
SHA1withDSA(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return SignatureMethod.DSA_SHA1;
}
- @Override
String getJCAAlgorithm() {
return "SHA1withDSA";
}
- @Override
Type getAlgorithmType() {
return Type.DSA;
}
@@ -600,15 +582,12 @@ public abstract class DOMSignatureMethod
SHA1withECDSA(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return ECDSA_SHA1;
}
- @Override
String getJCAAlgorithm() {
return "SHA1withECDSA";
}
- @Override
Type getAlgorithmType() {
return Type.ECDSA;
}
@@ -644,15 +623,12 @@ public abstract class DOMSignatureMethod
SHA256withECDSA(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return ECDSA_SHA256;
}
- @Override
String getJCAAlgorithm() {
return "SHA256withECDSA";
}
- @Override
Type getAlgorithmType() {
return Type.ECDSA;
}
@@ -666,15 +642,12 @@ public abstract class DOMSignatureMethod
SHA384withECDSA(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return ECDSA_SHA384;
}
- @Override
String getJCAAlgorithm() {
return "SHA384withECDSA";
}
- @Override
Type getAlgorithmType() {
return Type.ECDSA;
}
@@ -688,15 +661,12 @@ public abstract class DOMSignatureMethod
SHA512withECDSA(Element dmElem) throws MarshalException {
super(dmElem);
}
- @Override
public String getAlgorithm() {
return ECDSA_SHA512;
}
- @Override
String getJCAAlgorithm() {
return "SHA512withECDSA";
}
- @Override
Type getAlgorithmType() {
return Type.ECDSA;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java?rev=1853805&r1=1853804&r2=1853805&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java Mon Feb 18 15:10:04 2019
@@ -25,10 +25,13 @@
package org.apache.jcp.xml.dsig.internal.dom;
import javax.xml.crypto.*;
+import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.*;
import java.util.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -36,7 +39,7 @@ import org.w3c.dom.Node;
* DOM-based implementation of SignatureProperties.
*
*/
-public final class DOMSignatureProperties extends BaseStructure
+public final class DOMSignatureProperties extends DOMStructure
implements SignatureProperties {
private final String id;
@@ -54,7 +57,7 @@ public final class DOMSignaturePropertie
* @throws IllegalArgumentException if <code>properties</code> is empty
* @throws NullPointerException if <code>properties</code>
*/
- public DOMSignatureProperties(List<DOMSignatureProperty> properties,
+ public DOMSignatureProperties(List<? extends SignatureProperty> properties,
String id)
{
if (properties == null) {
@@ -84,7 +87,13 @@ public final class DOMSignaturePropertie
throws MarshalException
{
// unmarshal attributes
- id = DOMUtils.getIdAttributeValue(propsElem, "Id");
+ Attr attr = propsElem.getAttributeNodeNS(null, "Id");
+ if (attr != null) {
+ id = attr.getValue();
+ propsElem.setIdAttributeNode(attr, true);
+ } else {
+ id = null;
+ }
List<SignatureProperty> newProperties = new ArrayList<>();
Node firstChild = propsElem.getFirstChild();
@@ -107,32 +116,34 @@ public final class DOMSignaturePropertie
}
}
- @Override
public List<SignatureProperty> getProperties() {
return properties;
}
- @Override
public String getId() {
return id;
}
- public static void marshal(XmlWriter xwriter, SignatureProperties sigProps, String dsPrefix, XMLCryptoContext context)
+ @Override
+ public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
throws MarshalException
{
- xwriter.writeStartElement(dsPrefix, "SignatureProperties", XMLSignature.XMLNS);
+ Document ownerDoc = DOMUtils.getOwnerDocument(parent);
+ Element propsElem = DOMUtils.createElement(ownerDoc,
+ "SignatureProperties",
+ XMLSignature.XMLNS,
+ dsPrefix);
// set attributes
- xwriter.writeIdAttribute("", "", "Id", sigProps.getId());
+ DOMUtils.setAttributeID(propsElem, "Id", id);
// create and append any properties
- @SuppressWarnings("unchecked")
- List<SignatureProperty> properties = sigProps.getProperties();
for (SignatureProperty property : properties) {
- DOMSignatureProperty.marshal(xwriter, property, dsPrefix, context);
+ ((DOMSignatureProperty)property).marshal(propsElem, dsPrefix,
+ context);
}
- xwriter.writeEndElement(); // "SignatureProperties"
+ parent.appendChild(propsElem);
}
@Override