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 2014/01/07 12:46:32 UTC
svn commit: r1556187 - in
/santuario/xml-security-java/trunk/src/main/java/org/apache:
jcp/xml/dsig/internal/dom/ xml/security/ xml/security/c14n/helper/
xml/security/keys/ xml/security/keys/keyresolver/implementations/
xml/security/signature/ xml/secu...
Author: coheigea
Date: Tue Jan 7 11:46:31 2014
New Revision: 1556187
URL: http://svn.apache.org/r1556187
Log:
A bunch of minor clean up stuff
Modified:
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/DOMXMLSignature.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/xml/security/Init.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/helper/C14nHelper.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/algorithms/ECDSAUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Constants.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/EncryptionConstants.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/I18n.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java
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=1556187&r1=1556186&r2=1556187&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 Jan 7 11:46:31 2014
@@ -42,7 +42,7 @@ import javax.xml.crypto.dsig.spec.*;
*
* @author Sean Mullan
*/
-public class DOMUtils {
+public final class DOMUtils {
// class cannot be instantiated
private DOMUtils() {}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java Tue Jan 7 11:46:31 2014
@@ -29,7 +29,6 @@ import java.security.cert.*;
import java.util.*;
import javax.xml.crypto.*;
import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dsig.keyinfo.X509IssuerSerial;
import javax.xml.crypto.dsig.keyinfo.X509Data;
import javax.security.auth.x500.X500Principal;
import org.w3c.dom.Element;
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=1556187&r1=1556186&r2=1556187&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 Jan 7 11:46:31 2014
@@ -44,10 +44,10 @@ import java.util.Collections;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-
import org.apache.xml.security.exceptions.Base64DecodingException;
import org.apache.xml.security.utils.Base64;
@@ -70,7 +70,7 @@ public final class DOMXMLSignature exten
private boolean validationStatus;
private boolean validated = false;
private KeySelectorResult ksr;
- private HashMap<String, XMLStructure> signatureIdMap;
+ private Map<String, XMLStructure> signatureIdMap;
static {
org.apache.xml.security.Init.init();
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=1556187&r1=1556186&r2=1556187&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 Jan 7 11:46:31 2014
@@ -242,10 +242,10 @@ class Marshaller {
}
};
- private static List<XmlWriter.ToMarshal<? extends XMLStructure>> MARSHALLERS = null;
+ private static final List<XmlWriter.ToMarshal<? extends XMLStructure>> MARSHALLERS =
+ new ArrayList<XmlWriter.ToMarshal<? extends XMLStructure>>();
static {
- MARSHALLERS = new ArrayList<XmlWriter.ToMarshal<? extends XMLStructure>>();
MARSHALLERS.add(Marshal_KeyName);
MARSHALLERS.add(Marshal_KeyInfo);
MARSHALLERS.add(Marshal_KeyValue);
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=1556187&r1=1556186&r2=1556187&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 Jan 7 11:46:31 2014
@@ -21,7 +21,6 @@ package org.apache.jcp.xml.dsig.internal
import javax.xml.crypto.MarshalException;
import javax.xml.crypto.XMLCryptoContext;
import javax.xml.crypto.XMLStructure;
-import javax.xml.stream.XMLStreamWriter;
import org.w3c.dom.Attr;
@@ -41,7 +40,7 @@ public interface XmlWriter {
*
* @param <CLZ>
*/
- static abstract class ToMarshal<CLZ extends XMLStructure> { //NOPMD
+ abstract static class ToMarshal<CLZ extends XMLStructure> { //NOPMD
public final Class<CLZ> clazzToMatch;
public ToMarshal(Class<CLZ> clazzToMatch) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java Tue Jan 7 11:46:31 2014
@@ -62,7 +62,7 @@ public class Init {
* Method isInitialized
* @return true if the library is already initialized.
*/
- public static synchronized final boolean isInitialized() {
+ public static final synchronized boolean isInitialized() {
return Init.alreadyInitialized;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/helper/C14nHelper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/helper/C14nHelper.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/helper/C14nHelper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/helper/C14nHelper.java Tue Jan 7 11:46:31 2014
@@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap;
*
* @author Christian Geuer-Pollmann
*/
-public class C14nHelper {
+public final class C14nHelper {
/**
* Constructor C14nHelper
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyUtils.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyUtils.java Tue Jan 7 11:46:31 2014
@@ -32,7 +32,7 @@ import org.apache.xml.security.keys.cont
*
* @author $Author$
*/
-public class KeyUtils {
+public final class KeyUtils {
private KeyUtils() {
// no instantiation
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/KeyInfoReferenceResolver.java Tue Jan 7 11:46:31 2014
@@ -223,8 +223,7 @@ public class KeyInfoReferenceResolver ex
private XMLSignatureInput resolveInput(Attr uri, String baseURI, boolean secureValidation)
throws XMLSecurityException {
ResourceResolver resRes = ResourceResolver.getInstance(uri, baseURI, secureValidation);
- XMLSignatureInput resource = resRes.resolve(uri, baseURI, secureValidation);
- return resource;
+ return resRes.resolve(uri, baseURI, secureValidation);
}
/**
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java Tue Jan 7 11:46:31 2014
@@ -44,9 +44,6 @@ public class XMLSignatureInputDebugger {
private Set<String> inclusiveNamespaces;
- /** Field doc */
- private Document doc = null;
-
/** Field writer */
private Writer writer = null;
@@ -151,12 +148,12 @@ public class XMLSignatureInputDebugger {
// get only a single node as anchor to fetch the owner document
Node n = this.xpathNodeSet.iterator().next();
- this.doc = XMLUtils.getOwnerDocument(n);
+ Document doc = XMLUtils.getOwnerDocument(n);
try {
this.writer = new StringWriter();
- this.canonicalizeXPathNodeSet(this.doc);
+ this.canonicalizeXPathNodeSet(doc);
this.writer.close();
return this.writer.toString();
@@ -164,7 +161,6 @@ public class XMLSignatureInputDebugger {
throw new XMLSignatureException("empty", ex);
} finally {
this.xpathNodeSet = null;
- this.doc = null;
this.writer = null;
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/algorithms/ECDSAUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/algorithms/ECDSAUtils.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/algorithms/ECDSAUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/algorithms/ECDSAUtils.java Tue Jan 7 11:46:31 2014
@@ -890,8 +890,9 @@ public final class ECDSAUtils {
}
public static ECPoint decodePoint(byte[] encodedBytes, EllipticCurve elliptiCcurve) {
- if (encodedBytes[0] != 0x04)
+ if (encodedBytes[0] != 0x04) {
throw new IllegalArgumentException("Only uncompressed format is supported");
+ }
int size = (elliptiCcurve.getField().getFieldSize() + 7) / 8;
byte affineXBytes[] = new byte[size];
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java Tue Jan 7 11:46:31 2014
@@ -692,7 +692,7 @@ public abstract class AbstractDecryptInp
/**
* The DecryptionThread handles encrypted XML-Parts
*/
- class DecryptionThread implements Runnable {
+ static class DecryptionThread implements Runnable {
private final InputProcessorChain inputProcessorChain;
private final boolean header;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java Tue Jan 7 11:46:31 2014
@@ -70,9 +70,9 @@ public abstract class AbstractSignatureR
private final SignatureType signatureType;
private final InboundSecurityToken inboundSecurityToken;
- private final ArrayList<KeyValue<ResourceResolver, ReferenceType>> sameDocumentReferences;
- private final ArrayList<KeyValue<ResourceResolver, ReferenceType>> externalReferences;
- private final ArrayList<ReferenceType> processedReferences;
+ private final List<KeyValue<ResourceResolver, ReferenceType>> sameDocumentReferences;
+ private final List<KeyValue<ResourceResolver, ReferenceType>> externalReferences;
+ private final List<ReferenceType> processedReferences;
public AbstractSignatureReferenceVerifyInputProcessor(
InputProcessorChain inputProcessorChain,
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java Tue Jan 7 11:46:31 2014
@@ -217,7 +217,7 @@ public abstract class AbstractSignatureE
boolean useSingleCertificate) throws XMLStreamException, XMLSecurityException;
- public class SignedInfoProcessor extends AbstractOutputProcessor {
+ protected static class SignedInfoProcessor extends AbstractOutputProcessor {
private SignerOutputStream signerOutputStream;
private OutputStream bufferedSignerOutputStream;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java Tue Jan 7 11:46:31 2014
@@ -32,7 +32,7 @@ public abstract class Canonicalizer20010
public static final String INCLUSIVE_NAMESPACES_PREFIX_LIST = "inclusiveNamespacePrefixList";
public static final String PROPAGATE_DEFAULT_NAMESPACE = "propagateDefaultNamespace";
- protected ArrayList<String> inclusiveNamespaces = null;
+ protected List<String> inclusiveNamespaces = null;
protected boolean propagateDefaultNamespace = false;
public Canonicalizer20010315_Excl(boolean includeComments) {
@@ -49,13 +49,13 @@ public abstract class Canonicalizer20010
}
}
- protected static ArrayList<String> getPrefixList(List<String> inclusiveNamespaces) {
+ protected static List<String> getPrefixList(List<String> inclusiveNamespaces) {
if (inclusiveNamespaces == null || inclusiveNamespaces.isEmpty()) {
return null;
}
- final ArrayList<String> prefixes = new ArrayList<String>(inclusiveNamespaces.size());
+ final List<String> prefixes = new ArrayList<String>(inclusiveNamespaces.size());
for (int i = 0; i < inclusiveNamespaces.size(); i++) {
final String s = inclusiveNamespaces.get(i).intern();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java Tue Jan 7 11:46:31 2014
@@ -40,20 +40,20 @@ import java.util.*;
*/
public abstract class CanonicalizerBase extends TransformIdentity {
- protected static final byte[] _END_PI = {'?', '>'};
- protected static final byte[] _BEGIN_PI = {'<', '?'};
- protected static final byte[] _END_COMM = {'-', '-', '>'};
- protected static final byte[] _BEGIN_COMM = {'<', '!', '-', '-'};
- protected static final byte[] __XA_ = {'&', '#', 'x', 'A', ';'};
- protected static final byte[] __X9_ = {'&', '#', 'x', '9', ';'};
- protected static final byte[] _QUOT_ = {'&', 'q', 'u', 'o', 't', ';'};
- protected static final byte[] __XD_ = {'&', '#', 'x', 'D', ';'};
- protected static final byte[] _GT_ = {'&', 'g', 't', ';'};
- protected static final byte[] _LT_ = {'&', 'l', 't', ';'};
- protected static final byte[] _END_TAG = {'<', '/'};
- protected static final byte[] _AMP_ = {'&', 'a', 'm', 'p', ';'};
- protected static final byte[] EQUAL_STRING = {'=', '\"'};
- protected static final byte[] NEWLINE = {'\n'};
+ static final byte[] _END_PI = {'?', '>'};
+ static final byte[] _BEGIN_PI = {'<', '?'};
+ static final byte[] _END_COMM = {'-', '-', '>'};
+ static final byte[] _BEGIN_COMM = {'<', '!', '-', '-'};
+ static final byte[] __XA_ = {'&', '#', 'x', 'A', ';'};
+ static final byte[] __X9_ = {'&', '#', 'x', '9', ';'};
+ static final byte[] _QUOT_ = {'&', 'q', 'u', 'o', 't', ';'};
+ static final byte[] __XD_ = {'&', '#', 'x', 'D', ';'};
+ static final byte[] _GT_ = {'&', 'g', 't', ';'};
+ static final byte[] _LT_ = {'&', 'l', 't', ';'};
+ static final byte[] _END_TAG = {'<', '/'};
+ static final byte[] _AMP_ = {'&', 'a', 'm', 'p', ';'};
+ static final byte[] EQUAL_STRING = {'=', '\"'};
+ static final byte[] NEWLINE = {'\n'};
protected static final String XML = "xml";
protected static final String XMLNS = "xmlns";
@@ -240,7 +240,7 @@ public abstract class CanonicalizerBase
public void transform(final XMLSecEvent xmlSecEvent) throws XMLStreamException {
try {
OutputStream outputStream = getOutputStream();
-
+
switch (xmlSecEvent.getEventType()) {
case XMLStreamConstants.START_ELEMENT:
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Constants.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Constants.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Constants.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Constants.java Tue Jan 7 11:46:31 2014
@@ -27,7 +27,7 @@ package org.apache.xml.security.utils;
*
* @author $Author$
*/
-public class Constants {
+public final class Constants {
/** Field configurationFile */
public static final String configurationFile = "data/websig.conf";
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/EncryptionConstants.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/EncryptionConstants.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/EncryptionConstants.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/EncryptionConstants.java Tue Jan 7 11:46:31 2014
@@ -18,7 +18,7 @@
*/
package org.apache.xml.security.utils;
-public class EncryptionConstants {
+public final class EncryptionConstants {
// Attributes that exist in XML Signature in the same way
/** Tag of Attr Algorithm **/
public static final String _ATT_ALGORITHM = Constants._ATT_ALGORITHM;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/I18n.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/I18n.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/I18n.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/I18n.java Tue Jan 7 11:46:31 2014
@@ -149,7 +149,7 @@ public class I18n {
* @param languageCode
* @param countryCode
*/
- public synchronized static void init(String languageCode, String countryCode) {
+ public static synchronized void init(String languageCode, String countryCode) {
if (alreadyInitialized) {
return;
}
@@ -166,7 +166,7 @@ public class I18n {
* Method init
* @param resourceBundle
*/
- public synchronized static void init(ResourceBundle resourceBundle) {
+ public static synchronized void init(ResourceBundle resourceBundle) {
if (alreadyInitialized) {
return;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/JavaUtils.java Tue Jan 7 11:46:31 2014
@@ -29,7 +29,7 @@ import java.io.InputStream;
* A collection of different, general-purpose methods for JAVA-specific things
* @author Christian Geuer-Pollmann
*/
-public class JavaUtils {
+public final class JavaUtils {
private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(JavaUtils.class);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java Tue Jan 7 11:46:31 2014
@@ -49,7 +49,7 @@ import org.w3c.dom.Text;
*
* @author Christian Geuer-Pollmann
*/
-public class XMLUtils {
+public final class XMLUtils {
private static boolean ignoreLineBreaks =
AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
@@ -916,14 +916,17 @@ public class XMLUtils {
* a matching Element has been found, just that no wrapping attack has been detected.
*/
public static boolean protectAgainstWrappingAttack(Node startNode, String value) {
- Node startParent = startNode.getParentNode();
- Node processedNode = null;
- Element foundElement = null;
-
String id = value.trim();
if (id.charAt(0) == '#') {
id = id.substring(1);
}
+
+ Node startParent = null;
+ Node processedNode = null;
+ Element foundElement = null;
+ if (startNode != null) {
+ startParent = startNode.getParentNode();
+ }
while (startNode != null) {
if (startNode.getNodeType() == Node.ELEMENT_NODE) {
@@ -977,13 +980,16 @@ public class XMLUtils {
public static boolean protectAgainstWrappingAttack(
Node startNode, Element knownElement, String value
) {
- Node startParent = startNode.getParentNode();
- Node processedNode = null;
-
String id = value.trim();
if (id.charAt(0) == '#') {
id = id.substring(1);
}
+
+ Node startParent = null;
+ Node processedNode = null;
+ if (startNode != null) {
+ startParent = startNode.getParentNode();
+ }
while (startNode != null) {
if (startNode.getNodeType() == Node.ELEMENT_NODE) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XPathFactory.java Tue Jan 7 11:46:31 2014
@@ -39,7 +39,7 @@ public abstract class XPathFactory {
}
}
- protected synchronized static boolean isXalanInstalled() {
+ protected static synchronized boolean isXalanInstalled() {
return xalanInstalled;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java?rev=1556187&r1=1556186&r2=1556187&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java Tue Jan 7 11:46:31 2014
@@ -107,7 +107,7 @@ public class XalanXPathAPI implements XP
context = null;
}
- public synchronized static boolean isInstalled() {
+ public static synchronized boolean isInstalled() {
return installed;
}
@@ -161,7 +161,7 @@ public class XalanXPathAPI implements XP
return xpath;
}
- private synchronized static void fixupFunctionTable() {
+ private static synchronized void fixupFunctionTable() {
installed = false;
if (log.isDebugEnabled()) {
log.debug("Registering Here function");