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 2014/01/13 17:06:33 UTC
svn commit: r1557759 - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/xml/security/stax/ext/
main/java/org/apache/xml/security/stax/impl/processor/input/
test/java/org/apache/xml/security/test/stax/signature/
Author: coheigea
Date: Mon Jan 13 16:06:32 2014
New Revision: 1557759
URL: http://svn.apache.org/r1557759
Log:
Split Digest AlgorithmUsage into Signature and Encryption, and split C14N into Signature C14N + Transformation algorithms
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureInputHandler.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureVerificationTest.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java?rev=1557759&r1=1557758&r2=1557759&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java Mon Jan 13 16:06:32 2014
@@ -315,8 +315,11 @@ public class XMLSecurityConstants {
public static final AlgorithmUsage Sym_Sig = new AlgorithmUsage("Sym_Sig");
public static final AlgorithmUsage Asym_Sig = new AlgorithmUsage("Asym_Sig");
public static final AlgorithmUsage Enc = new AlgorithmUsage("Enc");
- public static final AlgorithmUsage Dig = new AlgorithmUsage("Dig");
- public static final AlgorithmUsage C14n = new AlgorithmUsage("C14n");
+
+ public static final AlgorithmUsage SigDig = new AlgorithmUsage("SigDig");
+ public static final AlgorithmUsage EncDig = new AlgorithmUsage("EncDig");
+ public static final AlgorithmUsage SigC14n = new AlgorithmUsage("SigC14n");
+ public static final AlgorithmUsage SigTransform = new AlgorithmUsage("SigTransform");
public static class AlgorithmUsage extends ComparableType<AlgorithmUsage> {
public AlgorithmUsage(String name) {
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=1557759&r1=1557758&r2=1557759&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 Mon Jan 13 16:06:32 2014
@@ -276,7 +276,7 @@ public abstract class AbstractSignatureR
AlgorithmSuiteSecurityEvent algorithmSuiteSecurityEvent = new AlgorithmSuiteSecurityEvent();
algorithmSuiteSecurityEvent.setAlgorithmURI(digestMethodAlgorithm);
- algorithmSuiteSecurityEvent.setAlgorithmUsage(XMLSecurityConstants.Dig);
+ algorithmSuiteSecurityEvent.setAlgorithmUsage(XMLSecurityConstants.SigDig);
algorithmSuiteSecurityEvent.setCorrelationID(referenceType.getId());
inboundSecurityContext.registerSecurityEvent(algorithmSuiteSecurityEvent);
@@ -306,7 +306,7 @@ public abstract class AbstractSignatureR
AlgorithmSuiteSecurityEvent algorithmSuiteSecurityEvent = new AlgorithmSuiteSecurityEvent();
algorithmSuiteSecurityEvent.setAlgorithmURI(XMLSecurityConstants.NS_C14N_OMIT_COMMENTS);
- algorithmSuiteSecurityEvent.setAlgorithmUsage(XMLSecurityConstants.C14n);
+ algorithmSuiteSecurityEvent.setAlgorithmUsage(XMLSecurityConstants.SigTransform);
algorithmSuiteSecurityEvent.setCorrelationID(referenceType.getId());
inputProcessorChain.getSecurityContext().registerSecurityEvent(algorithmSuiteSecurityEvent);
@@ -339,7 +339,7 @@ public abstract class AbstractSignatureR
AlgorithmSuiteSecurityEvent algorithmSuiteSecurityEvent = new AlgorithmSuiteSecurityEvent();
algorithmSuiteSecurityEvent.setAlgorithmURI(algorithm);
- algorithmSuiteSecurityEvent.setAlgorithmUsage(XMLSecurityConstants.C14n);
+ algorithmSuiteSecurityEvent.setAlgorithmUsage(XMLSecurityConstants.SigTransform);
algorithmSuiteSecurityEvent.setCorrelationID(referenceType.getId());
inputProcessorChain.getSecurityContext().registerSecurityEvent(algorithmSuiteSecurityEvent);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java?rev=1557759&r1=1557758&r2=1557759&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java Mon Jan 13 16:06:32 2014
@@ -34,6 +34,7 @@ import org.apache.xml.security.stax.ext.
import org.apache.xml.security.stax.impl.securityToken.AbstractInboundSecurityToken;
import org.apache.xml.security.stax.securityToken.SecurityTokenFactory;
import org.apache.xml.security.stax.impl.util.IDGenerator;
+import org.apache.xml.security.stax.securityEvent.AlgorithmSuiteSecurityEvent;
import org.apache.xml.security.stax.securityEvent.EncryptedKeyTokenSecurityEvent;
import org.apache.xml.security.utils.Base64;
@@ -43,6 +44,7 @@ import javax.crypto.spec.OAEPParameterSp
import javax.crypto.spec.PSource;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.bind.JAXBElement;
+
import java.security.*;
import java.security.spec.MGF1ParameterSpec;
import java.util.Deque;
@@ -185,6 +187,12 @@ public class XMLEncryptedKeyInputHandler
XMLSecurityUtils.getQNameType(encryptedKeyType.getEncryptionMethod().getContent(), XMLSecurityConstants.TAG_dsig_DigestMethod);
String jceDigestAlgorithm = "SHA-1";
if (digestMethodType != null) {
+ AlgorithmSuiteSecurityEvent algorithmSuiteSecurityEvent = new AlgorithmSuiteSecurityEvent();
+ algorithmSuiteSecurityEvent.setAlgorithmURI(digestMethodType.getAlgorithm());
+ algorithmSuiteSecurityEvent.setAlgorithmUsage(XMLSecurityConstants.EncDig);
+ algorithmSuiteSecurityEvent.setCorrelationID(correlationID);
+ inboundSecurityContext.registerSecurityEvent(algorithmSuiteSecurityEvent);
+
jceDigestAlgorithm = JCEAlgorithmMapper.translateURItoJCEID(digestMethodType.getAlgorithm());
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureInputHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureInputHandler.java?rev=1557759&r1=1557758&r2=1557759&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureInputHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureInputHandler.java Mon Jan 13 16:06:32 2014
@@ -40,7 +40,7 @@ public class XMLSignatureInputHandler ex
AlgorithmSuiteSecurityEvent algorithmSuiteSecurityEvent = new AlgorithmSuiteSecurityEvent();
algorithmSuiteSecurityEvent.setAlgorithmURI(signatureType.getSignedInfo().getCanonicalizationMethod().getAlgorithm());
- algorithmSuiteSecurityEvent.setAlgorithmUsage(XMLSecurityConstants.C14n);
+ algorithmSuiteSecurityEvent.setAlgorithmUsage(XMLSecurityConstants.SigC14n);
algorithmSuiteSecurityEvent.setCorrelationID(signatureType.getId());
inboundSecurityContext.registerSecurityEvent(algorithmSuiteSecurityEvent);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureVerificationTest.java?rev=1557759&r1=1557758&r2=1557759&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/AbstractSignatureVerificationTest.java Mon Jan 13 16:06:32 2014
@@ -287,7 +287,8 @@ public class AbstractSignatureVerificati
// C14n algorithm
for (SecurityEvent event : algorithmEvents) {
AlgorithmSuiteSecurityEvent algorithmEvent = (AlgorithmSuiteSecurityEvent) event;
- if (XMLSecurityConstants.C14n.equals(algorithmEvent.getAlgorithmUsage())) {
+ if (XMLSecurityConstants.SigC14n.equals(algorithmEvent.getAlgorithmUsage())
+ || XMLSecurityConstants.SigTransform.equals(algorithmEvent.getAlgorithmUsage())) {
assertEquals(c14nAlgorithm, algorithmEvent.getAlgorithmURI());
}
}
@@ -295,7 +296,7 @@ public class AbstractSignatureVerificati
// Digest algorithm
for (SecurityEvent event : algorithmEvents) {
AlgorithmSuiteSecurityEvent algorithmEvent = (AlgorithmSuiteSecurityEvent) event;
- if (XMLSecurityConstants.Dig.equals(algorithmEvent.getAlgorithmUsage())) {
+ if (XMLSecurityConstants.SigDig.equals(algorithmEvent.getAlgorithmUsage())) {
assertEquals(digestAlgorithm, algorithmEvent.getAlgorithmURI());
}
}