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/08/02 17:37:39 UTC
svn commit: r1803889 [1/4] - in /santuario/xml-security-java/trunk: ./
src/main/java/org/apache/xml/security/c14n/
src/main/java/org/apache/xml/security/encryption/
src/main/java/org/apache/xml/security/signature/
src/main/java/org/apache/xml/security/...
Author: coheigea
Date: Wed Aug 2 17:37:38 2017
New Revision: 1803889
URL: http://svn.apache.org/viewvc?rev=1803889&view=rev
Log:
Revert "Adding modernizer plugin"
This reverts commit a6ea57edbe8a28649394dee23733f85b4b5584c4.
Modified:
santuario/xml-security-java/trunk/pom.xml
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/encryption/AbstractSerializer.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/signature/XMLSignatureInput.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/ext/XMLSecurityUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/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/securityToken/AbstractSecurityToken.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.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/utils/XMLUtils.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/dsig/Baltimore23Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/C14N11Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikSignatureAlgosTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropXMLDSig11Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenReferenceTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ValidateSignatureTest.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/algorithms/HMACSignatureAlgorithmTest.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/Santuario191Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.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/SignedEncryptedTest.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/signature/HMACOutputLengthTest.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/transforms/EmptyNamespaceTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamWriterTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer11Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Santuario191Test.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/SymmetricEncryptionCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.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/PKSignatureCreationTest.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/SignatureCreationReferenceURIResolverTest.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/SignatureDigestCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureEncryptionTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.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/SignatureVerificationTest.java
Modified: santuario/xml-security-java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/pom.xml?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/pom.xml (original)
+++ santuario/xml-security-java/trunk/pom.xml Wed Aug 2 17:37:38 2017
@@ -132,24 +132,8 @@
</goals>
</execution>
</executions>
- </plugin>
- <plugin>
- <groupId>org.gaul</groupId>
- <artifactId>modernizer-maven-plugin</artifactId>
- <version>1.5.0</version>
- <configuration>
- <javaVersion>${targetJdk}</javaVersion>
- </configuration>
- <executions>
- <execution>
- <id>modernizer-check</id>
- <phase>verify</phase>
- <goals>
- <goal>modernizer</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
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=1803889&r1=1803888&r2=1803889&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 Wed Aug 2 17:37:38 2017
@@ -21,7 +21,6 @@ package org.apache.xml.security.c14n;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -50,7 +49,7 @@ import org.xml.sax.InputSource;
public class Canonicalizer {
/** The output encoding of canonicalized data */
- public static final String ENCODING = StandardCharsets.UTF_8.name();
+ public static final String ENCODING = "UTF8";
/**
* XPath Expression for selecting every node and continuous comments joined
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java Wed Aug 2 17:37:38 2017
@@ -22,7 +22,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
@@ -104,7 +103,7 @@ public abstract class AbstractSerializer
for (int i = 0; i < content.getLength(); i++) {
canon.canonicalizeSubtree(content.item(i));
}
- String ret = baos.toString(StandardCharsets.UTF_8.name());
+ String ret = baos.toString("UTF-8");
baos.reset();
return ret;
}
@@ -143,7 +142,7 @@ public abstract class AbstractSerializer
canon.setWriter(baos);
canon.notReset();
canon.canonicalizeSubtree(node);
- String ret = baos.toString(StandardCharsets.UTF_8.name());
+ String ret = baos.toString("UTF-8");
baos.reset();
return ret;
}
@@ -184,7 +183,7 @@ public abstract class AbstractSerializer
protected static byte[] createContext(byte[] source, Node ctx) throws XMLEncryptionException {
// Create the context to parse the document against
try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
- OutputStreamWriter outputStreamWriter = new OutputStreamWriter(byteArrayOutputStream, StandardCharsets.UTF_8);
+ OutputStreamWriter outputStreamWriter = new OutputStreamWriter(byteArrayOutputStream, "UTF-8");
outputStreamWriter.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?><dummy");
// Run through each node up to the document node and find any xmlns: nodes
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=1803889&r1=1803888&r2=1803889&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 Wed Aug 2 17:37:38 2017
@@ -24,7 +24,6 @@ import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.Key;
@@ -1113,7 +1112,7 @@ public class XMLCipher {
serializedOctets = serializer.serializeToByteArray(element);
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Serialized octets:\n" + new String(serializedOctets, StandardCharsets.UTF_8));
+ LOG.debug("Serialized octets:\n" + new String(serializedOctets, "UTF-8"));
}
}
@@ -2366,8 +2365,12 @@ public class XMLCipher {
EncryptionConstants.EncryptionSpecNS,
EncryptionConstants._TAG_OAEPPARAMS).item(0);
if (null != oaepParamsElement) {
- String oaepParams = oaepParamsElement.getFirstChild().getNodeValue();
- result.setOAEPparams(Base64.getMimeDecoder().decode(oaepParams.getBytes(StandardCharsets.UTF_8)));
+ try {
+ String oaepParams = oaepParamsElement.getFirstChild().getNodeValue();
+ result.setOAEPparams(Base64.getMimeDecoder().decode(oaepParams.getBytes("UTF-8")));
+ } catch(UnsupportedEncodingException e) {
+ throw new RuntimeException("UTF-8 not supported", e);
+ }
}
Element digestElement =
@@ -3577,7 +3580,7 @@ public class XMLCipher {
javax.xml.transform.TransformerFactory.newInstance();
transformerFactory.newTransformer().transform(
new javax.xml.transform.stream.StreamSource(
- new java.io.ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8))), domResult);
+ new java.io.ByteArrayInputStream(xml.getBytes("UTF-8"))), domResult);
boolean result = false;
if (domResult.getNode().getFirstChild().getFirstChild().hasAttributes()
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=1803889&r1=1803888&r2=1803889&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 Wed Aug 2 17:37:38 2017
@@ -23,7 +23,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
@@ -582,9 +581,9 @@ public class XMLSignatureInput {
// if a not-wellformed nodeset exists, put a container around it...
try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- baos.write("<container>".getBytes(StandardCharsets.UTF_8));
+ baos.write("<container>".getBytes("UTF-8"));
baos.write(this.getBytes());
- baos.write("</container>".getBytes(StandardCharsets.UTF_8));
+ baos.write("</container>".getBytes("UTF-8"));
result = baos.toByteArray();
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java Wed Aug 2 17:37:38 2017
@@ -122,7 +122,7 @@ public class InboundXMLSec {
inboundSecurityContext.put(XMLSecurityConstants.XMLINPUTFACTORY, xmlInputFactory);
DocumentContextImpl documentContext = new DocumentContextImpl();
- documentContext.setEncoding(xmlStreamReader.getEncoding() != null ? xmlStreamReader.getEncoding() : java.nio.charset.StandardCharsets.UTF_8.name());
+ documentContext.setEncoding(xmlStreamReader.getEncoding() != null ? xmlStreamReader.getEncoding() : "UTF-8");
//woodstox 3.2.9 returns null when used with a DOMSource
Location location = xmlStreamReader.getLocation();
if (location != null) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java Wed Aug 2 17:37:38 2017
@@ -18,6 +18,7 @@
*/
package org.apache.xml.security.stax.ext;
+import org.apache.commons.codec.binary.Base64;
import org.apache.xml.security.algorithms.JCEMapper;
import org.apache.xml.security.algorithms.implementations.ECDSAUtils;
import org.apache.xml.security.exceptions.XMLSecurityException;
@@ -204,10 +205,10 @@ public class XMLSecurityUtils {
RSAPublicKey rsaPublicKey = (RSAPublicKey) publicKey;
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_RSAKeyValue, false, null);
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_Modulus, false, null);
- abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, Base64.getMimeEncoder().encodeToString(rsaPublicKey.getModulus().toByteArray()));
+ abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(rsaPublicKey.getModulus().toByteArray()));
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_Modulus);
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_Exponent, false, null);
- abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, Base64.getMimeEncoder().encodeToString(rsaPublicKey.getPublicExponent().toByteArray()));
+ abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(rsaPublicKey.getPublicExponent().toByteArray()));
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_Exponent);
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_RSAKeyValue);
} else if ("DSA".equals(algorithm)) {
@@ -215,19 +216,19 @@ public class XMLSecurityUtils {
BigInteger j = dsaPublicKey.getParams().getP().subtract(BigInteger.ONE).divide(dsaPublicKey.getParams().getQ());
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_DSAKeyValue, false, null);
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_P, false, null);
- abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, Base64.getMimeEncoder().encodeToString(dsaPublicKey.getParams().getP().toByteArray()));
+ abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(dsaPublicKey.getParams().getP().toByteArray()));
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_P);
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_Q, false, null);
- abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, Base64.getMimeEncoder().encodeToString(dsaPublicKey.getParams().getQ().toByteArray()));
+ abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(dsaPublicKey.getParams().getQ().toByteArray()));
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_Q);
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_G, false, null);
- abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, Base64.getMimeEncoder().encodeToString(dsaPublicKey.getParams().getG().toByteArray()));
+ abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(dsaPublicKey.getParams().getG().toByteArray()));
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_G);
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_Y, false, null);
- abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, Base64.getMimeEncoder().encodeToString(dsaPublicKey.getY().toByteArray()));
+ abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(dsaPublicKey.getY().toByteArray()));
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_Y);
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_J, false, null);
- abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, Base64.getMimeEncoder().encodeToString(j.toByteArray()));
+ abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(j.toByteArray()));
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_J);
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_DSAKeyValue);
} else if ("EC".equals(algorithm)) {
@@ -239,7 +240,7 @@ public class XMLSecurityUtils {
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig11_NamedCurve, false, attributes);
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig11_NamedCurve);
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig11_PublicKey, false, null);
- abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, Base64.getMimeEncoder().encodeToString(ECDSAUtils.encodePoint(ecPublicKey.getW(), ecPublicKey.getParams().getCurve())));
+ abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(ECDSAUtils.encodePoint(ecPublicKey.getW(), ecPublicKey.getParams().getCurve())));
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig11_PublicKey);
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig11_ECKeyValue);
}
@@ -266,7 +267,7 @@ public class XMLSecurityUtils {
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509SKI, false, null);
byte[] data = XMLX509SKI.getSKIBytesFromCert(x509Certificates[0]);
- abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, Base64.getMimeEncoder().encodeToString(data));
+ abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(data));
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509SKI);
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509Data);
@@ -290,7 +291,7 @@ public class XMLSecurityUtils {
} catch (CertificateEncodingException e) {
throw new XMLSecurityException(e);
}
- abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, Base64.getMimeEncoder().encodeToString(data));
+ abstractOutputProcessor.createCharactersAndOutputAsEvent(outputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(data));
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509Certificate);
abstractOutputProcessor.createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_X509Data);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java Wed Aug 2 17:37:38 2017
@@ -54,8 +54,6 @@ import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.events.Attribute;
import java.io.*;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
import java.security.Key;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
@@ -283,7 +281,7 @@ public abstract class AbstractDecryptInp
XMLStreamReader xmlStreamReader =
inputProcessorChain.getSecurityContext().<XMLInputFactory>get(
XMLSecurityConstants.XMLINPUTFACTORY).createXMLStreamReader(
- new MultiInputStream(prologInputStream, decryptInputStream, epilogInputStream), StandardCharsets.UTF_8.name());
+ new MultiInputStream(prologInputStream, decryptInputStream, epilogInputStream), "UTF-8");
//forward to wrapper element
forwardToWrapperElement(xmlStreamReader);
@@ -348,7 +346,7 @@ public abstract class AbstractDecryptInp
}
stringBuilder.append('>');
- return new UnsyncByteArrayInputStream(stringBuilder.toString().getBytes(StandardCharsets.UTF_8));
+ return new UnsyncByteArrayInputStream(stringBuilder.toString().getBytes("UTF-8"));
}
private InputStream writeWrapperEndElement() throws IOException {
@@ -359,7 +357,7 @@ public abstract class AbstractDecryptInp
stringBuilder.append(':');
stringBuilder.append(wrapperElementName.getLocalPart());
stringBuilder.append('>');
- return new UnsyncByteArrayInputStream(stringBuilder.toString().getBytes(StandardCharsets.UTF_8));
+ return new UnsyncByteArrayInputStream(stringBuilder.toString().getBytes("UTF-8"));
}
private void forwardToWrapperElement(XMLStreamReader xmlStreamReader) throws XMLStreamException {
@@ -789,8 +787,7 @@ public abstract class AbstractDecryptInp
OutputStream base64OutputStream = new Base64OutputStream(replaceableOuputStream, false);
ivSplittingOutputStream.setParentOutputStream(replaceableOuputStream);
OutputStreamWriter outputStreamWriter =
- new OutputStreamWriter(base64OutputStream,
- Charset.forName(inputProcessorChain.getDocumentContext().getEncoding()));
+ new OutputStreamWriter(base64OutputStream, inputProcessorChain.getDocumentContext().getEncoding());
//read the encrypted data from the stream until an end-element occurs and write then
//to the decrypter-stream
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java Wed Aug 2 17:37:38 2017
@@ -18,6 +18,7 @@
*/
package org.apache.xml.security.stax.impl.processor.input;
+import org.apache.commons.codec.binary.Base64;
import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_Excl;
import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
import org.apache.xml.security.utils.UnsyncBufferedOutputStream;
@@ -383,8 +384,8 @@ public abstract class AbstractSignatureR
protected void compareDigest(byte[] calculatedDigest, ReferenceType referenceType) throws XMLSecurityException {
if (LOG.isDebugEnabled()) {
- LOG.debug("Calculated Digest: {}", new String(Base64.getMimeDecoder().decode(calculatedDigest)));
- LOG.debug("Stored Digest: {}", Base64.getMimeEncoder().encodeToString(referenceType.getDigestValue()));
+ LOG.debug("Calculated Digest: {}", new String(Base64.encodeBase64(calculatedDigest)));
+ LOG.debug("Stored Digest: {}", new String(Base64.encodeBase64(referenceType.getDigestValue())));
}
if (!MessageDigest.isEqual(referenceType.getDigestValue(), calculatedDigest)) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java Wed Aug 2 17:37:38 2017
@@ -175,7 +175,7 @@ public abstract class AbstractEncryptOut
//spec says (4.2): "The cleartext octet sequence obtained in step 3 is interpreted as UTF-8 encoded character data."
xmlEventWriter = new XMLSecurityEventWriter(
XMLSecurityConstants.xmlOutputFactoryNonRepairingNs.createXMLStreamWriter(
- cipherOutputStream, java.nio.charset.StandardCharsets.UTF_8.name()));
+ cipherOutputStream, "UTF-8"));
//we have to output a fake element to workaround text-only encryption:
xmlEventWriter.add(wrapperStartElement);
} catch (NoSuchPaddingException e) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java Wed Aug 2 17:37:38 2017
@@ -27,6 +27,7 @@ import java.util.*;
import javax.xml.stream.XMLStreamException;
+import org.apache.commons.codec.binary.Base64;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.AbstractBufferingOutputProcessor;
import org.apache.xml.security.stax.ext.AbstractOutputProcessor;
@@ -200,7 +201,7 @@ public abstract class AbstractSignatureE
createStartElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_dsig_SignatureValue, false, null);
final byte[] signatureValue = signedInfoProcessor.getSignatureValue();
- createCharactersAndOutputAsEvent(subOutputProcessorChain, Base64.getMimeEncoder().encodeToString(signatureValue));
+ createCharactersAndOutputAsEvent(subOutputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(signatureValue));
createEndElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_dsig_SignatureValue);
if (securityProperties.isSignatureGenerateIds()) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java Wed Aug 2 17:37:38 2017
@@ -18,6 +18,7 @@
*/
package org.apache.xml.security.stax.impl.processor.output;
+import org.apache.commons.codec.binary.Base64;
import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_Excl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -124,7 +125,7 @@ public abstract class AbstractSignatureO
throw new XMLSecurityException(e);
}
- String calculatedDigest = new String(Base64.getMimeEncoder().encodeToString(digestOutputStream.getDigestValue()));
+ String calculatedDigest = new String(Base64.encodeBase64(digestOutputStream.getDigestValue()));
LOG.debug("Calculated Digest: {}", calculatedDigest);
signaturePartDef.setDigestValue(calculatedDigest);
@@ -288,7 +289,7 @@ public abstract class AbstractSignatureO
} catch (IOException e) {
throw new XMLSecurityException(e);
}
- String calculatedDigest = Base64.getMimeEncoder().encodeToString(this.digestOutputStream.getDigestValue());
+ String calculatedDigest = new String(Base64.encodeBase64(this.digestOutputStream.getDigestValue()));
LOG.debug("Calculated Digest: {}", calculatedDigest);
signaturePartDef.setDigestValue(calculatedDigest);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java Wed Aug 2 17:37:38 2017
@@ -18,6 +18,7 @@
*/
package org.apache.xml.security.stax.impl.processor.output;
+import org.apache.commons.codec.binary.Base64;
import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
import org.apache.xml.security.stax.securityToken.SecurityTokenProvider;
import org.slf4j.Logger;
@@ -45,7 +46,6 @@ import java.security.cert.X509Certificat
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.MGF1ParameterSpec;
import java.util.ArrayList;
-import java.util.Base64;
import java.util.List;
/**
@@ -155,7 +155,7 @@ public class XMLEncryptOutputProcessor e
byte[] oaepParams = getSecurityProperties().getEncryptionKeyTransportOAEPParams();
if (oaepParams != null) {
createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_xenc_OAEPparams, false, null);
- createCharactersAndOutputAsEvent(outputProcessorChain, Base64.getMimeEncoder().encodeToString(oaepParams));
+ createCharactersAndOutputAsEvent(outputProcessorChain, Base64.encodeBase64String(oaepParams));
createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_xenc_OAEPparams);
}
@@ -238,7 +238,7 @@ public class XMLEncryptOutputProcessor e
}
byte[] encryptedEphemeralKey = cipher.wrap(sessionKey);
- createCharactersAndOutputAsEvent(outputProcessorChain, Base64.getMimeEncoder().encodeToString(encryptedEphemeralKey));
+ createCharactersAndOutputAsEvent(outputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(encryptedEphemeralKey));
} catch (NoSuchPaddingException e) {
throw new XMLSecurityException(e);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractSecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractSecurityToken.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractSecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractSecurityToken.java Wed Aug 2 17:37:38 2017
@@ -24,7 +24,7 @@ import java.security.PublicKey;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
+import java.util.Hashtable;
import java.util.List;
import java.util.Map;
@@ -43,7 +43,7 @@ public abstract class AbstractSecurityTo
private boolean asymmetric = false;
private String sha1Identifier;
- protected final Map<String, Key> keyTable = new HashMap<String, Key>();
+ protected final Map<String, Key> keyTable = new Hashtable<String, Key>();
protected final List<SecurityTokenConstants.TokenUsage> tokenUsages = new ArrayList<SecurityTokenConstants.TokenUsage>();
public AbstractSecurityToken(String id) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java Wed Aug 2 17:37:38 2017
@@ -53,7 +53,7 @@ public class XMLSecStartDocumentImpl ext
@Override
public String getCharacterEncodingScheme() {
- return characterEncodingScheme != null ? characterEncodingScheme : java.nio.charset.StandardCharsets.UTF_8.name();
+ return characterEncodingScheme != null ? characterEncodingScheme : "UTF-8";
}
@Override
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/DigestOutputStream.java Wed Aug 2 17:37:38 2017
@@ -19,6 +19,7 @@
package org.apache.xml.security.stax.impl.util;
import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
import org.slf4j.Logger;
@@ -61,7 +62,11 @@ public class DigestOutputStream extends
public void write(byte[] arg0, int arg1, int arg2) {
messageDigest.update(arg0, arg1, arg2);
if (isDebugEnabled) {
- stringBuilder.append(new String(arg0, arg1, arg2, java.nio.charset.StandardCharsets.UTF_8));
+ try {
+ stringBuilder.append(new String(arg0, arg1, arg2, "UTF-8"));
+ } catch (UnsupportedEncodingException e) {
+ LOG.warn(e.toString(), e);//UTF-8 is mandatory actually
+ }
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/util/SignerOutputStream.java Wed Aug 2 17:37:38 2017
@@ -19,6 +19,7 @@
package org.apache.xml.security.stax.impl.util;
import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.impl.algorithms.SignatureAlgorithm;
@@ -65,10 +66,12 @@ public class SignerOutputStream extends
try {
signatureAlgorithm.engineUpdate(arg0, arg1, arg2);
if (isDebugEnabled) {
- stringBuilder.append(new String(arg0, arg1, arg2, java.nio.charset.StandardCharsets.UTF_8));
+ stringBuilder.append(new String(arg0, arg1, arg2, "UTF-8"));
}
} catch (XMLSecurityException e) {
throw new RuntimeException(e);
+ } catch (UnsupportedEncodingException e) {
+ LOG.warn(e.toString(), e);//UTF-8 is mandatory actually
}
}
@@ -91,4 +94,4 @@ public class SignerOutputStream extends
}
return signatureAlgorithm.engineSign();
}
-}
+}
\ No newline at end of file
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java Wed Aug 2 17:37:38 2017
@@ -221,7 +221,7 @@ public final class XMLUtils {
public static void outputDOM(Node contextNode, OutputStream os, boolean addPreamble) {
try {
if (addPreamble) {
- os.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n".getBytes(java.nio.charset.StandardCharsets.UTF_8));
+ os.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n".getBytes("UTF-8"));
}
os.write(Canonicalizer.getInstance(
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java Wed Aug 2 17:37:38 2017
@@ -28,7 +28,6 @@ import java.net.URISyntaxException;
import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
-import java.nio.charset.StandardCharsets;
import java.util.Base64;
import org.apache.xml.security.signature.XMLSignatureInput;
@@ -118,7 +117,7 @@ public class ResolverDirectHTTP extends
urlConnection = openConnection(url);
String password = user + ":" + pass;
- String encodedPassword = Base64.getMimeEncoder().encodeToString(password.getBytes(StandardCharsets.ISO_8859_1));
+ String encodedPassword = Base64.getMimeEncoder().encodeToString(password.getBytes("ISO-8859-1"));
// set authentication property in the http header
urlConnection.setRequestProperty("Authorization",
@@ -183,7 +182,7 @@ public class ResolverDirectHTTP extends
if (proxyUser != null && proxyPass != null) {
String password = proxyUser + ":" + proxyPass;
- String authString = "Basic " + Base64.getMimeEncoder().encodeToString(password.getBytes(StandardCharsets.ISO_8859_1));
+ String authString = "Basic " + Base64.getMimeEncoder().encodeToString(password.getBytes("ISO-8859-1"));
urlConnection.setRequestProperty("Proxy-Authorization", authString);
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Baltimore23Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Baltimore23Test.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Baltimore23Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/Baltimore23Test.java Wed Aug 2 17:37:38 2017
@@ -23,7 +23,6 @@ package javax.xml.crypto.test.dsig;
import java.io.File;
import java.io.FileInputStream;
-import java.nio.charset.StandardCharsets;
import java.security.KeyStore;
import java.security.Security;
import javax.xml.crypto.KeySelector;
@@ -122,7 +121,7 @@ public class Baltimore23Test extends org
String file = "signature-enveloping-hmac-sha1.xml";
KeySelector ks = new KeySelectors.SecretKeySelector
- ("secret".getBytes(StandardCharsets.US_ASCII) );
+ ("secret".getBytes("ASCII") );
SignatureValidator validator = new SignatureValidator(dir);
boolean coreValidity = validator.validate(file, ks);
assertTrue("Signature failed core validation", coreValidity);
@@ -133,7 +132,7 @@ public class Baltimore23Test extends org
String file = "signature-enveloping-hmac-sha1-40.xml";
KeySelector ks = new KeySelectors.SecretKeySelector
- ("secret".getBytes(StandardCharsets.US_ASCII) );
+ ("secret".getBytes("ASCII") );
try {
SignatureValidator validator = new SignatureValidator(dir);
validator.validate(file, ks);
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/C14N11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/C14N11Test.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/C14N11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/C14N11Test.java Wed Aug 2 17:37:38 2017
@@ -19,7 +19,6 @@
package javax.xml.crypto.test.dsig;
import java.io.File;
-import java.nio.charset.StandardCharsets;
import java.security.Security;
import javax.xml.crypto.KeySelector;
@@ -48,7 +47,7 @@ public class C14N11Test extends org.juni
+ "org" + fs + "w3c" + fs + "www" + fs
+ "interop" + fs + "xmldsig" + fs + "c14n11");
validator = new SignatureValidator(dir);
- sks = new KeySelectors.SecretKeySelector("secret".getBytes(StandardCharsets.US_ASCII));
+ sks = new KeySelectors.SecretKeySelector("secret".getBytes("ASCII"));
}
@org.junit.Test
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java Wed Aug 2 17:37:38 2017
@@ -23,7 +23,6 @@ package javax.xml.crypto.test.dsig;
import java.io.*;
import java.math.BigInteger;
-import java.nio.charset.StandardCharsets;
import java.security.Key;
import java.security.KeyStore;
import java.security.PublicKey;
@@ -114,7 +113,7 @@ public class CreateBaltimore23Test exten
rsa = kifac.newKeyInfo(Collections.singletonList
(kifac.newKeyValue(TestUtils.getPublicKey("RSA"))));
rsaSha1 = fac.newSignatureMethod(SignatureMethod.RSA_SHA1, null);
- sks = new KeySelectors.SecretKeySelector("secret".getBytes(StandardCharsets.US_ASCII));
+ sks = new KeySelectors.SecretKeySelector("secret".getBytes("ASCII"));
ud = new LocalHttpCacheURIDereferencer();
}
@@ -171,7 +170,7 @@ public class CreateBaltimore23Test exten
(SignatureMethod.HMAC_SHA1, new HMACParameterSpec(40));
try {
test_create_signature_enveloping(hmacSha1, null,
- TestUtils.getSecretKey("secret".getBytes(StandardCharsets.US_ASCII)), sks, false);
+ TestUtils.getSecretKey("secret".getBytes("ASCII")), sks, false);
fail("Expected HMACOutputLength Exception");
} catch (XMLSignatureException xse) {
System.out.println(xse.getMessage());
@@ -185,7 +184,7 @@ public class CreateBaltimore23Test exten
SignatureMethod hmacSha1 = fac.newSignatureMethod
(SignatureMethod.HMAC_SHA1, null);
test_create_signature_enveloping(hmacSha1, null,
- TestUtils.getSecretKey("secret".getBytes(StandardCharsets.US_ASCII)), sks, false);
+ TestUtils.getSecretKey("secret".getBytes("ASCII")), sks, false);
}
@org.junit.Test
@@ -289,7 +288,7 @@ public class CreateBaltimore23Test exten
public void test_create_signature_x509_ski() throws Exception {
KeyInfo ski = kifac.newKeyInfo(Collections.singletonList
(kifac.newX509Data(Collections.singletonList
- ("keyid".getBytes(StandardCharsets.US_ASCII)))));
+ ("keyid".getBytes("ASCII")))));
test_create_signature_external(dsaSha1, ski, signingKey,
KeySelector.singletonKeySelector(validatingKey), false);
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java Wed Aug 2 17:37:38 2017
@@ -18,7 +18,6 @@
*/
package javax.xml.crypto.test.dsig;
-import java.nio.charset.StandardCharsets;
import java.security.*;
import java.security.spec.ECGenParameterSpec;
import java.util.Collections;
@@ -125,7 +124,7 @@ public class CreateInteropXMLDSig11Test
hmacSha512 = fac.newSignatureMethod
("http://www.w3.org/2001/04/xmldsig-more#hmac-sha512", null);
kvks = new KeySelectors.KeyValueKeySelector();
- sks = new KeySelectors.SecretKeySelector("testkey".getBytes(StandardCharsets.US_ASCII));
+ sks = new KeySelectors.SecretKeySelector("testkey".getBytes("ASCII"));
}
@org.junit.Test
@@ -264,21 +263,21 @@ public class CreateInteropXMLDSig11Test
public void test_create_enveloping_hmac_sha256() throws Exception {
test_create_signature_enveloping(hmacSha256, sha1, rsaki,
TestUtils.getSecretKey
- ("testkey".getBytes(StandardCharsets.US_ASCII)), sks);
+ ("testkey".getBytes("ASCII")), sks);
}
@org.junit.Test
public void test_create_enveloping_hmac_sha384() throws Exception {
test_create_signature_enveloping(hmacSha384, sha1, rsaki,
TestUtils.getSecretKey
- ("testkey".getBytes(StandardCharsets.US_ASCII)), sks);
+ ("testkey".getBytes("ASCII")), sks);
}
@org.junit.Test
public void test_create_enveloping_hmac_sha512() throws Exception {
test_create_signature_enveloping(hmacSha512, sha1, rsaki,
TestUtils.getSecretKey
- ("testkey".getBytes(StandardCharsets.US_ASCII)), sks);
+ ("testkey".getBytes("ASCII")), sks);
}
private void test_create_signature_enveloping(
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java Wed Aug 2 17:37:38 2017
@@ -21,7 +21,6 @@
*/
package javax.xml.crypto.test.dsig;
-import java.nio.charset.StandardCharsets;
import java.security.*;
import java.util.*;
@@ -102,7 +101,7 @@ public class CreatePhaosXMLDSig3Test ext
Document doc = db.newDocument();
DOMSignContext dsc = new DOMSignContext
(new KeySelectors.SecretKeySelector
- ("test".getBytes(StandardCharsets.US_ASCII)), doc);
+ ("test".getBytes("ASCII")), doc);
dsc.putNamespacePrefix(XMLSignature.XMLNS, "dsig");
URIDereferencer ud = new LocalHttpCacheURIDereferencer();
dsc.setURIDereferencer(ud);
@@ -112,7 +111,7 @@ public class CreatePhaosXMLDSig3Test ext
DOMValidateContext dvc = new DOMValidateContext
(new KeySelectors.SecretKeySelector
- ("test".getBytes(StandardCharsets.US_ASCII)), doc);
+ ("test".getBytes("ASCII")), doc);
dvc.setURIDereferencer(ud);
XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
@@ -161,7 +160,7 @@ public class CreatePhaosXMLDSig3Test ext
DOMSignContext dsc = new DOMSignContext
(new KeySelectors.SecretKeySelector
- ("test".getBytes(StandardCharsets.US_ASCII)), player);
+ ("test".getBytes("ASCII")), player);
dsc.putNamespacePrefix(XMLSignature.XMLNS, "dsig");
sig.sign(dsc);
@@ -169,7 +168,7 @@ public class CreatePhaosXMLDSig3Test ext
DOMValidateContext dvc = new DOMValidateContext
(new KeySelectors.SecretKeySelector
- ("test".getBytes(StandardCharsets.US_ASCII)), player.getLastChild());
+ ("test".getBytes("ASCII")), player.getLastChild());
XMLSignature sig2 = fac.unmarshalXMLSignature(dvc);
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java Wed Aug 2 17:37:38 2017
@@ -19,7 +19,6 @@
package javax.xml.crypto.test.dsig;
import java.lang.reflect.Constructor;
-import java.nio.charset.StandardCharsets;
import java.security.Key;
import java.security.Provider;
import java.security.Security;
@@ -101,7 +100,7 @@ public class HMACSignatureAlgorithmTest
hmacSha512 = fac.newSignatureMethod("http://www.w3.org/2001/04/xmldsig-more#hmac-sha512", null);
ripemd160 = fac.newSignatureMethod("http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160", null);
- sks = new KeySelectors.SecretKeySelector("testkey".getBytes(StandardCharsets.US_ASCII));
+ sks = new KeySelectors.SecretKeySelector("testkey".getBytes("ASCII"));
}
@org.junit.AfterClass
@@ -112,38 +111,38 @@ public class HMACSignatureAlgorithmTest
@org.junit.Test
public void testHMACSHA1() throws Exception {
test_create_signature_enveloping(hmacSha1, sha1, null,
- TestUtils.getSecretKey("testkey".getBytes(StandardCharsets.US_ASCII)), sks);
+ TestUtils.getSecretKey("testkey".getBytes("ASCII")), sks);
}
@org.junit.Test
public void testHMACSHA_224() throws Exception {
test_create_signature_enveloping(hmacSha224, sha1, null,
- TestUtils.getSecretKey("testkey".getBytes(StandardCharsets.US_ASCII)), sks);
+ TestUtils.getSecretKey("testkey".getBytes("ASCII")), sks);
}
@org.junit.Test
public void testHMACSHA_256() throws Exception {
test_create_signature_enveloping(hmacSha256, sha1, null,
- TestUtils.getSecretKey("testkey".getBytes(StandardCharsets.US_ASCII)), sks);
+ TestUtils.getSecretKey("testkey".getBytes("ASCII")), sks);
}
@org.junit.Test
public void testHMACSHA_384() throws Exception {
test_create_signature_enveloping(hmacSha384, sha1, null,
- TestUtils.getSecretKey("testkey".getBytes(StandardCharsets.US_ASCII)), sks);
+ TestUtils.getSecretKey("testkey".getBytes("ASCII")), sks);
}
@org.junit.Test
public void testHMACSHA_512() throws Exception {
test_create_signature_enveloping(hmacSha512, sha1, null,
- TestUtils.getSecretKey("testkey".getBytes(StandardCharsets.US_ASCII)), sks);
+ TestUtils.getSecretKey("testkey".getBytes("ASCII")), sks);
}
@org.junit.Test
public void testHMACRIPEMD160() throws Exception {
org.junit.Assume.assumeTrue(bcInstalled);
test_create_signature_enveloping(ripemd160, sha1, null,
- TestUtils.getSecretKey("testkey".getBytes(StandardCharsets.US_ASCII)), sks);
+ TestUtils.getSecretKey("testkey".getBytes("ASCII")), sks);
}
private void test_create_signature_enveloping(
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikSignatureAlgosTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikSignatureAlgosTest.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikSignatureAlgosTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/IaikSignatureAlgosTest.java Wed Aug 2 17:37:38 2017
@@ -22,7 +22,6 @@
package javax.xml.crypto.test.dsig;
import java.io.File;
-import java.nio.charset.StandardCharsets;
import java.security.Security;
import javax.xml.crypto.dsig.XMLSignatureException;
@@ -75,7 +74,7 @@ public class IaikSignatureAlgosTest exte
try {
validator.validate(file, new
- KeySelectors.SecretKeySelector("secret".getBytes(StandardCharsets.US_ASCII)));
+ KeySelectors.SecretKeySelector("secret".getBytes("ASCII")));
fail("Expected HMACOutputLength Exception");
} catch (XMLSignatureException xse) {
// System.out.println(xse.getMessage());
@@ -88,7 +87,7 @@ public class IaikSignatureAlgosTest exte
String file = "hMACSignature.xml";
boolean coreValidity = validator.validate(file, new
- KeySelectors.SecretKeySelector("secret".getBytes(StandardCharsets.US_ASCII)));
+ KeySelectors.SecretKeySelector("secret".getBytes("ASCII")));
assertTrue("Signature failed core validation", coreValidity);
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropXMLDSig11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropXMLDSig11Test.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropXMLDSig11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/InteropXMLDSig11Test.java Wed Aug 2 17:37:38 2017
@@ -19,7 +19,6 @@
package javax.xml.crypto.test.dsig;
import java.io.File;
-import java.nio.charset.StandardCharsets;
import java.security.KeyFactory;
import java.security.NoSuchAlgorithmException;
import java.security.Security;
@@ -61,7 +60,7 @@ public class InteropXMLDSig11Test extend
+ "interop" + fs + "xmldsig11");
validator = new SignatureValidator(dir);
kvks = new KeySelectors.KeyValueKeySelector();
- sks = new KeySelectors.SecretKeySelector("testkey".getBytes(StandardCharsets.US_ASCII));
+ sks = new KeySelectors.SecretKeySelector("testkey".getBytes("ASCII"));
}
@org.junit.Test
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenReferenceTest.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenReferenceTest.java Wed Aug 2 17:37:38 2017
@@ -19,7 +19,6 @@
package javax.xml.crypto.test.dsig;
import java.io.File;
-import java.nio.charset.StandardCharsets;
import java.security.Security;
import javax.xml.crypto.dsig.XMLSignatureException;
@@ -54,7 +53,7 @@ public class JSRForbiddenReferenceTest e
DOMValidateContext vc =
validator.getValidateContext(
- file, new KeySelectors.SecretKeySelector("secret".getBytes(StandardCharsets.US_ASCII))
+ file, new KeySelectors.SecretKeySelector("secret".getBytes("ASCII"))
);
vc.setProperty("org.apache.jcp.xml.dsig.secureValidation", Boolean.FALSE);
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PhaosXMLDSig3Test.java Wed Aug 2 17:37:38 2017
@@ -22,7 +22,6 @@
package javax.xml.crypto.test.dsig;
import java.io.File;
-import java.nio.charset.StandardCharsets;
import java.security.Security;
import javax.xml.crypto.KeySelector;
import javax.xml.crypto.URIDereferencer;
@@ -102,7 +101,7 @@ public class PhaosXMLDSig3Test extends o
String file = "signature-hmac-sha1-40-c14n-comments-detached.xml";
KeySelector ks = new KeySelectors.SecretKeySelector
- ("test".getBytes(StandardCharsets.US_ASCII) );
+ ("test".getBytes("ASCII") );
try {
validator.validate(file, ks);
fail("Expected HMACOutputLength Exception");
@@ -118,7 +117,7 @@ public class PhaosXMLDSig3Test extends o
String file = "signature-hmac-sha1-40-exclusive-c14n-comments-detached.xml";
KeySelector ks = new KeySelectors.SecretKeySelector
- ("test".getBytes(StandardCharsets.US_ASCII) );
+ ("test".getBytes("ASCII") );
try {
validator.validate(file, ks);
fail("Expected HMACOutputLength Exception");
@@ -134,7 +133,7 @@ public class PhaosXMLDSig3Test extends o
String file = "signature-hmac-sha1-exclusive-c14n-comments-detached.xml";
KeySelector ks = new KeySelectors.SecretKeySelector
- ("test".getBytes(StandardCharsets.US_ASCII) );
+ ("test".getBytes("ASCII") );
boolean coreValidity = validator.validate(file, ks, ud);
assertTrue("Signature failed core validation", coreValidity);
}
@@ -145,7 +144,7 @@ public class PhaosXMLDSig3Test extends o
String file = "signature-hmac-sha1-exclusive-c14n-enveloped.xml";
KeySelector ks = new KeySelectors.SecretKeySelector
- ("test".getBytes(StandardCharsets.US_ASCII) );
+ ("test".getBytes("ASCII") );
boolean coreValidity = validator.validate(file, ks);
assertTrue("Signature failed core validation", coreValidity);
}
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ValidateSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ValidateSignatureTest.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ValidateSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ValidateSignatureTest.java Wed Aug 2 17:37:38 2017
@@ -19,7 +19,6 @@
package javax.xml.crypto.test.dsig;
import java.io.File;
-import java.nio.charset.StandardCharsets;
import java.security.Security;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -80,7 +79,7 @@ public class ValidateSignatureTest exten
String file = "signature-external-c14n-xmlatrs.xml";
boolean coreValidity = validator.validate(file,
- new KeySelectors.SecretKeySelector("secret".getBytes(StandardCharsets.US_ASCII)));
+ new KeySelectors.SecretKeySelector("secret".getBytes("ASCII")));
assertTrue("Signature failed core validation", coreValidity);
}
@@ -102,7 +101,7 @@ public class ValidateSignatureTest exten
try {
validator.validate
("signature-enveloping-hmac-sha1-trunclen-0-attack.xml",
- new KeySelectors.SecretKeySelector("secret".getBytes(StandardCharsets.US_ASCII)));
+ new KeySelectors.SecretKeySelector("secret".getBytes("ASCII")));
fail("Expected HMACOutputLength exception");
} catch (XMLSignatureException xse) {
// System.out.println(xse.getMessage());
@@ -116,7 +115,7 @@ public class ValidateSignatureTest exten
try {
validator.validate
("signature-enveloping-hmac-sha1-trunclen-8-attack.xml",
- new KeySelectors.SecretKeySelector("secret".getBytes(StandardCharsets.US_ASCII)));
+ new KeySelectors.SecretKeySelector("secret".getBytes("ASCII")));
fail("Expected HMACOutputLength exception");
} catch (XMLSignatureException xse) {
// System.out.println(xse.getMessage());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/CreateExclC14nInteropValues.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/CreateExclC14nInteropValues.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/CreateExclC14nInteropValues.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/CreateExclC14nInteropValues.java Wed Aug 2 17:37:38 2017
@@ -23,7 +23,6 @@ import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
import javax.xml.parsers.DocumentBuilder;
@@ -199,7 +198,7 @@ public class CreateExclC14nInteropValues
+ "\n" + "</notIncluded>" + "\n" + "</notIncluded>"
+ "\n" + "</included>";
Document importDoc = null;
- try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes(StandardCharsets.UTF_8))) {
+ try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes("UTF8"))) {
importDoc = db.parse(is);
}
@@ -234,7 +233,7 @@ public class CreateExclC14nInteropValues
+ "\n" + "</notIncluded>" + "\n" + "</notIncluded>"
+ "\n" + "</included>";
Document importDoc = null;
- try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes(StandardCharsets.UTF_8))) {
+ try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes("UTF8"))) {
importDoc = db.parse(is);
}
@@ -269,7 +268,7 @@ public class CreateExclC14nInteropValues
+ "\n" + "</notIncluded>" + "\n" + "</notIncluded>"
+ "\n" + "</included>";
Document importDoc = null;
- try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes(StandardCharsets.UTF_8))) {
+ try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes("UTF8"))) {
importDoc = db.parse(is);
}
@@ -305,7 +304,7 @@ public class CreateExclC14nInteropValues
+ "\n" + "</notIncluded>" + "\n" + "</included>"
+ "\n" + "</included>";
Document importDoc = null;
- try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes(StandardCharsets.UTF_8))) {
+ try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes("UTF8"))) {
importDoc = db.parse(is);
}
@@ -342,7 +341,7 @@ public class CreateExclC14nInteropValues
+ "</included>" + "\n" + "</notIncluded>" + "\n"
+ "</included>" + "\n" + "</included>";
Document importDoc = null;
- try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes(StandardCharsets.UTF_8))) {
+ try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes("UTF8"))) {
importDoc = db.parse(is);
}
@@ -379,7 +378,7 @@ public class CreateExclC14nInteropValues
+ "</notIncluded>" + "\n" + "</included>" + "\n"
+ "</included>";
Document importDoc = null;
- try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes(StandardCharsets.UTF_8))) {
+ try (InputStream is = new ByteArrayInputStream(xmlStr.getBytes("UTF8"))) {
importDoc = db.parse(is);
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java Wed Aug 2 17:37:38 2017
@@ -20,7 +20,6 @@ package org.apache.xml.security.test.dom
import java.io.InputStream;
import java.lang.reflect.Constructor;
-import java.nio.charset.StandardCharsets;
import java.security.Key;
import java.security.Provider;
import java.security.Security;
@@ -91,7 +90,7 @@ public class HMACSignatureAlgorithmTest
Document document = builder.parse(sourceDocument);
// Set up the Key
- byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
+ byte[] hmacKey = "secret".getBytes("ASCII");
SecretKey key = new SecretKeySpec(hmacKey, "http://www.w3.org/2000/09/xmldsig#hmac-sha1");
List<String> localNames = new ArrayList<>();
@@ -112,7 +111,7 @@ public class HMACSignatureAlgorithmTest
Document document = builder.parse(sourceDocument);
// Set up the Key
- byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
+ byte[] hmacKey = "secret".getBytes("ASCII");
SecretKey key = new SecretKeySpec(hmacKey, "http://www.w3.org/2001/04/xmldsig-more#hmac-md5");
List<String> localNames = new ArrayList<>();
@@ -133,7 +132,7 @@ public class HMACSignatureAlgorithmTest
Document document = builder.parse(sourceDocument);
// Set up the Key
- byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
+ byte[] hmacKey = "secret".getBytes("ASCII");
SecretKey key = new SecretKeySpec(hmacKey, "http://www.w3.org/2001/04/xmldsig-more#hmac-sha224");
List<String> localNames = new ArrayList<>();
@@ -154,7 +153,7 @@ public class HMACSignatureAlgorithmTest
Document document = builder.parse(sourceDocument);
// Set up the Key
- byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
+ byte[] hmacKey = "secret".getBytes("ASCII");
SecretKey key = new SecretKeySpec(hmacKey, "http://www.w3.org/2001/04/xmldsig-more#hmac-sha256");
List<String> localNames = new ArrayList<>();
@@ -175,7 +174,7 @@ public class HMACSignatureAlgorithmTest
Document document = builder.parse(sourceDocument);
// Set up the Key
- byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
+ byte[] hmacKey = "secret".getBytes("ASCII");
SecretKey key = new SecretKeySpec(hmacKey, "http://www.w3.org/2001/04/xmldsig-more#hmac-sha384");
List<String> localNames = new ArrayList<>();
@@ -196,7 +195,7 @@ public class HMACSignatureAlgorithmTest
Document document = builder.parse(sourceDocument);
// Set up the Key
- byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
+ byte[] hmacKey = "secret".getBytes("ASCII");
SecretKey key = new SecretKeySpec(hmacKey, "http://www.w3.org/2001/04/xmldsig-more#hmac-sha512");
List<String> localNames = new ArrayList<>();
@@ -219,7 +218,7 @@ public class HMACSignatureAlgorithmTest
Document document = builder.parse(sourceDocument);
// Set up the Key
- byte[] hmacKey = "secret".getBytes(StandardCharsets.US_ASCII);
+ byte[] hmacKey = "secret".getBytes("ASCII");
SecretKey key = new SecretKeySpec(hmacKey, "http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160");
List<String> localNames = new ArrayList<>();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java Wed Aug 2 17:37:38 2017
@@ -1113,7 +1113,7 @@ public class Canonicalizer20010315Test e
throws ParserConfigurationException, IOException, SAXException,
TransformerConfigurationException, TransformerException {
//String ENCODING_ISO8859_1 = "ISO-8859-1";
- //String ENCODING_UTF8 = java.nio.charset.StandardCharsets.UTF_8;
+ //String ENCODING_UTF8 = "UTF-8";
String ENCODING_UTF16 = "UTF-16";
DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
Document doc = null;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario191Test.java Wed Aug 2 17:37:38 2017
@@ -21,7 +21,6 @@ package org.apache.xml.security.test.dom
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
import javax.xml.parsers.DocumentBuilder;
@@ -66,7 +65,7 @@ public class Santuario191Test extends or
//
db = XMLUtils.createDocumentBuilder(false);
Document doc = null;
- try (InputStream is = new ByteArrayInputStream(INPUT_DATA.getBytes(StandardCharsets.UTF_8))) {
+ try (InputStream is = new ByteArrayInputStream(INPUT_DATA.getBytes("UTF8"))) {
doc = db.parse(is);
}
@@ -82,7 +81,7 @@ public class Santuario191Test extends or
//
ByteArrayOutputStream out = new ByteArrayOutputStream();
out.write(result);
- assertTrue(EXPECTED_RESULT.equals(out.toString(StandardCharsets.UTF_8.name())));
+ assertTrue(EXPECTED_RESULT.equals(out.toString("UTF8")));
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Santuario273Test.java Wed Aug 2 17:37:38 2017
@@ -96,7 +96,7 @@ public class Santuario273Test extends or
(Node) xPath.evaluate("//ds:SignedInfo[1]", doc, XPathConstants.NODE);
byte[] output = c14n.canonicalizeSubtree(signedInfo);
- assertEquals( new String(output, java.nio.charset.StandardCharsets.UTF_8), expectedResult);
+ assertEquals( new String(output, "UTF-8"), expectedResult);
}
}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java?rev=1803889&r1=1803888&r2=1803889&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/UtfHelperTest.java Wed Aug 2 17:37:38 2017
@@ -20,7 +20,6 @@ package org.apache.xml.security.test.dom
import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import org.apache.xml.security.c14n.implementations.UtfHelpper;
@@ -31,9 +30,14 @@ public class UtfHelperTest extends org.j
public void testBug40156() {
String s = "\u00e4\u00f6\u00fc";
byte a[] = UtfHelpper.getStringInUtf8(s);
- byte correct[] = s.getBytes(StandardCharsets.UTF_8);
- boolean equals = Arrays.equals(correct, a);
- assertTrue(equals);
+ try {
+ byte correct[] = s.getBytes("UTF8");
+ boolean equals = Arrays.equals(correct, a);
+ assertTrue(equals);
+ } catch (UnsupportedEncodingException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
@org.junit.Test
@@ -47,7 +51,7 @@ public class UtfHelperTest extends org.j
}
// if system property org.apache.xml.security.c14n.oldUtf8=true, can only validate
- // 16bit chars against String.getBytes(StandardCharsets.UTF_8);
+ // 16bit chars against String.getBytes("UTF8");
int chunk = Boolean.getBoolean("org.apache.xml.security.c14n.oldUtf8") ? 1 << 16
: Character.MAX_CODE_POINT + 1;
int j = 0;
@@ -78,7 +82,7 @@ public class UtfHelperTest extends org.j
byte a[] = UtfHelpper.getStringInUtf8(str);
try {
// System.out.println("chunk:"+j);
- byte correct[] = str.getBytes(StandardCharsets.UTF_8);
+ byte correct[] = str.getBytes("UTF8");
assertTrue("UtfHelper.getStringInUtf8 false", Arrays.equals(correct, a));
assertTrue(
"UtfHelper.getStringInUtf8 false",