ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1792451 - in /webservices/wss4j/trunk: parent/ ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/ ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/
Date Mon, 24 Apr 2017 10:59:33 GMT
Author: coheigea
Date: Mon Apr 24 10:59:33 2017
New Revision: 1792451

URL: http://svn.apache.org/viewvc?rev=1792451&view=rev
Log:
Updating to pick up Santuatio 2.1.0-SNAPSHOT

Modified:
    webservices/wss4j/trunk/parent/pom.xml
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509PKIPathv1SecurityTokenImpl.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509V3SecurityTokenImpl.java

Modified: webservices/wss4j/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/parent/pom.xml?rev=1792451&r1=1792450&r2=1792451&view=diff
==============================================================================
--- webservices/wss4j/trunk/parent/pom.xml (original)
+++ webservices/wss4j/trunk/parent/pom.xml Mon Apr 24 10:59:33 2017
@@ -47,7 +47,7 @@
         <wsdl4j.version>1.6.3</wsdl4j.version>
         <xalan.version>2.7.2</xalan.version>
         <xz.version>1.6</xz.version>
-        <xmlsec.version>2.0.8</xmlsec.version>
+        <xmlsec.version>2.1.0-SNAPSHOT</xmlsec.version>
         <xmlunit.version>1.6</xmlunit.version>
         
         <!-- OSGi related properties -->

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java?rev=1792451&r1=1792450&r2=1792451&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
(original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
Mon Apr 24 10:59:33 2017
@@ -68,12 +68,12 @@ import org.apache.xml.security.stax.ext.
 import org.apache.xml.security.stax.impl.processor.input.AbstractSignatureReferenceVerifyInputProcessor;
 import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_Excl;
 import org.apache.xml.security.stax.impl.util.DigestOutputStream;
-import org.apache.xml.security.stax.impl.util.UnsynchronizedBufferedOutputStream;
 import org.apache.xml.security.stax.securityEvent.AlgorithmSuiteSecurityEvent;
 import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent;
 import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
 import org.apache.xml.security.stax.securityToken.SecurityToken;
 import org.apache.xml.security.stax.securityToken.SecurityTokenProvider;
+import org.apache.xml.security.utils.UnsyncBufferedOutputStream;
 
 public class WSSSignatureReferenceVerifyInputProcessor extends AbstractSignatureReferenceVerifyInputProcessor
{
 
@@ -134,8 +134,8 @@ public class WSSSignatureReferenceVerify
             try {
                 DigestOutputStream digestOutputStream =
                         createMessageDigestOutputStream(referenceType, inputProcessorChain.getSecurityContext());
-                UnsynchronizedBufferedOutputStream bufferedDigestOutputStream =
-                        new UnsynchronizedBufferedOutputStream(digestOutputStream);
+                UnsyncBufferedOutputStream bufferedDigestOutputStream =
+                        new UnsyncBufferedOutputStream(digestOutputStream);
 
                 if (referenceType.getTransforms() != null) {
                     Transformer transformer =

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509PKIPathv1SecurityTokenImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509PKIPathv1SecurityTokenImpl.java?rev=1792451&r1=1792450&r2=1792451&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509PKIPathv1SecurityTokenImpl.java
(original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509PKIPathv1SecurityTokenImpl.java
Mon Apr 24 10:59:33 2017
@@ -35,7 +35,7 @@ import org.apache.wss4j.stax.ext.WSInbou
 import org.apache.wss4j.stax.ext.WSSSecurityProperties;
 import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
 import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.impl.util.UnsynchronizedByteArrayInputStream;
+import org.apache.xml.security.utils.UnsyncByteArrayInputStream;
 
 public class X509PKIPathv1SecurityTokenImpl extends X509SecurityTokenImpl {
 
@@ -49,7 +49,7 @@ public class X509PKIPathv1SecurityTokenI
         super(WSSecurityTokenConstants.X509PkiPathV1Token, wsInboundSecurityContext, crypto,
                 callbackHandler, id, keyIdentifier, securityProperties, true);
 
-        try (InputStream in = new UnsynchronizedByteArrayInputStream(binaryContent)) {
+        try (InputStream in = new UnsyncByteArrayInputStream(binaryContent)) {
             CertPath certPath = getCrypto().getCertificateFactory().generateCertPath(in);
             List<? extends Certificate> l = certPath.getCertificates();
             X509Certificate[] certs = new X509Certificate[l.size()];

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509V3SecurityTokenImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509V3SecurityTokenImpl.java?rev=1792451&r1=1792450&r2=1792451&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509V3SecurityTokenImpl.java
(original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/X509V3SecurityTokenImpl.java
Mon Apr 24 10:59:33 2017
@@ -25,7 +25,7 @@ import org.apache.wss4j.stax.ext.WSSConf
 import org.apache.wss4j.stax.ext.WSSSecurityProperties;
 import org.apache.wss4j.stax.securityToken.WSSecurityTokenConstants;
 import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.impl.util.UnsynchronizedByteArrayInputStream;
+import org.apache.xml.security.utils.UnsyncByteArrayInputStream;
 
 import javax.security.auth.callback.CallbackHandler;
 
@@ -44,7 +44,7 @@ public class X509V3SecurityTokenImpl ext
         super(WSSecurityTokenConstants.X509V3Token, wsInboundSecurityContext, crypto, callbackHandler,
id,
                 WSSecurityTokenConstants.KeyIdentifier_X509KeyIdentifier, securityProperties,
true);
 
-        try (InputStream inputStream = new UnsynchronizedByteArrayInputStream(binaryContent))
{
+        try (InputStream inputStream = new UnsyncByteArrayInputStream(binaryContent)) {
             X509Certificate x509Certificate = getCrypto().loadCertificate(inputStream);
             setX509Certificates(new X509Certificate[]{x509Certificate});
         } catch (IOException e) {



Mime
View raw message