You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by gi...@apache.org on 2013/07/31 17:30:39 UTC

svn commit: r1508922 - in /santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax: impl/securityToken/AbstractInboundSecurityToken.java securityEvent/AlgorithmSuiteSecurityEvent.java securityToken/SecurityTokenConstants.java

Author: giger
Date: Wed Jul 31 15:30:38 2013
New Revision: 1508922

URL: http://svn.apache.org/r1508922
Log:
In preparation for WSS-472 - Incorrect Symmetric Key Derivation Length validation 

Modified:
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/AlgorithmSuiteSecurityEvent.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenConstants.java

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java?rev=1508922&r1=1508921&r2=1508922&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java Wed Jul 31 15:30:38 2013
@@ -165,6 +165,10 @@ public abstract class AbstractInboundSec
             algorithmSuiteSecurityEvent.setAlgorithmURI(algorithmURI);
             algorithmSuiteSecurityEvent.setAlgorithmUsage(algorithmUsage);
             algorithmSuiteSecurityEvent.setCorrelationID(correlationID);
+
+            if (SecurityTokenConstants.DerivedKeyToken.equals(getTokenType())) {
+                algorithmSuiteSecurityEvent.setDerivedKey(true);
+            }
             if (key instanceof RSAKey) {
                 algorithmSuiteSecurityEvent.setKeyLength(((RSAKey) key).getModulus().bitLength());
             } else if (key instanceof DSAKey) {

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/AlgorithmSuiteSecurityEvent.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/AlgorithmSuiteSecurityEvent.java?rev=1508922&r1=1508921&r2=1508922&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/AlgorithmSuiteSecurityEvent.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/AlgorithmSuiteSecurityEvent.java Wed Jul 31 15:30:38 2013
@@ -31,6 +31,7 @@ public class AlgorithmSuiteSecurityEvent
     //chapter 6.1
 
     private int keyLength;
+    private boolean derivedKey = false;
     private String algorithmURI;
     private XMLSecurityConstants.AlgorithmUsage algorithmUsage;
 
@@ -46,6 +47,14 @@ public class AlgorithmSuiteSecurityEvent
         this.keyLength = keyLength;
     }
 
+    public boolean isDerivedKey() {
+        return derivedKey;
+    }
+
+    public void setDerivedKey(boolean derivedKey) {
+        this.derivedKey = derivedKey;
+    }
+
     public String getAlgorithmURI() {
         return algorithmURI;
     }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenConstants.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenConstants.java?rev=1508922&r1=1508921&r2=1508922&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenConstants.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenConstants.java Wed Jul 31 15:30:38 2013
@@ -45,6 +45,7 @@ public class SecurityTokenConstants {
     public static final TokenType KeyValueToken = new TokenType("KeyValueToken");
     public static final TokenType KeyNameToken = new TokenType("KeyNameToken");
     public static final TokenType DefaultToken = new TokenType("DefaultToken");
+    public static final TokenType DerivedKeyToken = new TokenType("DerivedKeyToken");
 
 
     public static class TokenUsage extends ComparableType<TokenUsage> {