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 2015/12/15 18:13:22 UTC
svn commit: r1720201 [2/24] - in /santuario/xml-security-java/trunk:
samples/javax/xml/crypto/dsig/samples/
samples/org/apache/xml/security/samples/
samples/org/apache/xml/security/samples/algorithms/
samples/org/apache/xml/security/samples/canonicaliz...
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifySignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifySignature.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifySignature.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/VerifySignature.java Tue Dec 15 17:13:17 2015
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
* @author $Author$
*/
public class VerifySignature {
-
+
static {
org.apache.xml.security.Init.init();
}
@@ -120,9 +120,9 @@ public class VerifySignature {
xpath.setNamespaceContext(new DSNamespaceContext());
String expression = "//ds:Signature[1]";
- Element sigElement =
+ Element sigElement =
(Element) xpath.evaluate(expression, doc, XPathConstants.NODE);
- XMLSignature signature =
+ XMLSignature signature =
new XMLSignature(sigElement, f.toURI().toURL().toString());
signature.addResourceResolver(new OfflineResolver());
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/contract/ThreeSignerContractSign.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/contract/ThreeSignerContractSign.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/contract/ThreeSignerContractSign.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/contract/ThreeSignerContractSign.java Tue Dec 15 17:13:17 2015
@@ -52,7 +52,7 @@ import org.w3c.dom.Element;
* @author Rene Kollmorgen <Re...@softwareag.com>
*/
public class ThreeSignerContractSign {
-
+
static {
org.apache.xml.security.Init.init();
@@ -176,7 +176,7 @@ public class ThreeSignerContractSign {
// second signer /////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////
{
- XMLSignature secondSigner =
+ XMLSignature secondSigner =
new XMLSignature(doc, BaseURI, XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
secondSigner.setId(id2);
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/contract/ThreeSignerContractVerify.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/contract/ThreeSignerContractVerify.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/contract/ThreeSignerContractVerify.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/signature/contract/ThreeSignerContractVerify.java Tue Dec 15 17:13:17 2015
@@ -37,7 +37,7 @@ import org.w3c.dom.NodeList;
* @author Rene Kollmorgen <Re...@softwareag.com>
*/
public class ThreeSignerContractVerify {
-
+
static {
org.apache.xml.security.Init.init();
}
@@ -77,9 +77,9 @@ public class ThreeSignerContractVerify {
xpath.setNamespaceContext(new DSNamespaceContext());
String expression = "//ds:Signature[1]";
- NodeList signatureElems =
+ NodeList signatureElems =
(NodeList) xpath.evaluate(expression, doc, XPathConstants.NODESET);
-
+
for (int i = 0; i < signatureElems.getLength(); i++) {
Element sigElement = (Element) signatureElems.item(i);
XMLSignature signature = new XMLSignature(sigElement, BaseURI);
@@ -93,7 +93,7 @@ public class ThreeSignerContractVerify {
System.out.println("The signature number " + (i + 1) + " is "
+ (signature.checkSignatureValue(
signature.createSecretKey(
- keyValue.getBytes()))
+ keyValue.getBytes()))
? "valid (good)" : "invalid !!!!! (bad)"));
}
} catch (Exception ex) {
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformChaining.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformChaining.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformChaining.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformChaining.java Tue Dec 15 17:13:17 2015
@@ -81,7 +81,7 @@ public class SampleTransformChaining {
+ " </Signature>"
+ "</Class>" + "\n"
;
-
+
org.apache.xml.security.Init.init();
javax.xml.parsers.DocumentBuilderFactory dbf =
javax.xml.parsers.DocumentBuilderFactory.newInstance();
@@ -97,9 +97,9 @@ public class SampleTransformChaining {
xpath.setNamespaceContext(new DSNamespaceContext());
String expression = "//ds:Transforms[1]";
- Element transformsElement =
+ Element transformsElement =
(Element) xpath.evaluate(expression, doc, XPathConstants.NODE);
-
+
Transforms transforms = new Transforms(transformsElement, "memory://");
XMLSignatureInput input = new XMLSignatureInput(doc);
@@ -109,5 +109,5 @@ public class SampleTransformChaining {
// output result
System.out.println(new String(result.getBytes()));
}
-
+
}
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformEnvelopedSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformEnvelopedSignature.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformEnvelopedSignature.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformEnvelopedSignature.java Tue Dec 15 17:13:17 2015
@@ -73,7 +73,7 @@ public class SampleTransformEnvelopedSig
+ " </Signature>" + "\n"
+ "</Document>" + "\n"
;
-
+
org.apache.xml.security.Init.init();
javax.xml.parsers.DocumentBuilderFactory dbf =
javax.xml.parsers.DocumentBuilderFactory.newInstance();
@@ -89,9 +89,9 @@ public class SampleTransformEnvelopedSig
xpath.setNamespaceContext(new DSNamespaceContext());
String expression = "//ds:Signature[@Id='SignatureToBeOmitted']//ds:Transforms";
- Element transformsElem =
+ Element transformsElem =
(Element) xpath.evaluate(expression, doc, XPathConstants.NODE);
-
+
Transforms transforms = new Transforms(transformsElem, "memory://");
XMLSignatureInput input = new XMLSignatureInput((Node) doc);
@@ -101,5 +101,5 @@ public class SampleTransformEnvelopedSig
System.out.println(new String(result.getBytes()));
}
-
+
}
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformNone.java Tue Dec 15 17:13:17 2015
@@ -35,7 +35,7 @@ public class SampleTransformNone extends
/** Field implementedTransformURI */
public static final String implementedTransformURI =
"http://www.xmlsecurity.org/NS/Transforms#none";
-
+
static {
org.apache.xml.security.Init.init();
}
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXPath.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXPath.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXPath.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXPath.java Tue Dec 15 17:13:17 2015
@@ -73,7 +73,7 @@ public class SampleTransformXPath {
+ " </Signature>"
+ "</Class>" + "\n"
;
-
+
org.apache.xml.security.Init.init();
javax.xml.parsers.DocumentBuilderFactory dbf =
javax.xml.parsers.DocumentBuilderFactory.newInstance();
@@ -95,5 +95,5 @@ public class SampleTransformXPath {
System.out.println(new String(result.getBytes()));
}
-
+
}
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXPath2Filter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXPath2Filter.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXPath2Filter.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXPath2Filter.java Tue Dec 15 17:13:17 2015
@@ -188,7 +188,7 @@ public class SampleTransformXPath2Filter
Document doc = db.parse(new FileInputStream(filename));
NodeList sigs = doc.getElementsByTagNameNS(Constants.SignatureSpecNS, Constants._TAG_SIGNATURE);
- XMLSignature sig =
+ XMLSignature sig =
new XMLSignature((Element)sigs.item(0), new File(filename).toURI().toURL().toString());
boolean check = sig.checkSignatureValue(sig.createSecretKey("secret".getBytes()));
@@ -201,5 +201,5 @@ public class SampleTransformXPath2Filter
System.out.println(
"-------------------------------------------------------------");
}
-
+
}
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXPath2Filter2.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXPath2Filter2.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXPath2Filter2.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXPath2Filter2.java Tue Dec 15 17:13:17 2015
@@ -96,8 +96,8 @@ public class SampleTransformXPath2Filter
doc.getDocumentElement().appendChild(sig.getElement());
sig.getElement().setAttributeNS(
- Constants.NamespaceSpecNS,
- "xmlns:" + ElementProxy.getDefaultPrefix(Transforms.TRANSFORM_XPATH2FILTER),
+ Constants.NamespaceSpecNS,
+ "xmlns:" + ElementProxy.getDefaultPrefix(Transforms.TRANSFORM_XPATH2FILTER),
Transforms.TRANSFORM_XPATH2FILTER
);
doc.getDocumentElement().appendChild(doc.createTextNode("\n"));
@@ -183,7 +183,7 @@ public class SampleTransformXPath2Filter
Document doc = db.parse(new FileInputStream(filename));
NodeList sigs = doc.getElementsByTagNameNS(Constants.SignatureSpecNS, Constants._TAG_SIGNATURE);
- XMLSignature sig =
+ XMLSignature sig =
new XMLSignature((Element)sigs.item(0), new File(filename).toURI().toURL().toString());
boolean check = sig.checkSignatureValue(sig.createSecretKey("secret".getBytes()));
@@ -200,5 +200,5 @@ public class SampleTransformXPath2Filter
"build/1.html", sig.getSignedInfo().item(0).getHTMLRepresentation().getBytes()
);
}
-
+
}
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXPathHereFunc.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXPathHereFunc.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXPathHereFunc.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXPathHereFunc.java Tue Dec 15 17:13:17 2015
@@ -70,7 +70,7 @@ public class SampleTransformXPathHereFun
+ " </Signature>"
+ "</Document>"
;
-
+
org.apache.xml.security.Init.init();
javax.xml.parsers.DocumentBuilderFactory dbf =
javax.xml.parsers.DocumentBuilderFactory.newInstance();
@@ -80,15 +80,15 @@ public class SampleTransformXPathHereFun
javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
org.w3c.dom.Document doc =
db.parse(new java.io.ByteArrayInputStream(inputStr.getBytes()));
-
+
XPathFactory xpf = XPathFactory.newInstance();
XPath xpath = xpf.newXPath();
xpath.setNamespaceContext(new DSNamespaceContext());
String expression = "/Document/ds:Signature[1]/ds:SignedInfo/ds:Reference[1]/ds:Transforms";
- Element transformsElem =
+ Element transformsElem =
(Element) xpath.evaluate(expression, doc, XPathConstants.NODE);
-
+
Transforms transforms = new Transforms(transformsElem, "memory://");
XMLSignatureInput input = new XMLSignatureInput((Node) doc);
@@ -98,5 +98,5 @@ public class SampleTransformXPathHereFun
System.out.println(new String(result.getBytes()));
}
-
+
}
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXSLT.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXSLT.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXSLT.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/transforms/SampleTransformXSLT.java Tue Dec 15 17:13:17 2015
@@ -137,5 +137,5 @@ public class SampleTransformXSLT {
System.out.println(new String(result.getBytes()));
}
-
+
}
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/Base64Sample.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/Base64Sample.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/Base64Sample.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/Base64Sample.java Tue Dec 15 17:13:17 2015
@@ -43,7 +43,7 @@ public class Base64Sample {
* @throws Exception
*/
public static void main(String[] unused) throws Exception {
-
+
org.apache.xml.security.Init.init();
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
Modified: santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/resolver/OfflineResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/resolver/OfflineResolver.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/resolver/OfflineResolver.java (original)
+++ santuario/xml-security-java/trunk/samples/org/apache/xml/security/samples/utils/resolver/OfflineResolver.java Tue Dec 15 17:13:17 2015
@@ -41,7 +41,7 @@ public class OfflineResolver extends Res
static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(OfflineResolver.class);
-
+
/** Field _uriMap */
static Map<String, String> _uriMap = null;
@@ -150,7 +150,7 @@ public class OfflineResolver extends Res
OfflineResolver._uriMap.put(URI, filename);
OfflineResolver._mimeMap.put(URI, MIME);
}
-
+
private static URI getNewURI(String uri, String baseURI) throws URISyntaxException {
URI newUri = null;
if (baseURI == null || "".equals(baseURI)) {
@@ -158,10 +158,10 @@ public class OfflineResolver extends Res
} else {
newUri = new URI(baseURI).resolve(uri);
}
-
+
// if the URI contains a fragment, ignore it
if (newUri.getFragment() != null) {
- URI uriNewNoFrag =
+ URI uriNewNoFrag =
new URI(newUri.getScheme(), newUri.getSchemeSpecificPart(), null);
return uriNewNoFrag;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java Tue Dec 15 17:13:17 2015
@@ -42,9 +42,9 @@ import org.apache.xml.security.utils.Uns
* @author Sean Mullan
*/
public class DigesterOutputStream extends OutputStream {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(DigesterOutputStream.class);
-
+
private final boolean buffer;
private UnsyncByteArrayOutputStream bos;
private final MessageDigest md;
@@ -113,7 +113,7 @@ public class DigesterOutputStream extend
return null;
}
}
-
+
@Override
public void close() throws IOException {
if (buffer) {
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=1720201&r1=1720200&r2=1720201&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 Tue Dec 15 17:13:17 2015
@@ -37,7 +37,7 @@ import org.w3c.dom.Element;
* An abstract class representing a SignatureMethod. Subclasses implement
* a specific XML DSig signature algorithm.
*/
-abstract class AbstractDOMSignatureMethod extends BaseStructure
+abstract class AbstractDOMSignatureMethod extends BaseStructure
implements SignatureMethod {
// denotes the type of signature algorithm
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=1720201&r1=1720200&r2=1720201&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 Tue Dec 15 17:13:17 2015
@@ -216,7 +216,7 @@ public abstract class ApacheCanonicalize
boolean secVal = Utils.secureValidation(xc);
apacheTransform.setSecureValidation(secVal);
if (log.isDebugEnabled()) {
- log.debug("Created transform for algorithm: " + getAlgorithm());
+ log.debug("Created transform for algorithm: " + getAlgorithm());
}
} catch (Exception ex) {
throw new TransformException
@@ -258,7 +258,7 @@ public abstract class ApacheCanonicalize
boolean secVal = Utils.secureValidation(xc);
in.setSecureValidation(secVal);
-
+
try {
in = apacheTransform.performTransform(in, os);
if (!in.isNodeSet() && !in.isElement()) {
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=1720201&r1=1720200&r2=1720201&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 Tue Dec 15 17:13:17 2015
@@ -60,7 +60,7 @@ public abstract class ApacheTransform ex
protected Document ownerDoc;
protected Element transformElem;
protected TransformParameterSpec params;
-
+
@Override
public final AlgorithmParameterSpec getParameterSpec() {
return params;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/BaseStructure.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/BaseStructure.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/BaseStructure.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/BaseStructure.java Tue Dec 15 17:13:17 2015
@@ -26,7 +26,7 @@ public abstract class BaseStructure impl
/**
* Just return the text of the immediate child of a node.
- *
+ *
* @param node
* @return the text of a Node
*/
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMBase64Transform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMBase64Transform.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMBase64Transform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMBase64Transform.java Tue Dec 15 17:13:17 2015
@@ -35,7 +35,7 @@ import javax.xml.crypto.dsig.spec.Transf
* @author Sean Mullan
*/
public final class DOMBase64Transform extends ApacheTransform {
-
+
@Override
public void init(TransformParameterSpec params)
throws InvalidAlgorithmParameterException {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java Tue Dec 15 17:13:17 2015
@@ -53,11 +53,11 @@ public class DOMCanonicalizationMethod e
super(spi);
if (!(spi instanceof ApacheCanonicalizer) && !isC14Nalg(spi.getAlgorithm())) {
throw new InvalidAlgorithmParameterException("Illegal CanonicalizationMethod");
- }
+ }
}
/**
- * Creates a <code>DOMCanonicalizationMethod</code> from an element. It unmarshals any
+ * Creates a <code>DOMCanonicalizationMethod</code> from an element. It unmarshals any
* algorithm-specific input parameters.
*
* @param cmElem a CanonicalizationMethod element
@@ -123,23 +123,23 @@ public class DOMCanonicalizationMethod e
return result;
}
-
+
private static boolean isC14Nalg(String alg) {
return isInclusiveC14Nalg(alg) || isExclusiveC14Nalg(alg) || isC14N11alg(alg);
}
private static boolean isInclusiveC14Nalg(String alg) {
- return alg.equals(CanonicalizationMethod.INCLUSIVE)
+ return alg.equals(CanonicalizationMethod.INCLUSIVE)
|| alg.equals(CanonicalizationMethod.INCLUSIVE_WITH_COMMENTS);
- }
-
+ }
+
private static boolean isExclusiveC14Nalg(String alg) {
- return alg.equals(CanonicalizationMethod.EXCLUSIVE)
+ return alg.equals(CanonicalizationMethod.EXCLUSIVE)
|| alg.equals(CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS);
- }
-
+ }
+
private static boolean isC14N11alg(String alg) {
- return alg.equals(DOMCanonicalXMLC14N11Method.C14N_11)
+ return alg.equals(DOMCanonicalXMLC14N11Method.C14N_11)
|| alg.equals(DOMCanonicalXMLC14N11Method.C14N_11_WITH_COMMENTS);
- }
+ }
}
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=1720201&r1=1720200&r2=1720201&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 Tue Dec 15 17:13:17 2015
@@ -37,7 +37,7 @@ import org.w3c.dom.Element;
*
* @author Sean Mullan
*/
-public abstract class DOMDigestMethod extends BaseStructure
+public abstract class DOMDigestMethod extends BaseStructure
implements DigestMethod {
static final String SHA224 =
@@ -54,7 +54,7 @@ public abstract class DOMDigestMethod ex
"http://www.w3.org/2007/05/xmldsig-more#sha3-384"; // see RFC 6931
static final String SHA3_512 =
"http://www.w3.org/2007/05/xmldsig-more#sha3-512"; // see RFC 6931
-
+
private DigestMethodParameterSpec params;
/**
@@ -254,7 +254,7 @@ public abstract class DOMDigestMethod ex
return "SHA-1";
}
}
-
+
static final class SHA224 extends DOMDigestMethod {
SHA224(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
@@ -326,7 +326,7 @@ public abstract class DOMDigestMethod ex
return "SHA-512";
}
}
-
+
static final class RIPEMD160 extends DOMDigestMethod {
RIPEMD160(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
@@ -344,7 +344,7 @@ public abstract class DOMDigestMethod ex
return "RIPEMD160";
}
}
-
+
static final class WHIRLPOOL extends DOMDigestMethod {
WHIRLPOOL(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
@@ -362,7 +362,7 @@ public abstract class DOMDigestMethod ex
return "WHIRLPOOL";
}
}
-
+
static final class SHA3_224 extends DOMDigestMethod {
SHA3_224(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
@@ -380,7 +380,7 @@ public abstract class DOMDigestMethod ex
return "SHA3-224";
}
}
-
+
static final class SHA3_256 extends DOMDigestMethod {
SHA3_256(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
@@ -398,7 +398,7 @@ public abstract class DOMDigestMethod ex
return "SHA3-256";
}
}
-
+
static final class SHA3_384 extends DOMDigestMethod {
SHA3_384(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
@@ -416,7 +416,7 @@ public abstract class DOMDigestMethod ex
return "SHA3-384";
}
}
-
+
static final class SHA3_512 extends DOMDigestMethod {
SHA3_512(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
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=1720201&r1=1720200&r2=1720201&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 Tue Dec 15 17:13:17 2015
@@ -95,7 +95,7 @@ public final class DOMExcC14NMethod exte
public List<String> getParameterSpecPrefixList(ExcC14NParameterSpec paramSpec) {
return paramSpec.getPrefixList();
}
-
+
@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/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=1720201&r1=1720200&r2=1720201&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 Tue Dec 15 17:13:17 2015
@@ -53,7 +53,7 @@ public abstract class DOMHMACSignatureMe
org.slf4j.LoggerFactory.getLogger(DOMHMACSignatureMethod.class);
// see RFC 4051 for these algorithm definitions
- static final String HMAC_SHA224 =
+ static final String HMAC_SHA224 =
"http://www.w3.org/2001/04/xmldsig-more#hmac-sha224";
static final String HMAC_SHA256 =
"http://www.w3.org/2001/04/xmldsig-more#hmac-sha256";
@@ -239,7 +239,7 @@ public abstract class DOMHMACSignatureMe
return 160;
}
}
-
+
static final class SHA224 extends DOMHMACSignatureMethod {
SHA224(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
@@ -327,7 +327,7 @@ public abstract class DOMHMACSignatureMe
return 512;
}
}
-
+
static final class RIPEMD160 extends DOMHMACSignatureMethod {
RIPEMD160(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
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=1720201&r1=1720200&r2=1720201&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 Tue Dec 15 17:13:17 2015
@@ -53,7 +53,7 @@ public final class DOMKeyInfo extends Ba
public static List<XMLStructure> getContent(KeyInfo ki) {
return ki.getContent();
}
-
+
/**
* Creates a <code>DOMKeyInfo</code>.
*
@@ -155,7 +155,7 @@ public final class DOMKeyInfo extends Ba
Node pNode = parent.getNode();
String dsPrefix = DOMUtils.getSignaturePrefix(context);
- XmlWriterToTree xwriter = new XmlWriterToTree(Marshaller.getMarshallers(), pNode);
+ XmlWriterToTree xwriter = new XmlWriterToTree(Marshaller.getMarshallers(), pNode);
marshalInternal(xwriter, this, dsPrefix, context, true);
}
@@ -171,7 +171,7 @@ public final class DOMKeyInfo extends Ba
if (declareNamespace) {
xwriter.writeNamespace(dsPrefix, XMLSignature.XMLNS);
}
-
+
xwriter.writeIdAttribute("", "", "Id", ki.getId());
// create and append KeyInfoType elements
List<XMLStructure> keyInfoTypes = getContent(ki);
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=1720201&r1=1720200&r2=1720201&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 Tue Dec 15 17:13:17 2015
@@ -120,7 +120,7 @@ public final class DOMKeyInfoFactory ext
}
@Override
- public X509IssuerSerial newX509IssuerSerial(String issuerName,
+ public X509IssuerSerial newX509IssuerSerial(String issuerName,
BigInteger serialNumber) {
return new DOMX509IssuerSerial(issuerName, serialNumber);
}
@@ -140,7 +140,7 @@ public final class DOMKeyInfoFactory ext
}
@Override
- public KeyInfo unmarshalKeyInfo(XMLStructure xmlStructure)
+ public KeyInfo unmarshalKeyInfo(XMLStructure xmlStructure)
throws MarshalException {
if (xmlStructure == null) {
throw new NullPointerException("xmlStructure cannot be null");
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=1720201&r1=1720200&r2=1720201&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 Tue Dec 15 17:13:17 2015
@@ -91,7 +91,7 @@ public abstract class DOMKeyValue<K exte
if (kvtElem == null) {
throw new MarshalException("KeyValue must contain at least one type");
}
-
+
String namespace = kvtElem.getNamespaceURI();
if (kvtElem.getLocalName().equals("DSAKeyValue") && XMLSignature.XMLNS.equals(namespace)) {
return new DSA(kvtElem);
@@ -125,7 +125,7 @@ public abstract class DOMKeyValue<K exte
abstract void marshalPublicKey(XmlWriter xwriter, K key, String dsPrefix,
XMLCryptoContext context) throws MarshalException;
- abstract K unmarshalKeyValue(Element kvtElem)
+ abstract K unmarshalKeyValue(Element kvtElem)
throws MarshalException;
private static PublicKey generatePublicKey(KeyFactory kf, KeySpec keyspec) {
@@ -136,7 +136,7 @@ public abstract class DOMKeyValue<K exte
return null;
}
}
-
+
@Override
public boolean equals(Object obj) {
if (this == obj) {
@@ -158,7 +158,7 @@ public abstract class DOMKeyValue<K exte
// no practical way to determine if the keys are equal
return false;
}
-
+
return true;
}
@@ -176,7 +176,7 @@ public abstract class DOMKeyValue<K exte
) {
xwriter.writeTextElement(prefix, localName, namespaceURI, Base64.encode(value));
}
-
+
public static void marshal(XmlWriter xwriter, BigInteger bigNum) {
xwriter.writeCharacters(Base64.encode(bigNum));
}
@@ -187,10 +187,10 @@ public abstract class DOMKeyValue<K exte
if (publicKey != null) {
result = 31 * result + publicKey.hashCode();
}
-
+
return result;
}
-
+
static final class RSA extends DOMKeyValue<RSAPublicKey> {
// RSAKeyValue CryptoBinaries
private KeyFactory rsakf;
@@ -204,10 +204,10 @@ public abstract class DOMKeyValue<K exte
}
@Override
- void marshalPublicKey(XmlWriter xwriter, RSAPublicKey publicKey, String dsPrefix,
+ 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());
@@ -257,15 +257,15 @@ public abstract class DOMKeyValue<K exte
throws MarshalException
{
DSAParams params = publicKey.getParams();
-
+
xwriter.writeStartElement(dsPrefix, "DSAKeyValue", XMLSignature.XMLNS);
-
+
// 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"
}
@@ -293,9 +293,9 @@ public abstract class DOMKeyValue<K exte
curElem = DOMUtils.getNextSiblingElement(curElem, "Q", XMLSignature.XMLNS);
q = decode(curElem);
curElem = DOMUtils.getNextSiblingElement(curElem);
- }
+ }
BigInteger g = null;
- if (curElem != null
+ if (curElem != null
&& curElem.getLocalName().equals("G") && XMLSignature.XMLNS.equals(curElem.getNamespaceURI())) {
g = decode(curElem);
curElem = DOMUtils.getNextSiblingElement(curElem, "Y", XMLSignature.XMLNS);
@@ -379,7 +379,7 @@ public abstract class DOMKeyValue<K exte
{
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);
try {
@@ -389,7 +389,7 @@ public abstract class DOMKeyValue<K exte
throw new MarshalException(gse);
}
xwriter.writeEndElement();
-
+
xwriter.writeStartElement(prefix, "PublicKey", XMLDSIG_11_XMLNS);
String encoded = Base64.encode(ecPublicKey);
xwriter.writeCharacters(encoded);
@@ -443,8 +443,8 @@ public abstract class DOMKeyValue<K exte
if (curElem == null) {
throw new MarshalException("KeyValue must contain at least one type");
}
-
- if (curElem.getLocalName().equals("ECParameters")
+
+ if (curElem.getLocalName().equals("ECParameters")
&& XMLDSIG_11_XMLNS.equals(curElem.getNamespaceURI())) {
throw new UnsupportedOperationException
("ECParameters not supported");
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=1720201&r1=1720200&r2=1720201&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 Tue Dec 15 17:13:17 2015
@@ -84,24 +84,24 @@ public final class DOMManifest extends B
throws MarshalException
{
this.id = DOMUtils.getIdAttributeValue(manElem, "Id");
-
+
boolean secVal = Utils.secureValidation(context);
-
+
Element refElem = DOMUtils.getFirstChildElement(manElem, "Reference", XMLSignature.XMLNS);
List<Reference> refs = new ArrayList<Reference>();
refs.add(new DOMReference(refElem, context, provider));
-
+
refElem = DOMUtils.getNextSiblingElement(refElem);
while (refElem != null) {
String localName = refElem.getLocalName();
String namespace = refElem.getNamespaceURI();
- if (!localName.equals("Reference") || !XMLSignature.XMLNS.equals(namespace)) {
+ if (!localName.equals("Reference") || !XMLSignature.XMLNS.equals(namespace)) {
throw new MarshalException("Invalid element name: " +
namespace + ":" + localName + ", expected Reference");
}
refs.add(new DOMReference(refElem, context, provider));
if (secVal && refs.size() > DOMSignedInfo.MAXIMUM_REFERENCE_COUNT) {
- String error = "A maxiumum of " + DOMSignedInfo.MAXIMUM_REFERENCE_COUNT + " "
+ String error = "A maxiumum of " + DOMSignedInfo.MAXIMUM_REFERENCE_COUNT + " "
+ "references per Manifest are allowed with secure validation";
throw new MarshalException(error);
}
@@ -114,12 +114,12 @@ public final class DOMManifest extends B
public String getId() {
return id;
}
-
+
@SuppressWarnings("unchecked")
public static List<Reference> getManifestReferences(Manifest mf) {
return mf.getReferences();
}
-
+
@Override
public List<Reference> getReferences() {
return references;
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=1720201&r1=1720200&r2=1720201&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 Tue Dec 15 17:13:17 2015
@@ -143,7 +143,7 @@ public final class DOMPGPData extends Ba
// get all children nodes
byte[] pgpKeyId = null;
byte[] pgpKeyPacket = null;
-
+
List<XMLStructure> other = new ArrayList<XMLStructure>();
Node firstChild = pdElem.getFirstChild();
while (firstChild != null) {
@@ -214,7 +214,7 @@ public final class DOMPGPData extends Ba
}
// tag value must be 6, 14, 5 or 7
- if ((tag & 6) != 6 && (tag & 14) != 14 &&
+ if ((tag & 6) != 6 && (tag & 14) != 14 &&
(tag & 5) != 5 && (tag & 7) != 7) {
throw new IllegalArgumentException("keypacket tag is invalid: " +
"must be 6, 14, 5, or 7");
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=1720201&r1=1720200&r2=1720201&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 Tue Dec 15 17:13:17 2015
@@ -20,7 +20,7 @@
* Portions copyright 2005 Sun Microsystems, Inc. All rights reserved.
*/
/*
- * ===========================================================================
+ * ===========================================================================
*
* (C) Copyright IBM Corp. 2003 All Rights Reserved.
*
@@ -83,7 +83,7 @@ public final class DOMReference extends
private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(DOMReference.class);
-
+
private final DigestMethod digestMethod;
private final String id;
private final List<Transform> transforms;
@@ -207,7 +207,7 @@ public final class DOMReference extends
while (transformElem != null) {
String localName = transformElem.getLocalName();
String namespace = transformElem.getNamespaceURI();
- if (!localName.equals("Transform") || !XMLSignature.XMLNS.equals(namespace)) {
+ if (!localName.equals("Transform") || !XMLSignature.XMLNS.equals(namespace)) {
throw new MarshalException(
"Invalid element name: " + localName +
", expected Transform");
@@ -215,7 +215,7 @@ public final class DOMReference extends
newTransforms.add
(new DOMTransform(transformElem, context, provider));
if (secVal && newTransforms.size() > MAXIMUM_TRANSFORM_COUNT) {
- String error = "A maxiumum of " + MAXIMUM_TRANSFORM_COUNT + " "
+ String error = "A maxiumum of " + MAXIMUM_TRANSFORM_COUNT + " "
+ "transforms per Reference are allowed with secure validation";
throw new MarshalException(error);
}
@@ -223,7 +223,7 @@ public final class DOMReference extends
}
nextSibling = DOMUtils.getNextSiblingElement(nextSibling);
}
- if (!nextSibling.getLocalName().equals("DigestMethod")
+ if (!nextSibling.getLocalName().equals("DigestMethod")
&& XMLSignature.XMLNS.equals(nextSibling.getNamespaceURI())) {
throw new MarshalException("Invalid element name: " +
nextSibling.getLocalName() +
@@ -300,7 +300,7 @@ public final class DOMReference extends
@Override
public byte[] getCalculatedDigestValue() {
- return calcDigestValue == null ? null
+ return calcDigestValue == null ? null
: calcDigestValue.clone();
}
@@ -314,7 +314,7 @@ public final class DOMReference extends
xwriter.writeStartElement(dsPrefix, "Reference", XMLSignature.XMLNS);
XMLStructure refStruct = xwriter.getCurrentNodeAsStructure();
refElem = (Element) ((javax.xml.crypto.dom.DOMStructure) refStruct).getNode();
-
+
// set attributes
xwriter.writeIdAttribute("", "", "Id", id);
here = xwriter.writeAttribute("", "", "URI", uri);
@@ -505,7 +505,7 @@ public final class DOMReference extends
} else {
throw new XMLSignatureException("unrecognized Data type");
}
-
+
boolean secVal = Utils.secureValidation(context);
xi.setSecureValidation(secVal);
if (context instanceof XMLSignContext && c14n11
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=1720201&r1=1720200&r2=1720201&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 Tue Dec 15 17:13:17 2015
@@ -20,7 +20,7 @@
* Portions copyright 2005 Sun Microsystems, Inc. All rights reserved.
*/
/*
- * ===========================================================================
+ * ===========================================================================
*
* (C) Copyright IBM Corp. 2003 All Rights Reserved.
*
@@ -147,7 +147,7 @@ public final class DOMRetrievalMethod ex
String namespace = transformsElem.getNamespaceURI();
if (!localName.equals("Transforms") || !XMLSignature.XMLNS.equals(namespace)) {
throw new MarshalException("Invalid element name: " +
- namespace + ":" + localName + ", expected Transforms");
+ namespace + ":" + localName + ", expected Transforms");
}
Element transformElem =
DOMUtils.getFirstChildElement(transformsElem, "Transform", XMLSignature.XMLNS);
@@ -161,7 +161,7 @@ public final class DOMRetrievalMethod ex
newTransforms.add
(new DOMTransform(transformElem, context, provider));
if (secVal && newTransforms.size() > DOMReference.MAXIMUM_TRANSFORM_COUNT) {
- String error = "A maxiumum of " + DOMReference.MAXIMUM_TRANSFORM_COUNT + " "
+ String error = "A maxiumum of " + DOMReference.MAXIMUM_TRANSFORM_COUNT + " "
+ "transforms per Reference are allowed with secure validation";
throw new MarshalException(error);
}
@@ -274,7 +274,7 @@ public final class DOMRetrievalMethod ex
Document doc = db.parse(new ByteArrayInputStream
(data.getXMLSignatureInput().getBytes()));
Element kiElem = doc.getDocumentElement();
- if (kiElem.getLocalName().equals("X509Data")
+ if (kiElem.getLocalName().equals("X509Data")
&& XMLSignature.XMLNS.equals(kiElem.getNamespaceURI())) {
return new DOMX509Data(kiElem);
} else {
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=1720201&r1=1720200&r2=1720201&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 Tue Dec 15 17:13:17 2015
@@ -74,7 +74,7 @@ public abstract class DOMSignatureMethod
"http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512";
static final String DSA_SHA256 =
"http://www.w3.org/2009/xmldsig11#dsa-sha256";
-
+
// see RFC 6931 for these algorithm definitions
static final String ECDSA_RIPEMD160 =
"http://www.w3.org/2007/05/xmldsig-more#ecdsa-ripemd160";
@@ -211,7 +211,7 @@ public abstract class DOMSignatureMethod
Provider p = (Provider)context.getProperty
("org.jcp.xml.dsig.internal.dom.SignatureProvider");
signature = (p == null)
- ? Signature.getInstance(getJCAAlgorithm())
+ ? Signature.getInstance(getJCAAlgorithm())
: Signature.getInstance(getJCAAlgorithm(), p);
} catch (NoSuchAlgorithmException nsae) {
throw new XMLSignatureException(nsae);
@@ -258,7 +258,7 @@ public abstract class DOMSignatureMethod
Provider p = (Provider)context.getProperty
("org.jcp.xml.dsig.internal.dom.SignatureProvider");
signature = (p == null)
- ? Signature.getInstance(getJCAAlgorithm())
+ ? Signature.getInstance(getJCAAlgorithm())
: Signature.getInstance(getJCAAlgorithm(), p);
} catch (NoSuchAlgorithmException nsae) {
throw new XMLSignatureException(nsae);
@@ -334,7 +334,7 @@ public abstract class DOMSignatureMethod
return Type.RSA;
}
}
-
+
static final class SHA256withRSA extends DOMSignatureMethod {
SHA256withRSA(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
@@ -400,7 +400,7 @@ public abstract class DOMSignatureMethod
return Type.RSA;
}
}
-
+
static final class RIPEMD160withRSA extends DOMSignatureMethod {
RIPEMD160withRSA(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
@@ -422,7 +422,7 @@ public abstract class DOMSignatureMethod
return Type.RSA;
}
}
-
+
static final class SHA1withRSAandMGF1 extends DOMSignatureMethod {
SHA1withRSAandMGF1(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
@@ -532,7 +532,7 @@ public abstract class DOMSignatureMethod
return Type.RSA;
}
}
-
+
static final class RIPEMD160withRSAandMGF1 extends DOMSignatureMethod {
RIPEMD160withRSAandMGF1(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
@@ -554,7 +554,7 @@ public abstract class DOMSignatureMethod
return Type.RSA;
}
}
-
+
static final class SHA1withDSA extends DOMSignatureMethod {
SHA1withDSA(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
@@ -617,7 +617,7 @@ public abstract class DOMSignatureMethod
return Type.ECDSA;
}
}
-
+
static final class SHA224withECDSA extends DOMSignatureMethod {
SHA224withECDSA(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
@@ -705,7 +705,7 @@ public abstract class DOMSignatureMethod
return Type.ECDSA;
}
}
-
+
static final class RIPEMD160withECDSA extends DOMSignatureMethod {
RIPEMD160withECDSA(AlgorithmParameterSpec params)
throws InvalidAlgorithmParameterException {
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=1720201&r1=1720200&r2=1720201&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 Tue Dec 15 17:13:17 2015
@@ -132,7 +132,7 @@ public final class DOMSignaturePropertie
for (SignatureProperty property : properties) {
DOMSignatureProperty.marshal(xwriter, property, dsPrefix, context);
}
-
+
xwriter.writeEndElement(); // "SignatureProperties"
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java Tue Dec 15 17:13:17 2015
@@ -137,7 +137,7 @@ public final class DOMSignatureProperty
for (XMLStructure property : content) {
xwriter.marshalStructure(property, dsPrefix, context);
}
-
+
xwriter.writeEndElement(); // "SignatureProperty"
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java Tue Dec 15 17:13:17 2015
@@ -54,7 +54,7 @@ public final class DOMSignedInfo extends
private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(DOMSignedInfo.class);
-
+
/** Signature - NOT Recommended RSAwithMD5 */
private static final String ALGO_ID_SIGNATURE_NOT_RECOMMENDED_RSA_MD5 =
Constants.MoreAlgorithmsSpecNS + "rsa-md5";
@@ -177,7 +177,7 @@ public final class DOMSignedInfo extends
}
refList.add(new DOMReference(refElem, context, provider));
if (secVal && refList.size() > MAXIMUM_REFERENCE_COUNT) {
- String error = "A maxiumum of " + MAXIMUM_REFERENCE_COUNT + " "
+ String error = "A maxiumum of " + MAXIMUM_REFERENCE_COUNT + " "
+ "references per Manifest are allowed with secure validation";
throw new MarshalException(error);
}
@@ -240,7 +240,7 @@ public final class DOMSignedInfo extends
// this whole block should only be done if logging is enabled
if (log.isDebugEnabled()) {
- log.debug("Canonicalized SignedInfo:");
+ log.debug("Canonicalized SignedInfo:");
StringBuilder sb = new StringBuilder(signedInfoBytes.length);
for (int i = 0; i < signedInfoBytes.length; i++) {
sb.append((char)signedInfoBytes[i]);
@@ -271,11 +271,11 @@ public final class DOMSignedInfo extends
// append Id attribute
xwriter.writeIdAttribute("", "", "Id", id);
-
+
// create and append CanonicalizationMethod element
DOMCanonicalizationMethod dcm =
(DOMCanonicalizationMethod)canonicalizationMethod;
- dcm.marshal(xwriter, dsPrefix, context);
+ dcm.marshal(xwriter, dsPrefix, context);
// create and append SignatureMethod element
((AbstractDOMSignatureMethod)signatureMethod).marshal(xwriter, dsPrefix);
@@ -304,8 +304,8 @@ public final class DOMSignedInfo extends
boolean idEqual = id == null ? osi.getId() == null
: id.equals(osi.getId());
- return canonicalizationMethod.equals(osi.getCanonicalizationMethod())
- && signatureMethod.equals(osi.getSignatureMethod()) &&
+ return canonicalizationMethod.equals(osi.getCanonicalizationMethod())
+ && signatureMethod.equals(osi.getSignatureMethod()) &&
references.equals(osi.getReferences()) && idEqual;
}
@@ -313,7 +313,7 @@ public final class DOMSignedInfo extends
public static List<Reference> getSignedInfoReferences(SignedInfo si) {
return si.getReferences();
}
-
+
@Override
public int hashCode() {
int result = 17;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java Tue Dec 15 17:13:17 2015
@@ -61,7 +61,7 @@ public class DOMTransform extends BaseSt
}
/**
- * Creates a <code>DOMTransform</code> from an element. It unmarshals any
+ * Creates a <code>DOMTransform</code> from an element. It unmarshals any
* algorithm-specific input parameters.
*
* @param transElem a Transform element
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java Tue Dec 15 17:13:17 2015
@@ -46,7 +46,7 @@ public final class DOMURIDereferencer im
static final URIDereferencer INSTANCE = new DOMURIDereferencer();
private DOMURIDereferencer() {
- // need to call org.apache.xml.security.Init.init()
+ // need to call org.apache.xml.security.Init.init()
// before calling any apache security code
Init.init();
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java Tue Dec 15 17:13:17 2015
@@ -63,10 +63,10 @@ public final class DOMUtils {
/**
* Create a QName string from a prefix and local name.
- *
+ *
* @param prefix The prefix, if any. Can be either null or empty.
* @param localName The local name.
- *
+ *
* @return The string for the qName, for example, "xsd:element".
*/
public static String getQNameString(String prefix, String localName) {
@@ -75,7 +75,7 @@ public final class DOMUtils {
return qName;
}
-
+
/**
* Creates an element in the specified namespace, with the specified tag
* and namespace prefix.
@@ -158,10 +158,10 @@ public final class DOMUtils {
{
return verifyElement(getFirstChildElement(node), localName);
}
-
+
/**
* Returns the first child element of the specified node and checks that
- * the local name is equal to {@code localName} and the namespace is equal to
+ * the local name is equal to {@code localName} and the namespace is equal to
* {@code namespaceURI}
*
* @param node the node
@@ -189,7 +189,7 @@ public final class DOMUtils {
}
return elem;
}
-
+
private static Element verifyElement(Element elem, String localName, String namespaceURI)
throws MarshalException
{
@@ -200,7 +200,7 @@ public final class DOMUtils {
String namespace = elem.getNamespaceURI();
if (!name.equals(localName) || namespace == null && namespaceURI != null
|| namespace != null && !namespace.equals(namespaceURI)) {
- throw new MarshalException("Invalid element name: " +
+ throw new MarshalException("Invalid element name: " +
namespace + ":" + name + ", expected " + namespaceURI + ":" + localName);
}
return elem;
@@ -272,7 +272,7 @@ public final class DOMUtils {
throws MarshalException
{
return verifyElement(getNextSiblingElement(node), localName, namespaceURI);
- }
+ }
/**
* Returns the attribute value for the attribute with the specified name.
@@ -295,7 +295,7 @@ public final class DOMUtils {
/**
* Returns the attribute value for the attribute with the specified name.
- * Returns null if there is no such attribute, or
+ * Returns null if there is no such attribute, or
* the empty string if the attribute value is empty.
*
* <p>This works around a limitation of the DOM
@@ -316,7 +316,7 @@ public final class DOMUtils {
}
/**
- * Returns a Set of <code>Node</code>s, backed by the specified
+ * Returns a Set of <code>Node</code>s, backed by the specified
* <code>NodeList</code>.
*
* @param nl the NodeList
@@ -488,7 +488,7 @@ public final class DOMUtils {
private static boolean paramsEqual(XPathFilterParameterSpec spec1,
XPathFilterParameterSpec spec2)
{
- return spec1.getXPath().equals(spec2.getXPath()) &&
+ return spec1.getXPath().equals(spec2.getXPath()) &&
spec1.getNamespaceMap().equals(spec2.getNamespaceMap());
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java Tue Dec 15 17:13:17 2015
@@ -108,13 +108,13 @@ public final class DOMX509IssuerSerial e
return issuerName.equals(ois.getIssuerName()) &&
serialNumber.equals(ois.getSerialNumber());
}
-
+
@Override
public int hashCode() {
int result = 17;
result = 31 * result + issuerName.hashCode();
result = 31 * result + serialNumber.hashCode();
-
+
return result;
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java Tue Dec 15 17:13:17 2015
@@ -41,7 +41,7 @@ import org.w3c.dom.Node;
* @author Sean Mullan
*/
public final class DOMXMLObject extends BaseStructure implements XMLObject {
-
+
private final String id;
private final String mimeType;
private final String encoding;
@@ -123,7 +123,7 @@ public final class DOMXMLObject extends
}
firstChild = firstChild.getNextSibling();
}
-
+
// Here we capture namespace declarations, so that when they're marshalled back
// out, we can make copies of them. Note that attributes are NOT captured.
NamedNodeMap nnm = objElem.getAttributes();
@@ -133,7 +133,7 @@ public final class DOMXMLObject extends
newContent.add(new javax.xml.crypto.dom.DOMStructure(nsDecl));
}
}
-
+
if (newContent.isEmpty()) {
this.content = Collections.emptyList();
} else {
@@ -178,7 +178,7 @@ public final class DOMXMLObject extends
}
xwriter.writeEndElement(); // "Object"
}
-
+
@SuppressWarnings("unchecked")
public static List<XMLStructure> getXmlObjectContent(XMLObject xo) {
return xo.getContent();
@@ -204,7 +204,7 @@ public final class DOMXMLObject extends
mimeType == null ? oxo.getMimeType() == null
: mimeType.equals(oxo.getMimeType());
- return idsEqual && encodingsEqual && mimeTypesEqual &&
+ return idsEqual && encodingsEqual && mimeTypesEqual &&
equalsContent(getXmlObjectContent(oxo));
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java Tue Dec 15 17:13:17 2015
@@ -208,12 +208,12 @@ public final class DOMXMLSignature exten
prefix = "";
}
xwriter.writeStartElement(prefix, "Signature", XMLSignature.XMLNS);
-
+
xwriter.writeNamespace(prefix, XMLSignature.XMLNS);
-
+
// append Id attribute
xwriter.writeIdAttribute("", "", "Id", id);
-
+
// create and append SignedInfo element
((DOMSignedInfo) si).marshal(xwriter, prefix, context);
@@ -331,7 +331,7 @@ public final class DOMXMLSignature exten
DOMUtils.getSignaturePrefix(signContext), signContext);
Element sigElem = xwriter.getCreatedElement();
-
+
// generate references and signature value
List<Reference> allReferences = new ArrayList<Reference>();
@@ -524,7 +524,7 @@ public final class DOMXMLSignature exten
}
@Override
- public boolean validate(XMLValidateContext validateContext)
+ public boolean validate(XMLValidateContext validateContext)
throws XMLSignatureException
{
if (validateContext == null) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java Tue Dec 15 17:13:17 2015
@@ -77,8 +77,8 @@ public final class DOMXMLSignatureFactor
@Override
@SuppressWarnings({ "unchecked", "rawtypes" })
- public Reference newReference(String uri, DigestMethod dm,
- List appliedTransforms, Data result, List transforms, String type,
+ public Reference newReference(String uri, DigestMethod dm,
+ List appliedTransforms, Data result, List transforms, String type,
String id) {
if (appliedTransforms == null) {
throw new NullPointerException("appliedTransforms cannot be null");
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java Tue Dec 15 17:13:17 2015
@@ -131,7 +131,7 @@ public final class DOMXPathFilter2Transf
XPathFilter2ParameterSpec xp =
(XPathFilter2ParameterSpec)getParameterSpec();
String prefix = DOMUtils.getNSPrefix(context, Transform.XPATH2);
- String qname = prefix == null || prefix.length() == 0
+ String qname = prefix == null || prefix.length() == 0
? "xmlns" : "xmlns:" + prefix;
@SuppressWarnings("unchecked")
List<XPathType> xpathList = xp.getXPathList();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java Tue Dec 15 17:13:17 2015
@@ -43,7 +43,7 @@ import org.w3c.dom.NamedNodeMap;
* @author Sean Mullan
*/
public final class DOMXPathTransform extends ApacheTransform {
-
+
@Override
public void init(TransformParameterSpec params)
throws InvalidAlgorithmParameterException
@@ -106,7 +106,7 @@ public final class DOMXPathTransform ext
entry.getKey(),
entry.getValue());
}
-
+
transformElem.appendChild(xpathElem);
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java Tue Dec 15 17:13:17 2015
@@ -39,7 +39,7 @@ import javax.xml.crypto.dsig.spec.XSLTTr
* @author Sean Mullan
*/
public final class DOMXSLTTransform extends ApacheTransform {
-
+
@Override
public void init(TransformParameterSpec params)
throws InvalidAlgorithmParameterException {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java Tue Dec 15 17:13:17 2015
@@ -46,7 +46,7 @@ import org.w3c.dom.Node;
* Defines the individual marshallers for each of the different javax.xml.crypto structures.
*/
class Marshaller {
-
+
private Marshaller() {
// complete
}
@@ -54,10 +54,10 @@ class Marshaller {
public static List<XmlWriter.ToMarshal<? extends XMLStructure>> getMarshallers() {
return MARSHALLERS;
}
-
+
/**
* Marshals a {@link KeyName}.
- *
+ *
* @param xwriter
* @param keyName
* @param dsPrefix
@@ -65,10 +65,10 @@ class Marshaller {
public static void marshalKeyName(XmlWriter xwriter, KeyName keyName, String dsPrefix) {
xwriter.writeTextElement(dsPrefix, "KeyName", XMLSignature.XMLNS, keyName.getName());
}
-
+
/**
* Marshals a {@link PGPData}
- *
+ *
* @param xwriter
* @param pgpData
* @param dsPrefix
@@ -78,32 +78,32 @@ class Marshaller {
public static void marshalPGPData(XmlWriter xwriter, PGPData pgpData, String dsPrefix, XMLCryptoContext context)
throws MarshalException {
xwriter.writeStartElement(dsPrefix, "PGPData", XMLSignature.XMLNS);
-
+
// create and append PGPKeyID element
byte[] keyId = pgpData.getKeyId();
if (keyId != null) {
xwriter.writeTextElement(dsPrefix, "PGPKeyID", XMLSignature.XMLNS, Base64.encode(keyId));
}
-
+
// create and append PGPKeyPacket element
byte[] keyPacket = pgpData.getKeyPacket();
if (keyPacket != null) {
xwriter.writeTextElement(dsPrefix, "XMLSignature.XMLNS", XMLSignature.XMLNS, Base64.encode(keyPacket));
}
-
+
// create and append any elements
@SuppressWarnings("unchecked")
List<XMLStructure> externalElements = pgpData.getExternalElements();
for (XMLStructure externalItem : externalElements) {
xwriter.marshalStructure(externalItem, dsPrefix, context);
}
-
+
xwriter.writeEndElement(); // "PGPData"
}
/**
* Marshals an {@link X509IssuerSerial}
- *
+ *
* @param xwriter
* @param issuerSerial
* @param dsPrefix
@@ -112,10 +112,10 @@ class Marshaller {
xwriter.writeStartElement(dsPrefix, "X509IssuerSerial", XMLSignature.XMLNS);
xwriter.writeTextElement(dsPrefix, "X509IssuerName", XMLSignature.XMLNS,
issuerSerial.getIssuerName());
-
+
xwriter.writeTextElement(dsPrefix, "X509SerialNumber", XMLSignature.XMLNS,
issuerSerial.getSerialNumber().toString());
-
+
xwriter.writeEndElement(); // "X509IssuerSerial"
}
@@ -126,7 +126,7 @@ class Marshaller {
Marshaller.marshalKeyName(xwriter, toMarshal, dsPrefix);
}
};
-
+
private static XmlWriter.ToMarshal<KeyInfo> Marshal_KeyInfo = new XmlWriter.ToMarshal<KeyInfo>(KeyInfo.class) {
@Override
public void marshalObject(XmlWriter xwriter, KeyInfo toMarshal, String dsPrefix,
@@ -134,7 +134,7 @@ class Marshaller {
DOMKeyInfo.marshal(xwriter, toMarshal, dsPrefix, context);
}
};
-
+
private static XmlWriter.ToMarshal<KeyValue> Marshal_KeyValue = new XmlWriter.ToMarshal<KeyValue>(KeyValue.class) {
@Override
public void marshalObject(XmlWriter xwriter, KeyValue toMarshal, String dsPrefix,
@@ -146,7 +146,7 @@ class Marshaller {
dkv.marshal( xwriter, dsPrefix, context);
}
};
-
+
private static XmlWriter.ToMarshal<X509IssuerSerial> Marshal_X509IssuerSerial =
new XmlWriter.ToMarshal<X509IssuerSerial>(X509IssuerSerial.class) {
@Override
@@ -155,7 +155,7 @@ class Marshaller {
Marshaller.marshalX509IssuerSerial( xwriter, toMarshal, dsPrefix);
}
};
-
+
private static XmlWriter.ToMarshal<X509Data> Marshal_X509Data =
new XmlWriter.ToMarshal<X509Data>(X509Data.class) {
@Override
@@ -164,7 +164,7 @@ class Marshaller {
DOMX509Data.marshal( xwriter, toMarshal, dsPrefix, context);
}
};
-
+
private static XmlWriter.ToMarshal<DigestMethod> Marshal_DigestMethod =
new XmlWriter.ToMarshal<DigestMethod>(DigestMethod.class) {
@Override
@@ -246,9 +246,9 @@ class Marshaller {
}
};
- private static final List<XmlWriter.ToMarshal<? extends XMLStructure>> MARSHALLERS =
+ private static final List<XmlWriter.ToMarshal<? extends XMLStructure>> MARSHALLERS =
new ArrayList<XmlWriter.ToMarshal<? extends XMLStructure>>();
-
+
static {
MARSHALLERS.add(Marshal_KeyName);
MARSHALLERS.add(Marshal_KeyInfo);
@@ -265,10 +265,10 @@ class Marshaller {
MARSHALLERS.add(Marshal_DOMStructure);
MARSHALLERS.add(Marshal_JavaXDOMStructure);
}
-
+
private static void marshalGenericNode(XmlWriter xwriter, javax.xml.crypto.dom.DOMStructure xmlStruct) {
Node node = xmlStruct.getNode();
-
+
// if it is a namespace, make a copy.
if (DOMUtils.isNamespace(node)) {
xwriter.writeNamespace(node.getLocalName(), node.getTextContent());
@@ -280,7 +280,7 @@ class Marshaller {
marshalGenericNode(xwriter, node);
}
}
-
+
private static void marshalGenericNode(XmlWriter xwriter, Node node) {
short nodeType = node.getNodeType();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java Tue Dec 15 17:13:17 2015
@@ -58,7 +58,7 @@ public final class XMLDSigRI extends Pro
public XMLDSigRI() {
/* We are the ApacheXMLDSig provider */
super("ApacheXMLDSig", 2.07, INFO);
-
+
final Map<Object, Object> map = new HashMap<Object, Object>();
map.put("XMLSignatureFactory.DOM",
"org.apache.jcp.xml.dsig.internal.dom.DOMXMLSignatureFactory");
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriter.java?rev=1720201&r1=1720200&r2=1720201&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriter.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XmlWriter.java Tue Dec 15 17:13:17 2015
@@ -26,7 +26,7 @@ import org.w3c.dom.Attr;
/**
* This interface is used to construct XML via a sequence of API calls.
- *
+ *
* <p>This is written to be similar to javax.xml.stream.XMLStreamWriter, but
* has slightly different requirements. Specifically, we need to be able to create
* an "ID" type attribute, and get the current node.
@@ -42,49 +42,49 @@ public interface XmlWriter {
*/
abstract static class ToMarshal<CLZ extends XMLStructure> { //NOPMD
public final Class<CLZ> clazzToMatch;
-
+
public ToMarshal(Class<CLZ> clazzToMatch) {
this.clazzToMatch = clazzToMatch;
}
-
- public abstract void marshalObject(XmlWriter xwriter, CLZ toMarshal, String dsPrefix,
+
+ public abstract void marshalObject(XmlWriter xwriter, CLZ toMarshal, String dsPrefix,
XMLCryptoContext context) throws MarshalException;
}
/**
- *
+ *
* @param prefix What prefix to use?
* @param localName What local name to use?
* @param namespaceURI What namespace URI?
- *
+ *
* See also {@link javax.xml.stream.XMLStreamWriter#writeStartElement(String, String, String)}
*/
void writeStartElement(String prefix, String localName, String namespaceURI);
-
+
/**
* See also {@link javax.xml.stream.XMLStreamWriter#writeEndElement()}
*/
void writeEndElement();
-
+
/**
* Convenience method that writes both a start and end tag, with text contents as
* provided.
- *
+ *
* @param prefix
* @param localName
* @param namespaceURI
* @param value
*/
void writeTextElement(String prefix, String localName, String namespaceURI, String value);
-
+
void writeNamespace(String prefix, String namespaceURI);
-
+
void writeCharacters(String text);
-
+
void writeComment(String text);
-
+
Attr writeAttribute(String prefix, String namespaceURI, String localName, String value);
-
+
void writeIdAttribute(String prefix, String namespaceURI, String localName, String value);
/**
@@ -94,11 +94,11 @@ public interface XmlWriter {
String getCurrentLocalName();
XMLStructure getCurrentNodeAsStructure();
-
+
/**
* This method marshals a structure, and relies on implementation specific details for how
* an instance of a particular class maps to the method that actually does the marshaling.
- *
+ *
* @param toMarshal The object to be marshaled.
* @param dsPrefix The digital signature prefix.
* @param context The context for marshaling.