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 2017/02/13 11:09:16 UTC
svn commit: r1782742 [1/4] - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/jcp/xml/dsig/internal/dom/
main/java/org/apache/xml/security/algorithms/
main/java/org/apache/xml/security/algorithms/implementations/
main/java/org/apache/xml...
Author: coheigea
Date: Mon Feb 13 11:09:13 2017
New Revision: 1782742
URL: http://svn.apache.org/viewvc?rev=1782742&view=rev
Log:
Remove trailing whitespace
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.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/xml/security/algorithms/JCEMapper.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizationException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/InvalidCanonicalizerException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315Excl.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLEncryptionException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/AlgorithmAlreadyRegisteredException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/Base64DecodingException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/XMLSecurityException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/ContentHandlerAlreadyRegisteredException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/InvalidKeyResolverException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolverException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidDigestValueException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidSignatureValueException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/MissingResourceFailureException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/NodeFilter.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/ReferenceNotInitializedException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/ResourceResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConfigurationException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.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/AbstractSignatureInputHandler.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/resourceResolvers/ResolverSameDocument.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverXPointer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/InvalidTransformException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/TransformationException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N11.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14N11_WithComments.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformC14NWithComments.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXSLT.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/Base64.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/DigesterOutputStream.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ElementProxy.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/UnsyncByteArrayOutputStream.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/resolver/ResourceResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverException.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/OctetStreamDataTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CanonicalizationMethodTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/DigestMethodTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropC14nTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/KeyInfoFactoryTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/RetrievalMethodTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/keyinfo/X509IssuerSerialTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/CreateExclC14nInteropValues.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/EmptyNamespaceTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/Xpath2TransformationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/ExclusiveC14NInteropTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/EncryptionCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/RSASecurityTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationReferenceURIResolverTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/UnknownAlgoSignatureTest.java
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=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java Mon Feb 13 11:09:13 2017
@@ -246,7 +246,7 @@ public final class DOMReference extends
Element dvElem = DOMUtils.getNextSiblingElement(dmElem, "DigestValue", XMLSignature.XMLNS);
String content = XMLUtils.getFullTextChildrenFromElement(dvElem);
this.digestValue = Base64.getMimeDecoder().decode(content);
-
+
// check for extra elements
if (DOMUtils.getNextSiblingElement(dvElem) != null) {
throw new MarshalException(
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=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java Mon Feb 13 11:09:13 2017
@@ -227,7 +227,7 @@ public abstract class DOMSignatureMethod
try (SignerOutputStream outputStream = new SignerOutputStream(signature)) {
si.canonicalize(context, outputStream);
-
+
Type type = getAlgorithmType();
if (type == Type.DSA) {
int size = ((DSAKey)key).getParams().getQ().bitLength();
@@ -274,7 +274,7 @@ public abstract class DOMSignatureMethod
try (SignerOutputStream outputStream = new SignerOutputStream(signature)) {
si.canonicalize(context, outputStream);
-
+
Type type = getAlgorithmType();
if (type == Type.DSA) {
int size = ((DSAKey)key).getParams().getQ().bitLength();
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=1782742&r1=1782741&r2=1782742&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 Mon Feb 13 11:09:13 2017
@@ -220,9 +220,9 @@ public final class DOMSignedInfo extends
try (OutputStream os = new UnsyncBufferedOutputStream(bos)) {
((DOMCanonicalizationMethod)
canonicalizationMethod).canonicalize(subTree, context, os);
-
+
os.flush();
-
+
byte[] signedInfoBytes = bos.toByteArray();
// this whole block should only be done if logging is enabled
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=1782742&r1=1782741&r2=1782742&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 Mon Feb 13 11:09:13 2017
@@ -154,7 +154,7 @@ public final class DOMX509Data extends B
private static void marshalSKI(XmlWriter xwriter, byte[] skid, String dsPrefix)
{
- xwriter.writeTextElement(dsPrefix, "X509SKI", XMLSignature.XMLNS,
+ xwriter.writeTextElement(dsPrefix, "X509SKI", XMLSignature.XMLNS,
Base64.getMimeEncoder().encodeToString(skid));
}
@@ -168,7 +168,7 @@ public final class DOMX509Data extends B
{
try {
byte[] encoded = cert.getEncoded();
- xwriter.writeTextElement(dsPrefix, "X509Certificate", XMLSignature.XMLNS,
+ xwriter.writeTextElement(dsPrefix, "X509Certificate", XMLSignature.XMLNS,
Base64.getMimeEncoder().encodeToString(encoded));
} catch (CertificateEncodingException e) {
throw new MarshalException("Error encoding X509Certificate", e);
@@ -180,7 +180,7 @@ public final class DOMX509Data extends B
{
try {
byte[] encoded = crl.getEncoded();
- xwriter.writeTextElement(dsPrefix, "X509CRL", XMLSignature.XMLNS,
+ xwriter.writeTextElement(dsPrefix, "X509CRL", XMLSignature.XMLNS,
Base64.getMimeEncoder().encodeToString(encoded));
} catch (CRLException e) {
throw new MarshalException("Error encoding X509CRL", e);
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=1782742&r1=1782741&r2=1782742&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 Mon Feb 13 11:09:13 2017
@@ -82,14 +82,14 @@ class Marshaller {
// create and append PGPKeyID element
byte[] keyId = pgpData.getKeyId();
if (keyId != null) {
- xwriter.writeTextElement(dsPrefix, "PGPKeyID", XMLSignature.XMLNS,
+ xwriter.writeTextElement(dsPrefix, "PGPKeyID", XMLSignature.XMLNS,
Base64.getMimeEncoder().encodeToString(keyId));
}
// create and append PGPKeyPacket element
byte[] keyPacket = pgpData.getKeyPacket();
if (keyPacket != null) {
- xwriter.writeTextElement(dsPrefix, "XMLSignature.XMLNS", XMLSignature.XMLNS,
+ xwriter.writeTextElement(dsPrefix, "XMLSignature.XMLNS", XMLSignature.XMLNS,
Base64.getMimeEncoder().encodeToString(keyPacket));
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/JCEMapper.java Mon Feb 13 11:09:13 2017
@@ -397,13 +397,13 @@ public class JCEMapper {
if (log.isDebugEnabled()) {
log.debug("Request for URI " + algorithmURI);
}
-
+
if (algorithmURI != null) {
return algorithmsMap.get(algorithmURI);
}
return null;
}
-
+
/**
* Gets the default Provider for obtaining the security algorithms
* @return the default providerId.
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java Mon Feb 13 11:09:13 2017
@@ -108,7 +108,7 @@ public class MessageDigestAlgorithm exte
MessageDigest md;
String provider = JCEMapper.getProviderId();
- try {
+ try {
if (provider == null) {
md = MessageDigest.getInstance(algorithmID);
} else {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java Mon Feb 13 11:09:13 2017
@@ -234,7 +234,7 @@ public class SignatureAlgorithm extends
* @param signingKey
* @throws XMLSignatureException
*/
- public void initSign(Key signingKey) throws XMLSignatureException {
+ public void initSign(Key signingKey) throws XMLSignatureException {
signatureAlgorithm.engineInitSign(signingKey);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java Mon Feb 13 11:09:13 2017
@@ -41,7 +41,7 @@ import org.apache.xml.security.utils.Jav
public class SignatureDSA extends SignatureAlgorithmSpi {
public static final String URI = Constants.SignatureSpecNS + "dsa-sha1";
-
+
private static org.slf4j.Logger log =
org.slf4j.LoggerFactory.getLogger(SignatureDSA.class);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizationException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizationException.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizationException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizationException.java Mon Feb 13 11:09:13 2017
@@ -72,7 +72,7 @@ public class CanonicalizationException e
public CanonicalizationException(Exception originalException, String msgID) {
super(originalException, msgID);
}
-
+
@Deprecated
public CanonicalizationException(String msgID, Exception originalException) {
this(originalException, msgID);
@@ -90,7 +90,7 @@ public class CanonicalizationException e
) {
super(originalException, msgID, exArgs);
}
-
+
@Deprecated
public CanonicalizationException(String msgID, Object exArgs[], Exception originalException) {
this(originalException, msgID, exArgs);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java Mon Feb 13 11:09:13 2017
@@ -255,10 +255,10 @@ public class Canonicalizer {
Document document = null;
try (InputStream bais = new ByteArrayInputStream(inputBytes)) {
InputSource in = new InputSource(bais);
-
+
// needs to validate for ID attribute normalization
DocumentBuilder db = XMLUtils.createDocumentBuilder(true, secureValidation);
-
+
/*
* for some of the test vectors from the specification,
* there has to be a validating parser for ID attributes, default
@@ -281,7 +281,7 @@ public class Canonicalizer {
* canonical form.
*/
db.setErrorHandler(new org.apache.xml.security.utils.IgnoreAllErrorHandler());
-
+
try {
document = db.parse(in);
} finally {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/InvalidCanonicalizerException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/InvalidCanonicalizerException.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/InvalidCanonicalizerException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/InvalidCanonicalizerException.java Mon Feb 13 11:09:13 2017
@@ -63,7 +63,7 @@ public class InvalidCanonicalizerExcepti
public InvalidCanonicalizerException(Exception originalException, String msgID) {
super(originalException, msgID);
}
-
+
@Deprecated
public InvalidCanonicalizerException(String msgID, Exception originalException) {
this(originalException, msgID);
@@ -81,7 +81,7 @@ public class InvalidCanonicalizerExcepti
) {
super(originalException, msgID, exArgs);
}
-
+
@Deprecated
public InvalidCanonicalizerException(String msgID, Object[] exArgs, Exception originalException) {
this(originalException, msgID, exArgs);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java Mon Feb 13 11:09:13 2017
@@ -85,7 +85,7 @@ public abstract class Canonicalizer11 ex
int newSize = levels.size();
if (newSize == 0) {
lastlevel = 0;
- return;
+ return;
}
lastlevel = levels.get(newSize - 1).level;
}
@@ -125,7 +125,7 @@ public abstract class Canonicalizer11 ex
return;
}
- Map<String, Attr> loa = new HashMap<String, Attr>();
+ Map<String, Attr> loa = new HashMap<String, Attr>();
List<Attr> baseAttrs = new ArrayList<>();
boolean successiveOmitted = true;
for (; size >= 0; size--) {
@@ -294,7 +294,7 @@ public abstract class Canonicalizer11 ex
if (firstCall) {
// It is the first node of the subtree
// Obtain all the namespaces defined in the parents, and added to the output.
- ns.getUnrenderedNodes(result);
+ ns.getUnrenderedNodes(result);
// output the attributes in the xml namespace.
xmlattrStack.getXmlnsAttr(result);
firstCall = false;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java Mon Feb 13 11:09:13 2017
@@ -79,7 +79,7 @@ public abstract class Canonicalizer20010
int newSize = levels.size();
if (newSize == 0) {
lastlevel = 0;
- return;
+ return;
}
lastlevel = levels.get(newSize - 1).level;
}
@@ -119,7 +119,7 @@ public abstract class Canonicalizer20010
return;
}
- Map<String, Attr> loa = new HashMap<String, Attr>();
+ Map<String, Attr> loa = new HashMap<String, Attr>();
for (; size >= 0; size--) {
e = levels.get(size);
Iterator<Attr> it = e.nodes.iterator();
@@ -233,7 +233,7 @@ public abstract class Canonicalizer20010
result.add(attribute);
} else if (!(XML.equals(NName) && XML_LANG_URI.equals(NValue))) {
//The default mapping for xml must not be output.
- Node n = ns.addMappingAndRender(NName, NValue, attribute);
+ Node n = ns.addMappingAndRender(NName, NValue, attribute);
if (n != null) {
//Render the ns definition
@@ -252,7 +252,7 @@ public abstract class Canonicalizer20010
if (firstCall) {
//It is the first node of the subtree
//Obtain all the namespaces defined in the parents, and added to the output.
- ns.getUnrenderedNodes(result);
+ ns.getUnrenderedNodes(result);
//output the attributes in the xml namespace.
xmlattrStack.getXmlnsAttr(result);
firstCall = false;
@@ -321,7 +321,7 @@ public abstract class Canonicalizer20010
}
} else {
if (isRealVisible && !XMLNS.equals(NName)) {
- ns.removeMapping(NName);
+ ns.removeMapping(NName);
} else {
ns.addMapping(NName, NValue, attribute);
}
@@ -329,13 +329,13 @@ public abstract class Canonicalizer20010
}
}
}
- if (isRealVisible) {
+ if (isRealVisible) {
//The element is visible, handle the xmlns definition
Attr xmlns = element.getAttributeNodeNS(XMLNS_URI, XMLNS);
Node n = null;
if (xmlns == null) {
//No xmlns def just get the already defined.
- n = ns.getMapping(XMLNS);
+ n = ns.getMapping(XMLNS);
} else if (!isVisible(xmlns)) {
//There is a definition but the xmlns is not selected by the xpath.
//then xmlns=""
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315Excl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315Excl.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315Excl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315Excl.java Mon Feb 13 11:09:13 2017
@@ -272,7 +272,7 @@ public abstract class Canonicalizer20010
String prefix = attribute.getPrefix();
if (prefix != null && !(prefix.equals(XML) || prefix.equals(XMLNS))) {
visiblyUtilized.add(prefix);
- }
+ }
// Add to the result.
result.add(attribute);
}
@@ -306,7 +306,7 @@ public abstract class Canonicalizer20010
}
}
- if (isOutputElement) {
+ if (isOutputElement) {
// The element is visible, handle the xmlns definition
Attr xmlns = element.getAttributeNodeNS(XMLNS_URI, XMLNS);
if (xmlns != null && !isVisible(xmlns)) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java Mon Feb 13 11:09:13 2017
@@ -241,7 +241,7 @@ public abstract class CanonicalizerBase
return;
}
Node sibling = null;
- Node parentNode = null;
+ Node parentNode = null;
final OutputStream writer = this.writer;
final Node excludeNode = this.excludeNode;
final boolean includeComments = this.includeComments;
@@ -317,7 +317,7 @@ public abstract class CanonicalizerBase
default :
break;
}
- while (sibling == null && parentNode != null) {
+ while (sibling == null && parentNode != null) {
writer.write(END_TAG.clone());
UtfHelpper.writeByte(((Element)parentNode).getTagName(), writer, cache);
writer.write('>');
@@ -331,7 +331,7 @@ public abstract class CanonicalizerBase
if (parentNode == null || Node.ELEMENT_NODE != parentNode.getNodeType()) {
documentLevel = NODE_AFTER_DOCUMENT_ELEMENT;
parentNode = null;
- }
+ }
}
if (sibling == null) {
return;
@@ -388,7 +388,7 @@ public abstract class CanonicalizerBase
if (isVisibleInt(currentNode) == -1) {
return;
}
- boolean currentNodeIsVisible = false;
+ boolean currentNodeIsVisible = false;
NameSpaceSymbTable ns = new NameSpaceSymbTable();
if (currentNode != null && Node.ELEMENT_NODE == currentNode.getNodeType()) {
getParentNameSpaces((Element)currentNode, ns);
@@ -397,7 +397,7 @@ public abstract class CanonicalizerBase
return;
}
Node sibling = null;
- Node parentNode = null;
+ Node parentNode = null;
OutputStream writer = this.writer;
int documentLevel = NODE_BEFORE_DOCUMENT_ELEMENT;
Map<String, byte[]> cache = new HashMap<String, byte[]>();
@@ -417,7 +417,7 @@ public abstract class CanonicalizerBase
sibling = currentNode.getFirstChild();
break;
- case Node.COMMENT_NODE :
+ case Node.COMMENT_NODE :
if (this.includeComments && isVisibleDO(currentNode, ns.getLevel()) == 1) {
outputCommentToWriter((Comment) currentNode, writer, documentLevel);
}
@@ -486,13 +486,13 @@ public abstract class CanonicalizerBase
ns.outputNodePop();
} else {
ns.pop();
- }
+ }
if (parentNode != null) {
sibling = currentNode.getNextSibling();
}
} else {
parentNode = currentElement;
- }
+ }
break;
case Node.DOCUMENT_TYPE_NODE :
@@ -517,7 +517,7 @@ public abstract class CanonicalizerBase
if (parentNode == null || Node.ELEMENT_NODE != parentNode.getNodeType()) {
parentNode = null;
documentLevel = NODE_AFTER_DOCUMENT_ELEMENT;
- }
+ }
}
if (sibling == null) {
return;
@@ -530,7 +530,7 @@ public abstract class CanonicalizerBase
protected int isVisibleDO(Node currentNode, int level) {
if (nodeFilter != null) {
Iterator<NodeFilter> it = nodeFilter.iterator();
- while (it.hasNext()) {
+ while (it.hasNext()) {
int i = it.next().isNodeIncludeDO(currentNode, level);
if (i != 1) {
return i;
@@ -546,7 +546,7 @@ public abstract class CanonicalizerBase
protected int isVisibleInt(Node currentNode) {
if (nodeFilter != null) {
Iterator<NodeFilter> it = nodeFilter.iterator();
- while (it.hasNext()) {
+ while (it.hasNext()) {
int i = it.next().isNodeInclude(currentNode);
if (i != 1) {
return i;
@@ -562,7 +562,7 @@ public abstract class CanonicalizerBase
protected boolean isVisible(Node currentNode) {
if (nodeFilter != null) {
Iterator<NodeFilter> it = nodeFilter.iterator();
- while (it.hasNext()) {
+ while (it.hasNext()) {
if (it.next().isNodeInclude(currentNode) != 1) {
return false;
}
@@ -744,7 +744,7 @@ public abstract class CanonicalizerBase
*/
protected void outputPItoWriter(
ProcessingInstruction currentPI, OutputStream writer, int position
- ) throws IOException {
+ ) throws IOException {
if (position == NODE_AFTER_DOCUMENT_ELEMENT) {
writer.write('\n');
}
@@ -800,7 +800,7 @@ public abstract class CanonicalizerBase
*/
protected void outputCommentToWriter(
Comment currentComment, OutputStream writer, int position
- ) throws IOException {
+ ) throws IOException {
if (position == NODE_AFTER_DOCUMENT_ELEMENT) {
writer.write('\n');
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java Mon Feb 13 11:09:13 2017
@@ -40,7 +40,7 @@ public class NameSpaceSymbTable {
static {
NameSpaceSymbEntry ne = new NameSpaceSymbEntry("", null, true, XMLNS);
- ne.lastrendered = "";
+ ne.lastrendered = "";
initialMap.put(XMLNS, ne);
}
@@ -53,10 +53,10 @@ public class NameSpaceSymbTable {
/**
* Default constractor
- **/
- public NameSpaceSymbTable() {
+ **/
+ public NameSpaceSymbTable() {
level = new ArrayList<>();
- //Insert the default binding for xmlns.
+ //Insert the default binding for xmlns.
symb = (SymbMap) initialMap.clone();
}
@@ -65,9 +65,9 @@ public class NameSpaceSymbTable {
* For Inclusive rendering
* @param result the list where to fill the unrendered xmlns definitions.
**/
- public void getUnrenderedNodes(Collection<Attr> result) {
+ public void getUnrenderedNodes(Collection<Attr> result) {
Iterator<NameSpaceSymbEntry> it = symb.entrySet().iterator();
- while (it.hasNext()) {
+ while (it.hasNext()) {
NameSpaceSymbEntry n = it.next();
//put them rendered?
if (!n.rendered && n.n != null) {
@@ -79,7 +79,7 @@ public class NameSpaceSymbTable {
result.add(n.n);
}
- }
+ }
}
/**
@@ -101,7 +101,7 @@ public class NameSpaceSymbTable {
* Push a frame for a node.
* Inclusive or Exclusive.
**/
- public void push() {
+ public void push() {
//Put the number of namespace definitions in the stack.
level.add(null);
cloned = false;
@@ -127,7 +127,7 @@ public class NameSpaceSymbTable {
}
final void needsClone() {
- if (!cloned) {
+ if (!cloned) {
level.set(level.size() - 1, symb);
symb = (SymbMap) symb.clone();
cloned = true;
@@ -141,22 +141,22 @@ public class NameSpaceSymbTable {
* @return null if there is no need to render the prefix. Otherwise the node of
* definition.
**/
- public Attr getMapping(String prefix) {
+ public Attr getMapping(String prefix) {
NameSpaceSymbEntry entry = symb.get(prefix);
if (entry == null) {
//There is no definition for the prefix(a bug?).
return null;
}
- if (entry.rendered) {
+ if (entry.rendered) {
//No need to render an entry already rendered.
- return null;
+ return null;
}
// Mark this entry as render.
entry = (NameSpaceSymbEntry) entry.clone();
needsClone();
symb.put(prefix, entry);
entry.rendered = true;
- entry.lastrendered = entry.uri;
+ entry.lastrendered = entry.uri;
// Return the node for outputing.
return entry.n;
}
@@ -167,13 +167,13 @@ public class NameSpaceSymbTable {
* @param prefix The prefix whose definition is neaded.
* @return the attr to render, null if there is no need to render
**/
- public Attr getMappingWithoutRendered(String prefix) {
+ public Attr getMappingWithoutRendered(String prefix) {
NameSpaceSymbEntry entry = symb.get(prefix);
- if (entry == null) {
+ if (entry == null) {
return null;
}
- if (entry.rendered) {
- return null;
+ if (entry.rendered) {
+ return null;
}
return entry.n;
}
@@ -185,25 +185,25 @@ public class NameSpaceSymbTable {
* @param n the attribute that have the definition
* @return true if there is already defined.
**/
- public boolean addMapping(String prefix, String uri, Attr n) {
- NameSpaceSymbEntry ob = symb.get(prefix);
+ public boolean addMapping(String prefix, String uri, Attr n) {
+ NameSpaceSymbEntry ob = symb.get(prefix);
if (ob != null && uri.equals(ob.uri)) {
//If we have it previously defined. Don't keep working.
return false;
- }
+ }
//Creates and entry in the table for this new definition.
- NameSpaceSymbEntry ne = new NameSpaceSymbEntry(uri, n, false, prefix);
+ NameSpaceSymbEntry ne = new NameSpaceSymbEntry(uri, n, false, prefix);
needsClone();
symb.put(prefix, ne);
if (ob != null) {
- //We have a previous definition store it for the pop.
- //Check if a previous definition(not the inmidiatly one) has been rendered.
- ne.lastrendered = ob.lastrendered;
+ //We have a previous definition store it for the pop.
+ //Check if a previous definition(not the inmidiatly one) has been rendered.
+ ne.lastrendered = ob.lastrendered;
if (ob.lastrendered != null && ob.lastrendered.equals(uri)) {
//Yes it is. Mark as rendered.
ne.rendered = true;
- }
- }
+ }
+ }
return true;
}
@@ -320,15 +320,15 @@ class SymbMap implements Cloneable {
keys = new String[free];
}
- void put(String key, NameSpaceSymbEntry value) {
+ void put(String key, NameSpaceSymbEntry value) {
int index = index(key);
Object oldKey = keys[index];
keys[index] = key;
entries[index] = value;
- if ((oldKey == null || !oldKey.equals(key)) && --free == 0) {
+ if ((oldKey == null || !oldKey.equals(key)) && --free == 0) {
free = entries.length;
- int newCapacity = free << 2;
- rehash(newCapacity);
+ int newCapacity = free << 2;
+ rehash(newCapacity);
}
}
@@ -339,10 +339,10 @@ class SymbMap implements Cloneable {
a.add(entries[i]);
}
}
- return a;
+ return a;
}
- protected int index(Object obj) {
+ protected int index(Object obj) {
Object[] set = keys;
int length = set.length;
//abs of index
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java Mon Feb 13 11:09:13 2017
@@ -119,7 +119,7 @@ public final class UtfHelpper {
}
@Deprecated
- public static void writeCharToUtf8(final char c, final OutputStream out) throws IOException {
+ public static void writeCharToUtf8(final char c, final OutputStream out) throws IOException {
if (c < 0x80) {
out.write(c);
return;
@@ -133,14 +133,14 @@ public final class UtfHelpper {
int write;
char ch;
if (c > 0x07FF) {
- ch = (char)(c>>>12);
+ ch = (char)(c>>>12);
write = 0xE0;
if (ch > 0) {
write |= ch & 0x0F;
- }
+ }
out.write(write);
write = 0x80;
- bias = 0x3F;
+ bias = 0x3F;
} else {
write = 0xC0;
bias = 0x1F;
@@ -148,12 +148,12 @@ public final class UtfHelpper {
ch = (char)(c>>>6);
if (ch > 0) {
write |= ch & bias;
- }
+ }
out.write(write);
- out.write(0x80 | ((c) & 0x3F));
+ out.write(0x80 | ((c) & 0x3F));
}
-
+
public static void writeStringToUtf8(
final String str, final OutputStream out
) throws IOException {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java Mon Feb 13 11:09:13 2017
@@ -899,7 +899,7 @@ public class XMLCipher {
if (algorithm == null) {
throw new XMLEncryptionException("empty", "XMLCipher instance without transformation specified");
}
- encryptData(contextDocument, element, true);
+ encryptData(contextDocument, element, true);
Element encryptedElement = factory.toElement(ed);
@@ -1720,7 +1720,7 @@ public class XMLCipher {
Node sourceParent = element.getParentNode();
try {
Node decryptedNode = serializer.deserialize(octets, sourceParent);
-
+
// The de-serialiser returns a node whose children we need to take on.
if (sourceParent != null && Node.DOCUMENT_NODE == sourceParent.getNodeType()) {
// If this is a content decryption, this may have problems
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLEncryptionException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLEncryptionException.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLEncryptionException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLEncryptionException.java Mon Feb 13 11:09:13 2017
@@ -66,7 +66,7 @@ public class XMLEncryptionException exte
super(originalException, msgID);
}
-
+
@Deprecated
public XMLEncryptionException(String msgID, Exception originalException) {
this(originalException, msgID);
@@ -80,7 +80,7 @@ public class XMLEncryptionException exte
public XMLEncryptionException(Exception originalException, String msgID, Object exArgs[]) {
super(originalException, msgID, exArgs);
}
-
+
@Deprecated
public XMLEncryptionException(String msgID, Object[] exArgs, Exception originalException) {
this(originalException, msgID, exArgs);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/AlgorithmAlreadyRegisteredException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/AlgorithmAlreadyRegisteredException.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/AlgorithmAlreadyRegisteredException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/AlgorithmAlreadyRegisteredException.java Mon Feb 13 11:09:13 2017
@@ -60,7 +60,7 @@ public class AlgorithmAlreadyRegisteredE
public AlgorithmAlreadyRegisteredException(Exception originalException, String msgID) {
super(originalException, msgID);
}
-
+
@Deprecated
public AlgorithmAlreadyRegisteredException(String msgID, Exception originalException) {
this(originalException, msgID);
@@ -78,7 +78,7 @@ public class AlgorithmAlreadyRegisteredE
) {
super(originalException, msgID, exArgs);
}
-
+
@Deprecated
public AlgorithmAlreadyRegisteredException(String msgID, Object[] exArgs, Exception originalException) {
this(originalException, msgID, exArgs);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/Base64DecodingException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/Base64DecodingException.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/Base64DecodingException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/Base64DecodingException.java Mon Feb 13 11:09:13 2017
@@ -63,7 +63,7 @@ public class Base64DecodingException ext
public Base64DecodingException(Exception originalException, String msgID) {
super(originalException, msgID);
}
-
+
@Deprecated
public Base64DecodingException(String msgID, Exception originalException) {
this(originalException, msgID);
@@ -79,7 +79,7 @@ public class Base64DecodingException ext
public Base64DecodingException(Exception originalException, String msgID, Object exArgs[]) {
super(originalException, msgID, exArgs);
}
-
+
@Deprecated
public Base64DecodingException(String msgID, Object[] exArgs, Exception originalException) {
this(originalException, msgID, exArgs);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/XMLSecurityException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/XMLSecurityException.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/XMLSecurityException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/exceptions/XMLSecurityException.java Mon Feb 13 11:09:13 2017
@@ -119,12 +119,12 @@ public class XMLSecurityException extend
this.msgID = msgID;
}
-
+
@Deprecated
public XMLSecurityException(String msgID, Exception originalException) {
this(originalException, msgID);
}
-
+
/**
* Constructor XMLSecurityException
*
@@ -137,7 +137,7 @@ public class XMLSecurityException extend
this.msgID = msgID;
}
-
+
@Deprecated
public XMLSecurityException(String msgID, Object[] exArgs, Exception originalException) {
this(originalException, msgID, exArgs);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/ContentHandlerAlreadyRegisteredException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/ContentHandlerAlreadyRegisteredException.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/ContentHandlerAlreadyRegisteredException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/ContentHandlerAlreadyRegisteredException.java Mon Feb 13 11:09:13 2017
@@ -63,7 +63,7 @@ public class ContentHandlerAlreadyRegist
public ContentHandlerAlreadyRegisteredException(Exception originalException, String msgID) {
super(originalException, msgID);
}
-
+
@Deprecated
public ContentHandlerAlreadyRegisteredException(String msgID, Exception originalException) {
this(originalException, msgID);
@@ -81,7 +81,7 @@ public class ContentHandlerAlreadyRegist
) {
super(originalException, msgID, exArgs);
}
-
+
@Deprecated
public ContentHandlerAlreadyRegisteredException(String msgID, Object[] exArgs, Exception originalException) {
this(originalException, msgID, exArgs);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java Mon Feb 13 11:09:13 2017
@@ -993,7 +993,7 @@ public class KeyInfo extends SignatureEl
(Element) currentChild, uri, storage
);
- if (cert != null) {
+ if (cert != null) {
return cert;
}
}
@@ -1024,7 +1024,7 @@ public class KeyInfo extends SignatureEl
}
keyResolver.setSecureValidation(secureValidation);
X509Certificate cert = applyCurrentResolver(uri, keyResolver);
- if (cert != null) {
+ if (cert != null) {
return cert;
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/InvalidKeyResolverException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/InvalidKeyResolverException.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/InvalidKeyResolverException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/InvalidKeyResolverException.java Mon Feb 13 11:09:13 2017
@@ -63,7 +63,7 @@ public class InvalidKeyResolverException
public InvalidKeyResolverException(Exception originalException, String msgID) {
super(originalException, msgID);
}
-
+
@Deprecated
public InvalidKeyResolverException(String msgID, Exception originalException) {
this(originalException, msgID);
@@ -79,7 +79,7 @@ public class InvalidKeyResolverException
public InvalidKeyResolverException(Exception originalException, String msgID, Object exArgs[]) {
super(originalException, msgID, exArgs);
}
-
+
@Deprecated
public InvalidKeyResolverException(String msgID, Object[] exArgs, Exception originalException) {
this(originalException, msgID, exArgs);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverException.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverException.java Mon Feb 13 11:09:13 2017
@@ -67,7 +67,7 @@ public class KeyResolverException extend
public KeyResolverException(Exception originalException, String msgID) {
super(originalException, msgID);
}
-
+
@Deprecated
public KeyResolverException(String msgID, Exception originalException) {
this(originalException, msgID);
@@ -83,7 +83,7 @@ public class KeyResolverException extend
public KeyResolverException(Exception originalException, String msgID, Object exArgs[]) {
super(originalException, msgID, exArgs);
}
-
+
@Deprecated
public KeyResolverException(String msgID, Object[] exArgs, Exception originalException) {
this(originalException, msgID, exArgs);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java Mon Feb 13 11:09:13 2017
@@ -114,7 +114,7 @@ public abstract class KeyResolverSpi {
KeyResolverSpi tmp = this;
if (globalResolver) {
try {
- tmp = getClass().newInstance();
+ tmp = getClass().newInstance();
} catch (InstantiationException e) {
throw new KeyResolverException(e, "");
} catch (IllegalAccessException e) {
@@ -193,7 +193,7 @@ public abstract class KeyResolverSpi {
if (!tmp.engineCanResolve(element, baseURI, storage)) {
return null;
}
- return tmp.engineResolveSecretKey(element, baseURI, storage);
+ return tmp.engineResolveSecretKey(element, baseURI, storage);
}
/**
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DSAKeyValueResolver.java Mon Feb 13 11:09:13 2017
@@ -52,14 +52,14 @@ public class DSAKeyValueResolver extends
Element dsaKeyElement = null;
boolean isKeyValue =
XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_KEYVALUE);
- if (isKeyValue) {
+ if (isKeyValue) {
dsaKeyElement =
XMLUtils.selectDsNode(element.getFirstChild(), Constants._TAG_DSAKEYVALUE, 0);
} else if (XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_DSAKEYVALUE)) {
// this trick is needed to allow the RetrievalMethodResolver to eat a
// ds:DSAKeyValue directly (without KeyValue)
dsaKeyElement = element;
- }
+ }
if (dsaKeyElement == null) {
return null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java Mon Feb 13 11:09:13 2017
@@ -61,7 +61,7 @@ public class EncryptedKeyResolver extend
* list
* @param algorithm
*/
- public EncryptedKeyResolver(String algorithm) {
+ public EncryptedKeyResolver(String algorithm) {
kek = null;
this.algorithm = algorithm;
}
@@ -71,7 +71,7 @@ public class EncryptedKeyResolver extend
* @param algorithm
* @param kek
*/
- public EncryptedKeyResolver(String algorithm, Key kek) {
+ public EncryptedKeyResolver(String algorithm, Key kek) {
this.algorithm = algorithm;
this.kek = kek;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java Mon Feb 13 11:09:13 2017
@@ -55,7 +55,7 @@ public class RSAKeyValueResolver extends
} else if (XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_RSAKEYVALUE)) {
// this trick is needed to allow the RetrievalMethodResolver to eat a
// ds:RSAKeyValue directly (without KeyValue)
- rsaKeyElement = element;
+ rsaKeyElement = element;
}
if (rsaKeyElement == null) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java Mon Feb 13 11:09:13 2017
@@ -84,7 +84,7 @@ public class RetrievalMethodResolver ext
try {
// Create a retrieval method over the given element
RetrievalMethod rm = new RetrievalMethod(element, baseURI);
- String type = rm.getType();
+ String type = rm.getType();
XMLSignatureInput resource = resolveInput(rm, baseURI, secureValidation);
if (RetrievalMethod.TYPE_RAWX509.equals(type)) {
// a raw certificate, direct parsing is done!
@@ -158,7 +158,7 @@ public class RetrievalMethodResolver ext
try {
RetrievalMethod rm = new RetrievalMethod(element, baseURI);
- String type = rm.getType();
+ String type = rm.getType();
XMLSignatureInput resource = resolveInput(rm, baseURI, secureValidation);
if (RetrievalMethod.TYPE_RAWX509.equals(type)) {
return getRawCertificate(resource);
@@ -280,7 +280,7 @@ public class RetrievalMethodResolver ext
private static X509Certificate getRawCertificate(XMLSignatureInput resource)
throws CanonicalizationException, IOException, CertificateException {
- byte inputBytes[] = resource.getBytes();
+ byte inputBytes[] = resource.getBytes();
// if the resource stores a raw certificate, we have to handle it
CertificateFactory certFact =
CertificateFactory.getInstance(XMLX509Certificate.JCA_CERT_ID);
@@ -307,7 +307,7 @@ public class RetrievalMethodResolver ext
log.debug("We have Transforms");
}
resource = transforms.performTransforms(resource);
- }
+ }
return resource;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509CertificateResolver.java Mon Feb 13 11:09:13 2017
@@ -86,7 +86,7 @@ public class X509CertificateResolver ext
XMLUtils.selectDsNode(element.getFirstChild(), Constants._TAG_X509DATA, 0);
if (el != null) {
return engineLookupResolveX509Certificate(el, baseURI, storage);
- }
+ }
return null;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java Mon Feb 13 11:09:13 2017
@@ -76,7 +76,7 @@ public class X509SKIResolver extends Key
) throws KeyResolverException {
if (log.isDebugEnabled()) {
log.debug("Can I resolve " + element.getTagName() + "?");
- }
+ }
if (!XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_X509DATA)) {
if (log.isDebugEnabled()) {
log.debug("I can't");
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java Mon Feb 13 11:09:13 2017
@@ -77,7 +77,7 @@ public class X509SubjectNameResolver ext
if (log.isDebugEnabled()) {
log.debug("Can I resolve " + element.getTagName() + "?");
}
- Element[] x509childNodes = null;
+ Element[] x509childNodes = null;
XMLX509SubjectName x509childObject[] = null;
if (!XMLUtils.elementIsInSignatureSpace(element, Constants._TAG_X509DATA)) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolverException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolverException.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolverException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolverException.java Mon Feb 13 11:09:13 2017
@@ -68,7 +68,7 @@ public class StorageResolverException ex
public StorageResolverException(Exception originalException, String msgID) {
super(originalException, msgID);
}
-
+
@Deprecated
public StorageResolverException(String msgID, Exception originalException) {
this(originalException, msgID);
@@ -84,7 +84,7 @@ public class StorageResolverException ex
public StorageResolverException(Exception originalException, String msgID, Object exArgs[]) {
super(originalException, msgID, exArgs);
}
-
+
@Deprecated
public StorageResolverException(String msgID, Object[] exArgs, Exception originalException) {
this(originalException, msgID, exArgs);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidDigestValueException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidDigestValueException.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidDigestValueException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidDigestValueException.java Mon Feb 13 11:09:13 2017
@@ -68,7 +68,7 @@ public class InvalidDigestValueException
public InvalidDigestValueException(Exception originalException, String msgID) {
super(originalException, msgID);
}
-
+
@Deprecated
public InvalidDigestValueException(String msgID, Exception originalException) {
this(originalException, msgID);
@@ -84,7 +84,7 @@ public class InvalidDigestValueException
public InvalidDigestValueException(Exception originalException, String msgID, Object exArgs[]) {
super(originalException, msgID, exArgs);
}
-
+
@Deprecated
public InvalidDigestValueException(String msgID, Object[] exArgs, Exception originalException) {
this(originalException, msgID, exArgs);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidSignatureValueException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidSignatureValueException.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidSignatureValueException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/InvalidSignatureValueException.java Mon Feb 13 11:09:13 2017
@@ -67,7 +67,7 @@ public class InvalidSignatureValueExcept
public InvalidSignatureValueException(Exception originalException, String msgID) {
super(originalException, msgID);
}
-
+
@Deprecated
public InvalidSignatureValueException(String msgID, Exception originalException) {
this(originalException, msgID);
@@ -83,7 +83,7 @@ public class InvalidSignatureValueExcept
public InvalidSignatureValueException(Exception originalException, String msgID, Object exArgs[]) {
super(originalException, msgID, exArgs);
}
-
+
@Deprecated
public InvalidSignatureValueException(String msgID, Object[] exArgs, Exception originalException) {
this(originalException, msgID, exArgs);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/MissingResourceFailureException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/MissingResourceFailureException.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/MissingResourceFailureException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/MissingResourceFailureException.java Mon Feb 13 11:09:13 2017
@@ -47,7 +47,7 @@ public class MissingResourceFailureExcep
this.uninitializedReference = reference;
}
-
+
@Deprecated
public MissingResourceFailureException(String msgID, Reference reference) {
this(reference, msgID);
@@ -66,7 +66,7 @@ public class MissingResourceFailureExcep
this.uninitializedReference = reference;
}
-
+
@Deprecated
public MissingResourceFailureException(String msgID, Object exArgs[], Reference reference) {
this(reference, msgID, exArgs);
@@ -87,7 +87,7 @@ public class MissingResourceFailureExcep
this.uninitializedReference = reference;
}
-
+
@Deprecated
public MissingResourceFailureException(
String msgID, Exception originalException, Reference reference
@@ -111,7 +111,7 @@ public class MissingResourceFailureExcep
this.uninitializedReference = reference;
}
-
+
@Deprecated
public MissingResourceFailureException(
String msgID, Object exArgs[], Exception originalException, Reference reference
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/NodeFilter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/NodeFilter.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/NodeFilter.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/NodeFilter.java Mon Feb 13 11:09:13 2017
@@ -31,7 +31,7 @@ public interface NodeFilter {
* @return 1 if the node should be output.
* 0 if node must not be output,
* -1 if the node and all it's child must not be output.
- *
+ *
*/
int isNodeInclude(Node n);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java Mon Feb 13 11:09:13 2017
@@ -713,10 +713,10 @@ public class Reference extends Signature
if (input.isPreCalculatedDigest()) {
return getPreCalculatedDigest(input);
}
-
+
MessageDigestAlgorithm mda = this.getMessageDigestAlgorithm();
mda.reset();
-
+
try (DigesterOutputStream diOs = new DigesterOutputStream(mda);
OutputStream os = new UnsyncBufferedOutputStream(diOs)) {
XMLSignatureInput output = this.dereferenceURIandPerformTransforms(os);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/ReferenceNotInitializedException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/ReferenceNotInitializedException.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/ReferenceNotInitializedException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/ReferenceNotInitializedException.java Mon Feb 13 11:09:13 2017
@@ -71,7 +71,7 @@ public class ReferenceNotInitializedExce
public ReferenceNotInitializedException(Exception originalException, String msgID) {
super(originalException, msgID);
}
-
+
@Deprecated
public ReferenceNotInitializedException(String msgID, Exception originalException) {
this(originalException, msgID);
@@ -87,7 +87,7 @@ public class ReferenceNotInitializedExce
public ReferenceNotInitializedException(Exception originalException, String msgID, Object exArgs[]) {
super(originalException, msgID, exArgs);
}
-
+
@Deprecated
public ReferenceNotInitializedException(String msgID, Object[] exArgs, Exception originalException) {
this(originalException, msgID, exArgs);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignature.java Mon Feb 13 11:09:13 2017
@@ -619,7 +619,7 @@ public final class XMLSignature extends
SignatureAlgorithm sa = si.getSignatureAlgorithm();
try (SignerOutputStream output = new SignerOutputStream(sa);
OutputStream so = new UnsyncBufferedOutputStream(output)) {
-
+
// generate digest values for all References in this SignedInfo
si.generateDigestValues();
@@ -628,7 +628,7 @@ public final class XMLSignature extends
// get the canonicalized bytes from SignedInfo
si.signInOctetStream(so);
-
+
// set them on the SignatureValue element
this.setSignatureValueElement(sa.sign());
} catch (XMLSignatureException ex) {
@@ -721,7 +721,7 @@ public final class XMLSignature extends
byte sigBytes[] = null;
try (SignerOutputStream so = new SignerOutputStream(sa);
OutputStream bos = new UnsyncBufferedOutputStream(so)) {
-
+
sa.initVerify(pk);
// Get the canonicalized (normalized) SignedInfo
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureException.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureException.java Mon Feb 13 11:09:13 2017
@@ -73,7 +73,7 @@ public class XMLSignatureException exten
public XMLSignatureException(Exception originalException, String msgID) {
super(originalException, msgID);
}
-
+
@Deprecated
public XMLSignatureException(String msgID, Exception originalException) {
this(originalException, msgID);
@@ -89,7 +89,7 @@ public class XMLSignatureException exten
public XMLSignatureException(Exception originalException, String msgID, Object exArgs[]) {
super(originalException, msgID, exArgs);
}
-
+
@Deprecated
public XMLSignatureException(String msgID, Object[] exArgs, Exception originalException) {
this(originalException, msgID, exArgs);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java Mon Feb 13 11:09:13 2017
@@ -541,7 +541,7 @@ public class XMLSignatureInput {
/**
* @param filter
*/
- public void addNodeFilter(NodeFilter filter) {
+ public void addNodeFilter(NodeFilter filter) {
if (isOctetStream()) {
try {
convertToNodes();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/ResourceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/ResourceResolver.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/ResourceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/ResourceResolver.java Mon Feb 13 11:09:13 2017
@@ -33,6 +33,6 @@ public interface ResourceResolver {
boolean isSameDocumentReference();
boolean matches(XMLSecStartElement xmlSecStartElement);
-
+
InputStream getInputStreamFromExternalReference() throws XMLSecurityException;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConfigurationException.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConfigurationException.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConfigurationException.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConfigurationException.java Mon Feb 13 11:09:13 2017
@@ -48,7 +48,7 @@ public class XMLSecurityConfigurationExc
public XMLSecurityConfigurationException(Exception originalException, String msgID) {
super(originalException, msgID);
}
-
+
@Deprecated
public XMLSecurityConfigurationException(String msgID, Exception originalException) {
this(originalException, msgID);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.java?rev=1782742&r1=1782741&r2=1782742&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.java Mon Feb 13 11:09:13 2017
@@ -77,7 +77,7 @@ public class XMLSecurityProperties {
private boolean signatureGenerateIds = true;
private boolean signatureIncludeDigestTransform = true;
-
+
public XMLSecurityProperties() {
}
@@ -143,10 +143,10 @@ public class XMLSecurityProperties {
this.signaturePosition = signaturePosition;
}
- /**
+ /**
* Return the qualified name of the ID attribute used to sign the document.
* By default, ID is used.
- *
+ *
* @return the qualified name of the ID attribute
*/
public QName getIdAttributeNS() {