ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1389288 - /webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java
Date Mon, 24 Sep 2012 10:53:02 GMT
Author: coheigea
Date: Mon Sep 24 10:53:01 2012
New Revision: 1389288

URL: http://svn.apache.org/viewvc?rev=1389288&view=rev
Log:
Further update to last commit

Modified:
    webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java

Modified: webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java?rev=1389288&r1=1389287&r2=1389288&view=diff
==============================================================================
--- webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java
(original)
+++ webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java
Mon Sep 24 10:53:01 2012
@@ -19,6 +19,38 @@
 
 package org.apache.ws.security.processor;
 
+import java.security.Key;
+import java.security.NoSuchProviderException;
+import java.security.Principal;
+import java.security.PublicKey;
+import java.security.cert.X509Certificate;
+import java.security.spec.AlgorithmParameterSpec;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.NodeSetData;
+import javax.xml.crypto.XMLStructure;
+import javax.xml.crypto.dom.DOMStructure;
+import javax.xml.crypto.dsig.Manifest;
+import javax.xml.crypto.dsig.Reference;
+import javax.xml.crypto.dsig.SignedInfo;
+import javax.xml.crypto.dsig.Transform;
+import javax.xml.crypto.dsig.XMLObject;
+import javax.xml.crypto.dsig.XMLSignature;
+import javax.xml.crypto.dsig.XMLSignatureFactory;
+import javax.xml.crypto.dsig.XMLValidateContext;
+import javax.xml.crypto.dsig.dom.DOMValidateContext;
+import javax.xml.crypto.dsig.keyinfo.KeyInfo;
+import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
+import javax.xml.crypto.dsig.keyinfo.KeyValue;
+import javax.xml.crypto.dsig.spec.HMACParameterSpec;
+
 import org.apache.ws.security.PublicKeyPrincipal;
 import org.apache.ws.security.WSConstants;
 import org.apache.ws.security.WSDataRef;
@@ -32,8 +64,8 @@ import org.apache.ws.security.cache.Repl
 import org.apache.ws.security.components.crypto.Crypto;
 import org.apache.ws.security.components.crypto.CryptoType;
 import org.apache.ws.security.handler.RequestData;
-import org.apache.ws.security.message.DOMCallbackLookup;
 import org.apache.ws.security.message.CallbackLookup;
+import org.apache.ws.security.message.DOMCallbackLookup;
 import org.apache.ws.security.message.token.SecurityTokenReference;
 import org.apache.ws.security.message.token.Timestamp;
 import org.apache.ws.security.str.STRParser;
@@ -45,45 +77,10 @@ import org.apache.ws.security.util.WSSec
 import org.apache.ws.security.util.XmlSchemaDateFormat;
 import org.apache.ws.security.validate.Credential;
 import org.apache.ws.security.validate.Validator;
-
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-
-import javax.xml.crypto.MarshalException;
-import javax.xml.crypto.NodeSetData;
-import javax.xml.crypto.XMLStructure;
-import javax.xml.crypto.dom.DOMStructure;
-import javax.xml.crypto.dsig.Manifest;
-import javax.xml.crypto.dsig.Reference;
-import javax.xml.crypto.dsig.SignedInfo;
-import javax.xml.crypto.dsig.Transform;
-import javax.xml.crypto.dsig.XMLObject;
-import javax.xml.crypto.dsig.XMLSignature;
-import javax.xml.crypto.dsig.XMLSignatureFactory;
-import javax.xml.crypto.dsig.XMLValidateContext;
-import javax.xml.crypto.dsig.dom.DOMValidateContext;
-import javax.xml.crypto.dsig.keyinfo.KeyInfo;
-import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
-import javax.xml.crypto.dsig.keyinfo.KeyValue;
-import javax.xml.crypto.dsig.spec.ExcC14NParameterSpec;
-import javax.xml.crypto.dsig.spec.HMACParameterSpec;
-
-import java.security.Key;
-import java.security.NoSuchProviderException;
-import java.security.PublicKey;
-import java.security.Principal;
-import java.security.cert.X509Certificate;
-import java.security.spec.AlgorithmParameterSpec;
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 public class SignatureProcessor implements Processor {
     private static final org.apache.commons.logging.Log LOG = 
         org.apache.commons.logging.LogFactory.getLog(SignatureProcessor.class);
@@ -724,12 +721,12 @@ public class SignatureProcessor implemen
                     throw new WSSecurityException(WSSecurityException.INVALID_SECURITY, "R5412");
                 }
                 
-                if (WSConstants.C14N_EXCL_OMIT_COMMENTS.equals(algorithm)) {
+                /*if (WSConstants.C14N_EXCL_OMIT_COMMENTS.equals(algorithm)) {
                     parameterSpec = transform.getParameterSpec();
                     if (!(parameterSpec instanceof ExcC14NParameterSpec)) {
                         throw new WSSecurityException(WSSecurityException.INVALID_SECURITY,
"R5407");
                     }
-                } /*else if (STRTransform.TRANSFORM_URI.equals(algorithm)) {
+                } else if (STRTransform.TRANSFORM_URI.equals(algorithm)) {
                     parameterSpec = transform.getParameterSpec();
                     if (!(parameterSpec instanceof ExcC14NParameterSpec)) {
                         bspEnforcer.handleBSPRule(BSPRule.R5413);



Mime
View raw message