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 13:22:39 UTC
svn commit: r1782767 [1/4] - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/jcp/xml/dsig/internal/
main/java/org/apache/jcp/xml/dsig/internal/dom/
main/java/org/apache/xml/security/
main/java/org/apache/xml/security/algorithms/ main/ja...
Author: coheigea
Date: Mon Feb 13 13:22:37 2017
New Revision: 1782767
URL: http://svn.apache.org/viewvc?rev=1782767&view=rev
Log:
Renaming log to LOG
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/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/DOMXMLSignature.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/algorithms/JCEMapper.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/IntegrityHmac.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.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/algorithms/implementations/SignatureECDSA.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/encryption/Transforms.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/XMLCipherInput.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherUtil.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/content/X509Data.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/DEREncodedKeyValueResolver.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/KeyInfoReferenceResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.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/SecretKeyResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.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/X509DigestResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509IssuerSerialResolver.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/StorageResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.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/XMLSignature.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/XIncludeHandler.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractInputSecurityHeaderHandler.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/InputProcessorChainImpl.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/OutputProcessorChainImpl.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/input/LogInputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/Transforms.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/TransformXSLT.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.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/IgnoreAllErrorHandler.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/SignerOutputStream.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/XalanXPathAPI.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/ResourceResolverSpi.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Driver.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/helper/C14nHelperTest.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/Canonicalizer20010315ExclusiveTest.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/ExclusiveC14NInteropTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/EncryptContentTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/ReferenceListTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/IBMTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/InteropTestBase.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/resource/TestVectorResolver.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRefCountTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/HMACOutputLengthTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/PreCalculatedDigestSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XMLSignatureInputTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XmlSecTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformBase64DecodeTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResourceResolverTest.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java Mon Feb 13 13:22:37 2017
@@ -42,7 +42,7 @@ import org.apache.xml.security.utils.Uns
* @author Sean Mullan
*/
public class DigesterOutputStream extends OutputStream {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(DigesterOutputStream.class);
private final boolean buffer;
@@ -85,12 +85,12 @@ public class DigesterOutputStream extend
bos.write(input, offset, len);
}
if (log.isDebugEnabled()) {
- log.debug("Pre-digested input:");
+ LOG.debug("Pre-digested input:");
StringBuilder sb = new StringBuilder(len);
for (int i = offset; i < (offset + len); i++) {
sb.append((char)input[i]);
}
- log.debug(sb.toString());
+ LOG.debug(sb.toString());
}
md.update(input, offset, len);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java Mon Feb 13 13:22:37 2017
@@ -51,7 +51,7 @@ public abstract class ApacheCanonicalize
org.apache.xml.security.Init.init();
}
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ApacheCanonicalizer.class);
protected Canonicalizer apacheCanonicalizer;
private Transform apacheTransform;
@@ -118,7 +118,7 @@ public abstract class ApacheCanonicalize
boolean secVal = Utils.secureValidation(xc);
apacheCanonicalizer.setSecureValidation(secVal);
if (log.isDebugEnabled()) {
- log.debug("Created canonicalizer for algorithm: " + getAlgorithm());
+ LOG.debug("Created canonicalizer for algorithm: " + getAlgorithm());
}
} catch (InvalidCanonicalizerException ice) {
throw new TransformException
@@ -173,7 +173,7 @@ public abstract class ApacheCanonicalize
Set<Node> ns = Utils.toNodeSet(nsd.iterator());
nodeSet = ns;
if (log.isDebugEnabled()) {
- log.debug("Canonicalizing " + nodeSet.size() + " nodes");
+ LOG.debug("Canonicalizing " + nodeSet.size() + " nodes");
}
} else {
return new OctetStreamData(new ByteArrayInputStream(
@@ -216,7 +216,7 @@ public abstract class ApacheCanonicalize
boolean secVal = Utils.secureValidation(xc);
apacheTransform.setSecureValidation(secVal);
if (log.isDebugEnabled()) {
- log.debug("Created transform for algorithm: " + getAlgorithm());
+ LOG.debug("Created transform for algorithm: " + getAlgorithm());
}
} catch (Exception ex) {
throw new TransformException
@@ -227,12 +227,12 @@ public abstract class ApacheCanonicalize
XMLSignatureInput in;
if (data instanceof ApacheData) {
if (log.isDebugEnabled()) {
- log.debug("ApacheData = true");
+ LOG.debug("ApacheData = true");
}
in = ((ApacheData)data).getXMLSignatureInput();
} else if (data instanceof NodeSetData) {
if (log.isDebugEnabled()) {
- log.debug("isNodeSet() = true");
+ LOG.debug("isNodeSet() = true");
}
if (data instanceof DOMSubTreeData) {
DOMSubTreeData subTree = (DOMSubTreeData)data;
@@ -246,7 +246,7 @@ public abstract class ApacheCanonicalize
}
} else {
if (log.isDebugEnabled()) {
- log.debug("isNodeSet() = false");
+ LOG.debug("isNodeSet() = false");
}
try {
in = new XMLSignatureInput
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java Mon Feb 13 13:22:37 2017
@@ -54,7 +54,7 @@ public abstract class ApacheTransform ex
org.apache.xml.security.Init.init();
}
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(ApacheTransform.class);
private Transform apacheTransform;
protected Document ownerDoc;
@@ -142,7 +142,7 @@ public abstract class ApacheTransform ex
boolean secVal = Utils.secureValidation(xc);
apacheTransform.setSecureValidation(secVal);
if (log.isDebugEnabled()) {
- log.debug("Created transform for algorithm: " +
+ LOG.debug("Created transform for algorithm: " +
getAlgorithm());
}
} catch (Exception ex) {
@@ -163,16 +163,16 @@ public abstract class ApacheTransform ex
XMLSignatureInput in;
if (data instanceof ApacheData) {
if (log.isDebugEnabled()) {
- log.debug("ApacheData = true");
+ LOG.debug("ApacheData = true");
}
in = ((ApacheData)data).getXMLSignatureInput();
} else if (data instanceof NodeSetData) {
if (log.isDebugEnabled()) {
- log.debug("isNodeSet() = true");
+ LOG.debug("isNodeSet() = true");
}
if (data instanceof DOMSubTreeData) {
if (log.isDebugEnabled()) {
- log.debug("DOMSubTreeData = true");
+ LOG.debug("DOMSubTreeData = true");
}
DOMSubTreeData subTree = (DOMSubTreeData)data;
in = new XMLSignatureInput(subTree.getRoot());
@@ -185,7 +185,7 @@ public abstract class ApacheTransform ex
}
} else {
if (log.isDebugEnabled()) {
- log.debug("isNodeSet() = false");
+ LOG.debug("isNodeSet() = false");
}
try {
in = new XMLSignatureInput
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java Mon Feb 13 13:22:37 2017
@@ -49,7 +49,7 @@ import org.apache.jcp.xml.dsig.internal.
*/
public abstract class DOMHMACSignatureMethod extends AbstractDOMSignatureMethod {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(DOMHMACSignatureMethod.class);
// see RFC 4051 for these algorithm definitions
@@ -111,7 +111,7 @@ public abstract class DOMHMACSignatureMe
outputLength = ((HMACParameterSpec)params).getOutputLength();
outputLengthSet = true;
if (log.isDebugEnabled()) {
- log.debug("Setting outputLength from HMACParameterSpec to: " + outputLength);
+ LOG.debug("Setting outputLength from HMACParameterSpec to: " + outputLength);
}
}
}
@@ -128,7 +128,7 @@ public abstract class DOMHMACSignatureMe
outputLength = Integer.parseInt(textOfNode(paramsElem));
outputLengthSet = true;
if (log.isDebugEnabled()) {
- log.debug("unmarshalled outputLength: " + outputLength);
+ LOG.debug("unmarshalled outputLength: " + outputLength);
}
return new HMACParameterSpec(outputLength);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java Mon Feb 13 13:22:37 2017
@@ -127,7 +127,7 @@ public abstract class DOMKeyValue<K exte
try {
return kf.generatePublic(keyspec);
} catch (InvalidKeySpecException e) {
- //@@@ should dump exception to log
+ //@@@ should dump exception to LOG
return null;
}
}
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=1782767&r1=1782766&r2=1782767&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 13:22:37 2017
@@ -82,7 +82,7 @@ public final class DOMReference extends
}
});
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(DOMReference.class);
private final DigestMethod digestMethod;
@@ -307,7 +307,7 @@ public final class DOMReference extends
throws MarshalException
{
if (log.isDebugEnabled()) {
- log.debug("Marshalling Reference");
+ LOG.debug("Marshalling Reference");
}
xwriter.writeStartElement(dsPrefix, "Reference", XMLSignature.XMLNS);
XMLStructure refStruct = xwriter.getCurrentNodeAsStructure();
@@ -332,7 +332,7 @@ public final class DOMReference extends
// create and append DigestValue element
if (log.isDebugEnabled()) {
- log.debug("Adding digestValueElem");
+ LOG.debug("Adding digestValueElem");
}
xwriter.writeStartElement(dsPrefix, "DigestValue", XMLSignature.XMLNS);
if (digestValue != null) {
@@ -356,7 +356,7 @@ public final class DOMReference extends
// insert digestValue into DigestValue element
String encodedDV = Base64.getMimeEncoder().encodeToString(digestValue);
if (log.isDebugEnabled()) {
- log.debug("Reference object uri = " + uri);
+ LOG.debug("Reference object uri = " + uri);
}
Element digestElem = DOMUtils.getLastChildElement(refElem);
if (digestElem == null) {
@@ -368,7 +368,7 @@ public final class DOMReference extends
digested = true;
if (log.isDebugEnabled()) {
- log.debug("Reference digesting completed");
+ LOG.debug("Reference digesting completed");
}
}
@@ -386,8 +386,8 @@ public final class DOMReference extends
calcDigestValue = transform(data, validateContext);
if (log.isDebugEnabled()) {
- log.debug("Expected digest: " + Base64.getMimeEncoder().encodeToString(digestValue));
- log.debug("Actual digest: " + Base64.getMimeEncoder().encodeToString(calcDigestValue));
+ LOG.debug("Expected digest: " + Base64.getMimeEncoder().encodeToString(digestValue));
+ LOG.debug("Actual digest: " + Base64.getMimeEncoder().encodeToString(calcDigestValue));
}
validationStatus = Arrays.equals(digestValue, calcDigestValue);
@@ -418,8 +418,8 @@ public final class DOMReference extends
try {
data = deref.dereference(this, context);
if (log.isDebugEnabled()) {
- log.debug("URIDereferencer class name: " + deref.getClass().getName());
- log.debug("Data class name: " + data.getClass().getName());
+ LOG.debug("URIDereferencer class name: " + deref.getClass().getName());
+ LOG.debug("Data class name: " + data.getClass().getName());
}
} catch (URIReferenceException ure) {
throw new XMLSignatureException(ure);
@@ -631,8 +631,8 @@ public final class DOMReference extends
public Iterator<Node> iterator() { return s.iterator(); }
};
} catch (Exception e) {
- // log a warning
- log.warn("cannot cache dereferenced data: " + e);
+ // LOG a warning
+ LOG.warn("cannot cache dereferenced data: " + e);
return null;
}
} else if (xsi.isElement()) {
@@ -644,8 +644,8 @@ public final class DOMReference extends
(xsi.getOctetStream(), xsi.getSourceURI(),
xsi.getMIMEType());
} catch (IOException ioe) {
- // log a warning
- log.warn("cannot cache dereferenced data: " + ioe);
+ // LOG a warning
+ LOG.warn("cannot cache dereferenced data: " + ioe);
return null;
}
}
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=1782767&r1=1782766&r2=1782767&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 13:22:37 2017
@@ -45,7 +45,7 @@ import org.apache.jcp.xml.dsig.internal.
*/
public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(DOMSignatureMethod.class);
private SignatureMethodParameterSpec params;
@@ -219,10 +219,10 @@ public abstract class DOMSignatureMethod
}
signature.initVerify((PublicKey)key);
if (log.isDebugEnabled()) {
- log.debug("Signature provider:" + signature.getProvider());
- log.debug("Verifying with key: " + key);
- log.debug("JCA Algorithm: " + getJCAAlgorithm());
- log.debug("Signature Bytes length: " + sig.length);
+ LOG.debug("Signature provider:" + signature.getProvider());
+ LOG.debug("Verifying with key: " + key);
+ LOG.debug("JCA Algorithm: " + getJCAAlgorithm());
+ LOG.debug("Signature Bytes length: " + sig.length);
}
try (SignerOutputStream outputStream = new SignerOutputStream(signature)) {
@@ -267,9 +267,9 @@ public abstract class DOMSignatureMethod
}
signature.initSign((PrivateKey)key);
if (log.isDebugEnabled()) {
- log.debug("Signature provider:" + signature.getProvider());
- log.debug("Signing with key: " + key);
- log.debug("JCA Algorithm: " + getJCAAlgorithm());
+ LOG.debug("Signature provider:" + signature.getProvider());
+ LOG.debug("Signing with key: " + key);
+ LOG.debug("JCA Algorithm: " + getJCAAlgorithm());
}
try (SignerOutputStream outputStream = new SignerOutputStream(signature)) {
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=1782767&r1=1782766&r2=1782767&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 13:22:37 2017
@@ -51,7 +51,7 @@ public final class DOMSignedInfo extends
*/
public static final int MAXIMUM_REFERENCE_COUNT = 30;
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(DOMSignedInfo.class);
/** Signature - NOT Recommended RSAwithMD5 */
@@ -225,15 +225,15 @@ public final class DOMSignedInfo extends
byte[] signedInfoBytes = bos.toByteArray();
- // this whole block should only be done if logging is enabled
+ // this whole block should only be done if LOGging is enabled
if (log.isDebugEnabled()) {
- log.debug("Canonicalized SignedInfo:");
+ LOG.debug("Canonicalized SignedInfo:");
StringBuilder sb = new StringBuilder(signedInfoBytes.length);
for (int i = 0; i < signedInfoBytes.length; i++) {
sb.append((char)signedInfoBytes[i]);
}
- log.debug(sb.toString());
- log.debug("Data to be signed/verified:" + Base64.getMimeEncoder().encodeToString(signedInfoBytes));
+ LOG.debug(sb.toString());
+ LOG.debug("Data to be signed/verified:" + Base64.getMimeEncoder().encodeToString(signedInfoBytes));
}
this.canonData = new ByteArrayInputStream(signedInfoBytes);
@@ -243,7 +243,7 @@ public final class DOMSignedInfo extends
throw new XMLSignatureException(te);
} catch (IOException e) {
if (log.isDebugEnabled()) {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
}
// Impossible
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -61,7 +61,7 @@ import org.apache.xml.security.utils.XML
public final class DOMXMLSignature extends DOMStructure
implements XMLSignature {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(DOMXMLSignature.class);
private String id;
private SignatureValue sv;
@@ -266,13 +266,13 @@ public final class DOMXMLSignature exten
Reference ref = refs.get(i);
boolean refValid = ref.validate(vc);
if (log.isDebugEnabled()) {
- log.debug("Reference[" + ref.getURI() + "] is valid: " + refValid);
+ LOG.debug("Reference[" + ref.getURI() + "] is valid: " + refValid);
}
validateRefs &= refValid;
}
if (!validateRefs) {
if (log.isDebugEnabled()) {
- log.debug("Couldn't validate the References");
+ LOG.debug("Couldn't validate the References");
}
validationStatus = false;
validated = true;
@@ -292,7 +292,7 @@ public final class DOMXMLSignature exten
XMLStructure xs = content.get(j);
if (xs instanceof Manifest) {
if (log.isDebugEnabled()) {
- log.debug("validating manifest");
+ LOG.debug("validating manifest");
}
Manifest man = (Manifest)xs;
List<Reference> manRefs = DOMManifest.getManifestReferences(man);
@@ -301,7 +301,7 @@ public final class DOMXMLSignature exten
Reference ref = manRefs.get(k);
boolean refValid = ref.validate(vc);
if (log.isDebugEnabled()) {
- log.debug(
+ LOG.debug(
"Manifest ref[" + ref.getURI() + "] is valid: " + refValid
);
}
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=1782767&r1=1782766&r2=1782767&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 Mon Feb 13 13:22:37 2017
@@ -55,7 +55,7 @@ public class Init {
/** The namespace for CONF file **/
public static final String CONF_NS = "http://www.xmlsecurity.org/NS/#configuration";
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(Init.class);
/** Field alreadyInitialized */
@@ -111,7 +111,7 @@ public class Init {
I18n.init("en", "US");
if (log.isDebugEnabled()) {
- log.debug("Registering default algorithms");
+ LOG.debug("Registering default algorithms");
}
try {
AccessController.doPrivileged(new PrivilegedExceptionAction<Void>(){
@@ -156,7 +156,7 @@ public class Init {
});
} catch (PrivilegedActionException ex) {
XMLSecurityException xse = (XMLSecurityException)ex.getException();
- log.error(xse.getMessage(), xse);
+ LOG.error(xse.getMessage(), xse);
}
}
@@ -181,7 +181,7 @@ public class Init {
}
}
if (config == null) {
- log.error("Error in reading configuration file - Configuration element not found");
+ LOG.error("Error in reading configuration file - Configuration element not found");
return;
}
for (Node el = config.getFirstChild(); el != null; el = el.getNextSibling()) {
@@ -212,11 +212,11 @@ public class Init {
try {
Canonicalizer.register(uri, javaClass);
if (log.isDebugEnabled()) {
- log.debug("Canonicalizer.register(" + uri + ", " + javaClass + ")");
+ LOG.debug("Canonicalizer.register(" + uri + ", " + javaClass + ")");
}
} catch (ClassNotFoundException e) {
Object exArgs[] = { uri, javaClass };
- log.error(I18n.translate("algorithm.classDoesNotExist", exArgs));
+ LOG.error(I18n.translate("algorithm.classDoesNotExist", exArgs));
}
}
}
@@ -232,14 +232,14 @@ public class Init {
try {
Transform.register(uri, javaClass);
if (log.isDebugEnabled()) {
- log.debug("Transform.register(" + uri + ", " + javaClass + ")");
+ LOG.debug("Transform.register(" + uri + ", " + javaClass + ")");
}
} catch (ClassNotFoundException e) {
Object exArgs[] = { uri, javaClass };
- log.error(I18n.translate("algorithm.classDoesNotExist", exArgs));
+ LOG.error(I18n.translate("algorithm.classDoesNotExist", exArgs));
} catch (NoClassDefFoundError ex) {
- log.warn("Not able to found dependencies for algorithm, I'll keep working.");
+ LOG.warn("Not able to found dependencies for algorithm, I'll keep working.");
}
}
}
@@ -270,13 +270,13 @@ public class Init {
try {
SignatureAlgorithm.register(uri, javaClass);
if (log.isDebugEnabled()) {
- log.debug("SignatureAlgorithm.register(" + uri + ", "
+ LOG.debug("SignatureAlgorithm.register(" + uri + ", "
+ javaClass + ")");
}
} catch (ClassNotFoundException e) {
Object exArgs[] = { uri, javaClass };
- log.error(I18n.translate("algorithm.classDoesNotExist", exArgs));
+ LOG.error(I18n.translate("algorithm.classDoesNotExist", exArgs));
}
}
}
@@ -293,19 +293,19 @@ public class Init {
if (description != null && description.length() > 0) {
if (log.isDebugEnabled()) {
- log.debug("Register Resolver: " + javaClass + ": "
+ LOG.debug("Register Resolver: " + javaClass + ": "
+ description);
}
} else {
if (log.isDebugEnabled()) {
- log.debug("Register Resolver: " + javaClass
+ LOG.debug("Register Resolver: " + javaClass
+ ": For unknown purposes");
}
}
try {
ResourceResolver.register(javaClass);
} catch (Throwable e) {
- log.warn(
+ LOG.warn(
"Cannot register:" + javaClass
+ " perhaps some needed jars are not installed",
e
@@ -326,12 +326,12 @@ public class Init {
if (description != null && description.length() > 0) {
if (log.isDebugEnabled()) {
- log.debug("Register Resolver: " + javaClass + ": "
+ LOG.debug("Register Resolver: " + javaClass + ": "
+ description);
}
} else {
if (log.isDebugEnabled()) {
- log.debug("Register Resolver: " + javaClass
+ LOG.debug("Register Resolver: " + javaClass
+ ": For unknown purposes");
}
}
@@ -343,7 +343,7 @@ public class Init {
if (tag.equals("PrefixMappings")){
if (log.isDebugEnabled()) {
- log.debug("Now I try to bind prefixes:");
+ LOG.debug("Now I try to bind prefixes:");
}
Element[] nl =
@@ -353,14 +353,14 @@ public class Init {
String namespace = element.getAttributeNS(null, "namespace");
String prefix = element.getAttributeNS(null, "prefix");
if (log.isDebugEnabled()) {
- log.debug("Now I try to bind " + prefix + " to " + namespace);
+ LOG.debug("Now I try to bind " + prefix + " to " + namespace);
}
ElementProxy.setDefaultPrefix(namespace, prefix);
}
}
}
} catch (Exception e) {
- log.error("Bad: ", e);
+ LOG.error("Bad: ", e);
}
}
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=1782767&r1=1782766&r2=1782767&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 13:22:37 2017
@@ -32,7 +32,7 @@ import org.w3c.dom.Element;
*/
public class JCEMapper {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(JCEMapper.class);
private static Map<String, Algorithm> algorithmsMap =
@@ -395,7 +395,7 @@ public class JCEMapper {
*/
private static Algorithm getAlgorithm(String algorithmURI) {
if (log.isDebugEnabled()) {
- log.debug("Request for URI " + algorithmURI);
+ LOG.debug("Request for URI " + algorithmURI);
}
if (algorithmURI != null) {
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=1782767&r1=1782766&r2=1782767&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 13:22:37 2017
@@ -47,7 +47,7 @@ import org.w3c.dom.Element;
*/
public class SignatureAlgorithm extends Algorithm {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SignatureAlgorithm.class);
/** All available algorithm classes are registered here */
@@ -145,7 +145,7 @@ public class SignatureAlgorithm extends
Class<? extends SignatureAlgorithmSpi> implementingClass =
algorithmHash.get(algorithmURI);
if (log.isDebugEnabled()) {
- log.debug("Create URI \"" + algorithmURI + "\" class \""
+ LOG.debug("Create URI \"" + algorithmURI + "\" class \""
+ implementingClass + "\"");
}
return implementingClass.newInstance();
@@ -327,7 +327,7 @@ public class SignatureAlgorithm extends
XMLSignatureException {
JavaUtils.checkRegisterPermission();
if (log.isDebugEnabled()) {
- log.debug("Try to register " + algorithmURI + " " + implementingClass);
+ LOG.debug("Try to register " + algorithmURI + " " + implementingClass);
}
// are we already registered?
@@ -365,7 +365,7 @@ public class SignatureAlgorithm extends
XMLSignatureException {
JavaUtils.checkRegisterPermission();
if (log.isDebugEnabled()) {
- log.debug("Try to register " + algorithmURI + " " + implementingClass);
+ LOG.debug("Try to register " + algorithmURI + " " + implementingClass);
}
// are we already registered?
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java Mon Feb 13 13:22:37 2017
@@ -40,7 +40,7 @@ import org.w3c.dom.Text;
public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(IntegrityHmac.class);
/** Field macAlgorithm */
@@ -70,7 +70,7 @@ public abstract class IntegrityHmac exte
public IntegrityHmac() throws XMLSignatureException {
String algorithmID = JCEMapper.translateURItoJCEID(this.engineGetURI());
if (log.isDebugEnabled()) {
- log.debug("Created IntegrityHmacSHA1 using " + algorithmID);
+ LOG.debug("Created IntegrityHmacSHA1 using " + algorithmID);
}
try {
@@ -112,7 +112,7 @@ public abstract class IntegrityHmac exte
try {
if (this.HMACOutputLengthSet && this.HMACOutputLength < getDigestLength()) {
if (log.isDebugEnabled()) {
- log.debug("HMACOutputLength must not be less than " + getDigestLength());
+ LOG.debug("HMACOutputLength must not be less than " + getDigestLength());
}
Object[] exArgs = { String.valueOf(getDigestLength()) };
throw new XMLSignatureException("algorithms.HMACOutputLengthMin", exArgs);
@@ -155,7 +155,7 @@ public abstract class IntegrityHmac exte
} catch (Exception e) {
// this shouldn't occur, but if it does, restore previous Mac
if (log.isDebugEnabled()) {
- log.debug("Exception when reinstantiating Mac:" + e);
+ LOG.debug("Exception when reinstantiating Mac:" + e);
}
this.macAlgorithm = mac;
}
@@ -174,7 +174,7 @@ public abstract class IntegrityHmac exte
try {
if (this.HMACOutputLengthSet && this.HMACOutputLength < getDigestLength()) {
if (log.isDebugEnabled()) {
- log.debug("HMACOutputLength must not be less than " + getDigestLength());
+ LOG.debug("HMACOutputLength must not be less than " + getDigestLength());
}
Object[] exArgs = { String.valueOf(getDigestLength()) };
throw new XMLSignatureException("algorithms.HMACOutputLengthMin", exArgs);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java Mon Feb 13 13:22:37 2017
@@ -36,7 +36,7 @@ import org.apache.xml.security.signature
public abstract class SignatureBaseRSA extends SignatureAlgorithmSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SignatureBaseRSA.class);
/** @inheritDoc */
@@ -54,7 +54,7 @@ public abstract class SignatureBaseRSA e
String algorithmID = JCEMapper.translateURItoJCEID(this.engineGetURI());
if (log.isDebugEnabled()) {
- log.debug("Created SignatureRSA using " + algorithmID);
+ LOG.debug("Created SignatureRSA using " + algorithmID);
}
String provider = JCEMapper.getProviderId();
try {
@@ -118,7 +118,7 @@ public abstract class SignatureBaseRSA e
// this shouldn't occur, but if it does, restore previous
// Signature
if (log.isDebugEnabled()) {
- log.debug("Exception when reinstantiating Signature:" + e);
+ LOG.debug("Exception when reinstantiating Signature:" + e);
}
this.signatureAlgorithm = sig;
}
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=1782767&r1=1782766&r2=1782767&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 13:22:37 2017
@@ -42,7 +42,7 @@ public class SignatureDSA extends Signat
public static final String URI = Constants.SignatureSpecNS + "dsa-sha1";
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SignatureDSA.class);
/** Field algorithm */
@@ -68,7 +68,7 @@ public class SignatureDSA extends Signat
public SignatureDSA() throws XMLSignatureException {
String algorithmID = JCEMapper.translateURItoJCEID(engineGetURI());
if (log.isDebugEnabled()) {
- log.debug("Created SignatureDSA using " + algorithmID);
+ LOG.debug("Created SignatureDSA using " + algorithmID);
}
String provider = JCEMapper.getProviderId();
@@ -107,7 +107,7 @@ public class SignatureDSA extends Signat
throws XMLSignatureException {
try {
if (log.isDebugEnabled()) {
- log.debug("Called DSA.verify() on " + Base64.getMimeEncoder().encodeToString(signature));
+ LOG.debug("Called DSA.verify() on " + Base64.getMimeEncoder().encodeToString(signature));
}
byte[] jcebytes = JavaUtils.convertDsaXMLDSIGtoASN1(signature,
@@ -148,7 +148,7 @@ public class SignatureDSA extends Signat
// this shouldn't occur, but if it does, restore previous
// Signature
if (log.isDebugEnabled()) {
- log.debug("Exception when reinstantiating Signature:" + e);
+ LOG.debug("Exception when reinstantiating Signature:" + e);
}
this.signatureAlgorithm = sig;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java Mon Feb 13 13:22:37 2017
@@ -43,7 +43,7 @@ import org.apache.xml.security.signature
*/
public abstract class SignatureECDSA extends SignatureAlgorithmSpi {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SignatureECDSA.class);
/** @inheritDoc */
@@ -96,7 +96,7 @@ public abstract class SignatureECDSA ext
String algorithmID = JCEMapper.translateURItoJCEID(this.engineGetURI());
if (log.isDebugEnabled()) {
- log.debug("Created SignatureECDSA using " + algorithmID);
+ LOG.debug("Created SignatureECDSA using " + algorithmID);
}
String provider = JCEMapper.getProviderId();
try {
@@ -132,7 +132,7 @@ public abstract class SignatureECDSA ext
byte[] jcebytes = SignatureECDSA.convertXMLDSIGtoASN1(signature);
if (log.isDebugEnabled()) {
- log.debug("Called ECDSA.verify() on " + Base64.getMimeEncoder().encodeToString(signature));
+ LOG.debug("Called ECDSA.verify() on " + Base64.getMimeEncoder().encodeToString(signature));
}
return this.signatureAlgorithm.verify(jcebytes);
@@ -169,7 +169,7 @@ public abstract class SignatureECDSA ext
// this shouldn't occur, but if it does, restore previous
// Signature
if (log.isDebugEnabled()) {
- log.debug("Exception when reinstantiating Signature:" + e);
+ LOG.debug("Exception when reinstantiating Signature:" + e);
}
this.signatureAlgorithm = sig;
}
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=1782767&r1=1782766&r2=1782767&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 13:22:37 2017
@@ -56,7 +56,7 @@ public abstract class Canonicalizer11 ex
private static final String XMLNS_URI = Constants.NamespaceSpecNS;
private static final String XML_LANG_URI = Constants.XML_LANG_SPACE_SpecNS;
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(Canonicalizer11.class);
private final SortedSet<Attr> result = new TreeSet<Attr>(COMPARE);
@@ -166,7 +166,7 @@ public abstract class Canonicalizer11 ex
base = joinURI(n.getValue(), base);
} catch (URISyntaxException ue) {
if (log.isDebugEnabled()) {
- log.debug(ue.getMessage(), ue);
+ LOG.debug(ue.getMessage(), ue);
}
}
}
@@ -531,7 +531,7 @@ public abstract class Canonicalizer11 ex
private static String removeDotSegments(String path) {
if (log.isDebugEnabled()) {
- log.debug("STEP OUTPUT BUFFER\t\tINPUT BUFFER");
+ LOG.debug("STEP OUTPUT BUFFER\t\tINPUT BUFFER");
}
// 1. The input buffer is initialized with the now-appended path
@@ -686,11 +686,11 @@ public abstract class Canonicalizer11 ex
private static void printStep(String step, String output, String input) {
if (log.isDebugEnabled()) {
- log.debug(" " + step + ": " + output);
+ LOG.debug(" " + step + ": " + output);
if (output.length() == 0) {
- log.debug("\t\t\t\t" + input);
+ LOG.debug("\t\t\t\t" + input);
} else {
- log.debug("\t\t\t" + input);
+ LOG.debug("\t\t\t" + input);
}
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/Transforms.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/Transforms.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/Transforms.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/Transforms.java Mon Feb 13 13:22:37 2017
@@ -36,7 +36,7 @@ package org.apache.xml.security.encrypti
public interface Transforms {
/**
* Temporary method to turn the XMLEncryption Transforms class
- * into a DS class. The main logic is currently implemented in the
+ * into a DS class. The main LOGic is currently implemented in the
* DS class, so we need to get to get the base class.
* <p>
* <b>Note</b> This will be removed in future versions
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=1782767&r1=1782766&r2=1782767&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 13:22:37 2017
@@ -81,7 +81,7 @@ import org.w3c.dom.NodeList;
*/
public class XMLCipher {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(XMLCipher.class);
/** Triple DES EDE (192 bit key) in CBC mode */
@@ -324,7 +324,7 @@ public class XMLCipher {
String digestMethod
) throws XMLEncryptionException {
if (log.isDebugEnabled()) {
- log.debug("Constructing XMLCipher...");
+ LOG.debug("Constructing XMLCipher...");
}
factory = new Factory();
@@ -406,7 +406,7 @@ public class XMLCipher {
throw new NullPointerException("Transformation unexpectedly null...");
}
if (!isValidEncryptionAlgorithm(transformation)) {
- log.warn("Algorithm non-standard, expected one of " + ENC_ALGORITHMS);
+ LOG.warn("Algorithm non-standard, expected one of " + ENC_ALGORITHMS);
}
}
@@ -440,7 +440,7 @@ public class XMLCipher {
*/
public static XMLCipher getInstance(String transformation) throws XMLEncryptionException {
if (log.isDebugEnabled()) {
- log.debug("Getting XMLCipher with transformation");
+ LOG.debug("Getting XMLCipher with transformation");
}
validateTransformation(transformation);
return new XMLCipher(transformation, null, null, null);
@@ -462,7 +462,7 @@ public class XMLCipher {
public static XMLCipher getInstance(String transformation, String canon)
throws XMLEncryptionException {
if (log.isDebugEnabled()) {
- log.debug("Getting XMLCipher with transformation and c14n algorithm");
+ LOG.debug("Getting XMLCipher with transformation and c14n algorithm");
}
validateTransformation(transformation);
return new XMLCipher(transformation, null, canon, null);
@@ -485,7 +485,7 @@ public class XMLCipher {
public static XMLCipher getInstance(String transformation, String canon, String digestMethod)
throws XMLEncryptionException {
if (log.isDebugEnabled()) {
- log.debug("Getting XMLCipher with transformation and c14n algorithm");
+ LOG.debug("Getting XMLCipher with transformation and c14n algorithm");
}
validateTransformation(transformation);
return new XMLCipher(transformation, null, canon, digestMethod);
@@ -503,7 +503,7 @@ public class XMLCipher {
public static XMLCipher getProviderInstance(String transformation, String provider)
throws XMLEncryptionException {
if (log.isDebugEnabled()) {
- log.debug("Getting XMLCipher with transformation and provider");
+ LOG.debug("Getting XMLCipher with transformation and provider");
}
if (null == provider) {
throw new NullPointerException("Provider unexpectedly null..");
@@ -530,7 +530,7 @@ public class XMLCipher {
String transformation, String provider, String canon
) throws XMLEncryptionException {
if (log.isDebugEnabled()) {
- log.debug("Getting XMLCipher with transformation, provider and c14n algorithm");
+ LOG.debug("Getting XMLCipher with transformation, provider and c14n algorithm");
}
if (null == provider) {
throw new NullPointerException("Provider unexpectedly null..");
@@ -558,7 +558,7 @@ public class XMLCipher {
String transformation, String provider, String canon, String digestMethod
) throws XMLEncryptionException {
if (log.isDebugEnabled()) {
- log.debug("Getting XMLCipher with transformation, provider and c14n algorithm");
+ LOG.debug("Getting XMLCipher with transformation, provider and c14n algorithm");
}
if (null == provider) {
throw new NullPointerException("Provider unexpectedly null..");
@@ -578,7 +578,7 @@ public class XMLCipher {
*/
public static XMLCipher getInstance() throws XMLEncryptionException {
if (log.isDebugEnabled()) {
- log.debug("Getting XMLCipher with no arguments");
+ LOG.debug("Getting XMLCipher with no arguments");
}
return new XMLCipher(null, null, null, null);
}
@@ -598,7 +598,7 @@ public class XMLCipher {
*/
public static XMLCipher getProviderInstance(String provider) throws XMLEncryptionException {
if (log.isDebugEnabled()) {
- log.debug("Getting XMLCipher with provider");
+ LOG.debug("Getting XMLCipher with provider");
}
return new XMLCipher(null, provider, null, null);
}
@@ -626,7 +626,7 @@ public class XMLCipher {
public void init(int opmode, Key key) throws XMLEncryptionException {
// sanity checks
if (log.isDebugEnabled()) {
- log.debug("Initializing XMLCipher...");
+ LOG.debug("Initializing XMLCipher...");
}
ek = null;
@@ -636,28 +636,28 @@ public class XMLCipher {
case ENCRYPT_MODE :
if (log.isDebugEnabled()) {
- log.debug("opmode = ENCRYPT_MODE");
+ LOG.debug("opmode = ENCRYPT_MODE");
}
ed = createEncryptedData(CipherData.VALUE_TYPE, "NO VALUE YET");
break;
case DECRYPT_MODE :
if (log.isDebugEnabled()) {
- log.debug("opmode = DECRYPT_MODE");
+ LOG.debug("opmode = DECRYPT_MODE");
}
break;
case WRAP_MODE :
if (log.isDebugEnabled()) {
- log.debug("opmode = WRAP_MODE");
+ LOG.debug("opmode = WRAP_MODE");
}
ek = createEncryptedKey(CipherData.VALUE_TYPE, "NO VALUE YET");
break;
case UNWRAP_MODE :
if (log.isDebugEnabled()) {
- log.debug("opmode = UNWRAP_MODE");
+ LOG.debug("opmode = UNWRAP_MODE");
}
break;
default :
- log.error("Mode unexpectedly invalid");
+ LOG.error("Mode unexpectedly invalid");
throw new XMLEncryptionException("Invalid mode in init");
}
@@ -698,7 +698,7 @@ public class XMLCipher {
public EncryptedData getEncryptedData() {
// Sanity checks
if (log.isDebugEnabled()) {
- log.debug("Returning EncryptedData");
+ LOG.debug("Returning EncryptedData");
}
return ed;
}
@@ -715,7 +715,7 @@ public class XMLCipher {
public EncryptedKey getEncryptedKey() {
// Sanity checks
if (log.isDebugEnabled()) {
- log.debug("Returning EncryptedKey");
+ LOG.debug("Returning EncryptedKey");
}
return ek;
}
@@ -849,7 +849,7 @@ public class XMLCipher {
*/
private Document encryptElement(Element element) throws Exception{
if (log.isDebugEnabled()) {
- log.debug("Encrypting element...");
+ LOG.debug("Encrypting element...");
}
if (null == element) {
throw new XMLEncryptionException("empty", "Element unexpectedly null...");
@@ -887,7 +887,7 @@ public class XMLCipher {
*/
private Document encryptElementContent(Element element) throws /* XMLEncryption */Exception {
if (log.isDebugEnabled()) {
- log.debug("Encrypting element content...");
+ LOG.debug("Encrypting element content...");
}
if (null == element) {
throw new XMLEncryptionException("empty", "Element unexpectedly null...");
@@ -920,7 +920,7 @@ public class XMLCipher {
*/
public Document doFinal(Document context, Document source) throws /* XMLEncryption */Exception {
if (log.isDebugEnabled()) {
- log.debug("Processing source document...");
+ LOG.debug("Processing source document...");
}
if (null == context) {
throw new XMLEncryptionException("empty", "Context document unexpectedly null...");
@@ -961,7 +961,7 @@ public class XMLCipher {
*/
public Document doFinal(Document context, Element element) throws /* XMLEncryption */Exception {
if (log.isDebugEnabled()) {
- log.debug("Processing source element...");
+ LOG.debug("Processing source element...");
}
if (null == context) {
throw new XMLEncryptionException("empty", "Context document unexpectedly null...");
@@ -1006,7 +1006,7 @@ public class XMLCipher {
public Document doFinal(Document context, Element element, boolean content)
throws /* XMLEncryption*/ Exception {
if (log.isDebugEnabled()) {
- log.debug("Processing source element...");
+ LOG.debug("Processing source element...");
}
if (null == context) {
throw new XMLEncryptionException("empty", "Context document unexpectedly null...");
@@ -1080,7 +1080,7 @@ public class XMLCipher {
Document context, String type, InputStream serializedData
) throws Exception {
if (log.isDebugEnabled()) {
- log.debug("Encrypting element...");
+ LOG.debug("Encrypting element...");
}
if (null == context) {
throw new XMLEncryptionException("empty", "Context document unexpectedly null...");
@@ -1113,7 +1113,7 @@ public class XMLCipher {
Document context, Element element, boolean contentMode
) throws /* XMLEncryption */ Exception {
if (log.isDebugEnabled()) {
- log.debug("Encrypting element...");
+ LOG.debug("Encrypting element...");
}
if (null == context) {
throw new XMLEncryptionException("empty", "Context document unexpectedly null...");
@@ -1160,7 +1160,7 @@ public class XMLCipher {
serializedOctets = serializer.serializeToByteArray(element);
}
if (log.isDebugEnabled()) {
- log.debug("Serialized octets:\n" + new String(serializedOctets, "UTF-8"));
+ LOG.debug("Serialized octets:\n" + new String(serializedOctets, "UTF-8"));
}
}
@@ -1199,12 +1199,12 @@ public class XMLCipher {
} else {
encryptedBytes = c.doFinal(serializedOctets);
if (log.isDebugEnabled()) {
- log.debug("Expected cipher.outputSize = " +
+ LOG.debug("Expected cipher.outputSize = " +
Integer.toString(c.getOutputSize(serializedOctets.length)));
}
}
if (log.isDebugEnabled()) {
- log.debug("Actual cipher.outputSize = "
+ LOG.debug("Actual cipher.outputSize = "
+ Integer.toString(encryptedBytes.length));
}
} catch (IllegalStateException ise) {
@@ -1229,8 +1229,8 @@ public class XMLCipher {
String base64EncodedEncryptedOctets = Base64.getMimeEncoder().encodeToString(finalEncryptedBytes);
if (log.isDebugEnabled()) {
- log.debug("Encrypted octets:\n" + base64EncodedEncryptedOctets);
- log.debug("Encrypted octets length = " + base64EncodedEncryptedOctets.length());
+ LOG.debug("Encrypted octets:\n" + base64EncodedEncryptedOctets);
+ LOG.debug("Encrypted octets length = " + base64EncodedEncryptedOctets.length());
}
try {
@@ -1277,7 +1277,7 @@ public class XMLCipher {
public EncryptedData loadEncryptedData(Document context, Element element)
throws XMLEncryptionException {
if (log.isDebugEnabled()) {
- log.debug("Loading encrypted element...");
+ LOG.debug("Loading encrypted element...");
}
if (null == context) {
throw new XMLEncryptionException("empty", "Context document unexpectedly null...");
@@ -1308,7 +1308,7 @@ public class XMLCipher {
public EncryptedKey loadEncryptedKey(Document context, Element element)
throws XMLEncryptionException {
if (log.isDebugEnabled()) {
- log.debug("Loading encrypted key...");
+ LOG.debug("Loading encrypted key...");
}
if (null == context) {
throw new XMLEncryptionException("empty", "Context document unexpectedly null...");
@@ -1373,7 +1373,7 @@ public class XMLCipher {
byte[] oaepParams
) throws XMLEncryptionException {
if (log.isDebugEnabled()) {
- log.debug("Encrypting key ...");
+ LOG.debug("Encrypting key ...");
}
if (null == key) {
@@ -1422,8 +1422,8 @@ public class XMLCipher {
String base64EncodedEncryptedOctets = Base64.getMimeEncoder().encodeToString(encryptedBytes);
if (log.isDebugEnabled()) {
- log.debug("Encrypted key octets:\n" + base64EncodedEncryptedOctets);
- log.debug("Encrypted key octets length = " + base64EncodedEncryptedOctets.length());
+ LOG.debug("Encrypted key octets:\n" + base64EncodedEncryptedOctets);
+ LOG.debug("Encrypted key octets length = " + base64EncodedEncryptedOctets.length());
}
CipherValue cv = ek.getCipherData().getCipherValue();
@@ -1453,7 +1453,7 @@ public class XMLCipher {
public Key decryptKey(EncryptedKey encryptedKey, String algorithm)
throws XMLEncryptionException {
if (log.isDebugEnabled()) {
- log.debug("Decrypting key from previously loaded EncryptedKey...");
+ LOG.debug("Decrypting key from previously loaded EncryptedKey...");
}
if (cipherMode != UNWRAP_MODE) {
@@ -1466,7 +1466,7 @@ public class XMLCipher {
if (key == null) {
if (log.isDebugEnabled()) {
- log.debug("Trying to find a KEK via key resolvers");
+ LOG.debug("Trying to find a KEK via key resolvers");
}
KeyInfo ki = encryptedKey.getKeyInfo();
@@ -1483,12 +1483,12 @@ public class XMLCipher {
}
catch (Exception e) {
if (log.isDebugEnabled()) {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
}
}
}
if (key == null) {
- log.error("XMLCipher::decryptKey called without a KEK and cannot resolve");
+ LOG.error("XMLCipher::decryptKey called without a KEK and cannot resolve");
throw new XMLEncryptionException("empty", "Unable to decrypt without a KEK");
}
}
@@ -1500,7 +1500,7 @@ public class XMLCipher {
String jceKeyAlgorithm = JCEMapper.getJCEKeyAlgorithmFromURI(algorithm);
if (log.isDebugEnabled()) {
- log.debug("JCE Key Algorithm: " + jceKeyAlgorithm);
+ LOG.debug("JCE Key Algorithm: " + jceKeyAlgorithm);
}
Cipher c;
@@ -1538,7 +1538,7 @@ public class XMLCipher {
throw new XMLEncryptionException(e);
}
if (log.isDebugEnabled()) {
- log.debug("Decryption of key type " + algorithm + " OK");
+ LOG.debug("Decryption of key type " + algorithm + " OK");
}
return ret;
@@ -1588,7 +1588,7 @@ public class XMLCipher {
private Cipher constructCipher(String algorithm, String digestAlgorithm) throws XMLEncryptionException {
String jceAlgorithm = JCEMapper.translateURItoJCEID(algorithm);
if (log.isDebugEnabled()) {
- log.debug("JCE Algorithm = " + jceAlgorithm);
+ LOG.debug("JCE Algorithm = " + jceAlgorithm);
}
Cipher c;
@@ -1697,7 +1697,7 @@ public class XMLCipher {
*/
private Document decryptElement(Element element) throws XMLEncryptionException {
if (log.isDebugEnabled()) {
- log.debug("Decrypting element...");
+ LOG.debug("Decrypting element...");
}
if (serializer instanceof AbstractSerializer) {
((AbstractSerializer)serializer).setSecureValidation(secureValidation);
@@ -1714,7 +1714,7 @@ public class XMLCipher {
byte[] octets = decryptToByteArray(element);
if (log.isDebugEnabled()) {
- log.debug("Decrypted octets:\n" + new String(octets));
+ LOG.debug("Decrypted octets:\n" + new String(octets));
}
Node sourceParent = element.getParentNode();
@@ -1769,7 +1769,7 @@ public class XMLCipher {
*/
public byte[] decryptToByteArray(Element element) throws XMLEncryptionException {
if (log.isDebugEnabled()) {
- log.debug("Decrypting to ByteArray...");
+ LOG.debug("Decrypting to ByteArray...");
}
if (cipherMode != DECRYPT_MODE) {
@@ -1796,13 +1796,13 @@ public class XMLCipher {
key = ki.getSecretKey();
} catch (KeyResolverException kre) {
if (log.isDebugEnabled()) {
- log.debug(kre.getMessage(), kre);
+ LOG.debug(kre.getMessage(), kre);
}
}
}
if (key == null) {
- log.error(
+ LOG.error(
"XMLCipher::decryptElement called without a key and unable to resolve"
);
throw new XMLEncryptionException("empty", "encryption.nokey");
@@ -1818,7 +1818,7 @@ public class XMLCipher {
String jceAlgorithm =
JCEMapper.translateURItoJCEID(encMethodAlgorithm);
if (log.isDebugEnabled()) {
- log.debug("JCE Algorithm = " + jceAlgorithm);
+ LOG.debug("JCE Algorithm = " + jceAlgorithm);
}
Cipher c;
@@ -2249,7 +2249,7 @@ public class XMLCipher {
if (transformsElement != null) {
if (log.isDebugEnabled()) {
- log.debug("Creating a DSIG based Transforms element");
+ LOG.debug("Creating a DSIG based Transforms element");
}
try {
result.setTransforms(new TransformsImpl(transformsElement));
@@ -3670,12 +3670,12 @@ public class XMLCipher {
domResult.getNode().getFirstChild().getFirstChild().getAttributes().item(1).getNamespaceURI());
}
if (log.isDebugEnabled()) {
- log.debug("Have functional IdentityTransformer: " + result);
+ LOG.debug("Have functional IdentityTransformer: " + result);
}
return result;
} catch (Exception e) {
- log.debug(e.getMessage(), e);
+ LOG.debug(e.getMessage(), e);
return false;
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java Mon Feb 13 13:22:37 2017
@@ -44,7 +44,7 @@ import org.w3c.dom.Attr;
*/
public class XMLCipherInput {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(XMLCipherInput.class);
/** The data we are working with */
@@ -115,7 +115,7 @@ public class XMLCipherInput {
if (cipherData.getDataType() == CipherData.REFERENCE_TYPE) {
// Fun time!
if (log.isDebugEnabled()) {
- log.debug("Found a reference type CipherData");
+ LOG.debug("Found a reference type CipherData");
}
CipherReference cr = cipherData.getCipherReference();
@@ -135,11 +135,11 @@ public class XMLCipherInput {
if (input != null) {
if (log.isDebugEnabled()) {
- log.debug("Managed to resolve URI \"" + cr.getURI() + "\"");
+ LOG.debug("Managed to resolve URI \"" + cr.getURI() + "\"");
}
} else {
if (log.isDebugEnabled()) {
- log.debug("Failed to resolve URI \"" + cr.getURI() + "\"");
+ LOG.debug("Failed to resolve URI \"" + cr.getURI() + "\"");
}
}
@@ -147,7 +147,7 @@ public class XMLCipherInput {
Transforms transforms = cr.getTransforms();
if (transforms != null) {
if (log.isDebugEnabled()) {
- log.debug("Have transforms in cipher reference");
+ LOG.debug("Have transforms in cipher reference");
}
try {
org.apache.xml.security.transforms.Transforms dsTransforms =
@@ -175,7 +175,7 @@ public class XMLCipherInput {
}
if (log.isDebugEnabled()) {
- log.debug("Encrypted octets:\n" + base64EncodedEncryptedOctets);
+ LOG.debug("Encrypted octets:\n" + base64EncodedEncryptedOctets);
}
return Base64.getMimeDecoder().decode(base64EncodedEncryptedOctets);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherUtil.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherUtil.java?rev=1782767&r1=1782766&r2=1782767&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherUtil.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherUtil.java Mon Feb 13 13:22:37 2017
@@ -29,7 +29,7 @@ import org.apache.xml.security.utils.Enc
public final class XMLCipherUtil {
- private static org.slf4j.Logger log =
+ private static org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(XMLCipherUtil.class);
private static final boolean gcmUseIvParameterSpec =
@@ -55,7 +55,7 @@ public final class XMLCipherUtil {
|| EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES256_GCM.equals(algorithm)) {
return constructBlockCipherParametersForGCMAlgorithm(algorithm, iv, callingClass);
} else {
- log.debug("Saw non-AES-GCM mode block cipher, returning IvParameterSpec: {}", algorithm);
+ LOG.debug("Saw non-AES-GCM mode block cipher, returning IvParameterSpec: {}", algorithm);
return new IvParameterSpec(iv);
}
}
@@ -64,7 +64,7 @@ public final class XMLCipherUtil {
if (gcmAlgorithm) {
return constructBlockCipherParametersForGCMAlgorithm("AES/GCM/NoPadding", iv, callingClass);
} else {
- log.debug("Saw non-AES-GCM mode block cipher, returning IvParameterSpec");
+ LOG.debug("Saw non-AES-GCM mode block cipher, returning IvParameterSpec");
return new IvParameterSpec(iv);
}
}
@@ -74,11 +74,11 @@ public final class XMLCipherUtil {
// This override allows to support Java 1.7+ with (usually older versions of) third-party security
// providers which support or even require GCM via IvParameterSpec rather than GCMParameterSpec,
// e.g. BouncyCastle <= 1.49 (really <= 1.50 due to a semi-related bug).
- log.debug("Saw AES-GCM block cipher, using IvParameterSpec due to system property override: {}", algorithm);
+ LOG.debug("Saw AES-GCM block cipher, using IvParameterSpec due to system property override: {}", algorithm);
return new IvParameterSpec(iv);
}
- log.debug("Saw AES-GCM block cipher, attempting to create GCMParameterSpec: {}", algorithm);
+ LOG.debug("Saw AES-GCM block cipher, attempting to create GCMParameterSpec: {}", algorithm);
try {
// This class only added in Java 1.7. So load reflectively until Santuario starts targeting a minimum of Java 1.7.
@@ -87,12 +87,12 @@ public final class XMLCipherUtil {
// XML Encryption 1.1 mandates a 128-bit Authentication Tag for AES GCM modes.
AlgorithmParameterSpec gcmSpec = (AlgorithmParameterSpec) gcmSpecClass.getConstructor(int.class, byte[].class)
.newInstance(128, iv);
- log.debug("Successfully created GCMParameterSpec");
+ LOG.debug("Successfully created GCMParameterSpec");
return gcmSpec;
} catch (Exception e) {
// This handles the case of Java < 1.7 with a third-party security provider that
// supports GCM mode using only an IvParameterSpec, such as BouncyCastle.
- log.debug("Failed to create GCMParameterSpec, falling back to returning IvParameterSpec", e);
+ LOG.debug("Failed to create GCMParameterSpec, falling back to returning IvParameterSpec", e);
return new IvParameterSpec(iv);
}
}