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/06/08 14:34:23 UTC
svn commit: r1490970 - 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/
main/java/org/apache/xml/security/stax/impl/processor/output/
main/java/org/apach...
Author: giger
Date: Sat Jun 8 12:34:22 2013
New Revision: 1490970
URL: http://svn.apache.org/r1490970
Log:
- cleanup keyIdentifers and use the same naming as in wss4j
- flag in the security tokens if it was included in the message or not
- enforce that a keyIdentifier and token id is specified
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.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/output/XMLSignatureEndingOutputProcessor.java
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/impl/securityToken/DsaKeyValueSecurityToken.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/ECKeyValueSecurityToken.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/KeyNameSecurityToken.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/RsaKeyValueSecurityToken.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509IssuerSerialSecurityToken.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509SKISecurityToken.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509SecurityToken.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509SubjectNameSecurityToken.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityToken.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityTokenConstants.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/AbstractSignatureVerificationTest.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/SignatureCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java?rev=1490970&r1=1490969&r2=1490970&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java Sat Jun 8 12:34:22 2013
@@ -123,7 +123,7 @@ public class XMLSec {
securityProperties.setSignatureCanonicalizationAlgorithm(XMLSecurityConstants.NS_C14N_EXCL_OMIT_COMMENTS);
}
if (securityProperties.getSignatureKeyIdentifier() == null) {
- securityProperties.setSignatureKeyIdentifier(SecurityTokenConstants.KeyIdentifier_X509IssuerSerial);
+ securityProperties.setSignatureKeyIdentifier(SecurityTokenConstants.KeyIdentifier_IssuerSerial);
}
} else if (XMLSecurityConstants.ENCRYPT.equals(action)) {
if (securityProperties.getEncryptionKeyTransportAlgorithm() == null) {
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=1490970&r1=1490969&r2=1490970&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 Sat Jun 8 12:34:22 2013
@@ -97,7 +97,8 @@ public class XMLEncryptedKeyInputHandler
}
this.securityToken = new AbstractInboundSecurityToken(
- inboundSecurityContext, encryptedKeyType.getId(), null) {
+ inboundSecurityContext, encryptedKeyType.getId(),
+ SecurityTokenConstants.KeyIdentifier_EncryptedKey, true) {
private byte[] decryptedKey = null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java?rev=1490970&r1=1490969&r2=1490970&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java Sat Jun 8 12:34:22 2013
@@ -103,13 +103,13 @@ public class XMLSignatureEndingOutputPro
return;
}
- if (keyIdentifier == null || SecurityTokenConstants.KeyIdentifier_X509IssuerSerial.equals(keyIdentifier)) {
+ if (keyIdentifier == null || SecurityTokenConstants.KeyIdentifier_IssuerSerial.equals(keyIdentifier)) {
XMLSecurityUtils.createX509IssuerSerialStructure(this, outputProcessorChain, x509Certificates);
} else if (SecurityTokenConstants.KeyIdentifier_KeyValue.equals(keyIdentifier)) {
XMLSecurityUtils.createKeyValueTokenStructure(this, outputProcessorChain, x509Certificates);
- } else if (SecurityTokenConstants.KeyIdentifier_X509Ski.equals(keyIdentifier)) {
+ } else if (SecurityTokenConstants.KeyIdentifier_SkiKeyIdentifier.equals(keyIdentifier)) {
XMLSecurityUtils.createX509SubjectKeyIdentifierStructure(this, outputProcessorChain, x509Certificates);
- } else if (SecurityTokenConstants.KeyIdentifier_X509Certificate.equals(keyIdentifier)) {
+ } else if (SecurityTokenConstants.KeyIdentifier_X509KeyIdentifier.equals(keyIdentifier)) {
XMLSecurityUtils.createX509CertificateStructure(this, outputProcessorChain, x509Certificates);
} else if (SecurityTokenConstants.KeyIdentifier_X509SubjectName.equals(keyIdentifier)) {
XMLSecurityUtils.createX509SubjectNameStructure(this, outputProcessorChain, x509Certificates);
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=1490970&r1=1490969&r2=1490970&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 Sat Jun 8 12:34:22 2013
@@ -58,12 +58,24 @@ public abstract class AbstractInboundSec
private PublicKey publicKey;
private X509Certificate[] x509Certificates;
private boolean asymmetric = false;
+ private boolean includedInMessage = false;
+
+ public AbstractInboundSecurityToken(
+ InboundSecurityContext inboundSecurityContext, String id,
+ SecurityTokenConstants.KeyIdentifier keyIdentifier, boolean includedInMessage) {
+
+ if (id == null || id.isEmpty()) {
+ throw new IllegalArgumentException("No id specified");
+ }
+
+ if (keyIdentifier == null) {
+ throw new IllegalArgumentException("No keyIdentifier specified");
+ }
- public AbstractInboundSecurityToken(InboundSecurityContext inboundSecurityContext, String id,
- SecurityTokenConstants.KeyIdentifier keyIdentifier) {
this.inboundSecurityContext = inboundSecurityContext;
this.id = id;
this.keyIdentifier = keyIdentifier;
+ this.includedInMessage = includedInMessage;
}
private void testAndSetInvocation() throws XMLSecurityException {
@@ -267,4 +279,9 @@ public abstract class AbstractInboundSec
public void setKeyWrappingToken(InboundSecurityToken keyWrappingToken) {
this.keyWrappingToken = keyWrappingToken;
}
+
+ @Override
+ public boolean isIncludedInMessage() {
+ return includedInMessage;
+ }
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/DsaKeyValueSecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/DsaKeyValueSecurityToken.java?rev=1490970&r1=1490969&r2=1490970&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/DsaKeyValueSecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/DsaKeyValueSecurityToken.java Sat Jun 8 12:34:22 2013
@@ -21,6 +21,7 @@ package org.apache.xml.security.stax.imp
import org.apache.xml.security.binding.xmldsig.DSAKeyValueType;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.InboundSecurityContext;
+import org.apache.xml.security.stax.impl.util.IDGenerator;
import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
import java.math.BigInteger;
@@ -38,9 +39,8 @@ public class DsaKeyValueSecurityToken ex
private DSAKeyValueType dsaKeyValueType;
- public DsaKeyValueSecurityToken(DSAKeyValueType dsaKeyValueType, InboundSecurityContext inboundSecurityContext,
- SecurityTokenConstants.KeyIdentifier keyIdentifier) throws XMLSecurityException {
- super(inboundSecurityContext, null, keyIdentifier);
+ public DsaKeyValueSecurityToken(DSAKeyValueType dsaKeyValueType, InboundSecurityContext inboundSecurityContext) {
+ super(inboundSecurityContext, IDGenerator.generateID(null), SecurityTokenConstants.KeyIdentifier_KeyValue, true);
this.dsaKeyValueType = dsaKeyValueType;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/ECKeyValueSecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/ECKeyValueSecurityToken.java?rev=1490970&r1=1490969&r2=1490970&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/ECKeyValueSecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/ECKeyValueSecurityToken.java Sat Jun 8 12:34:22 2013
@@ -22,6 +22,7 @@ import org.apache.xml.security.binding.x
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.InboundSecurityContext;
import org.apache.xml.security.stax.impl.algorithms.ECDSAUtils;
+import org.apache.xml.security.stax.impl.util.IDGenerator;
import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
import java.math.BigInteger;
@@ -38,11 +39,9 @@ public class ECKeyValueSecurityToken ext
private ECKeyValueType ecKeyValueType;
- public ECKeyValueSecurityToken(
- ECKeyValueType ecKeyValueType, InboundSecurityContext inboundSecurityContext,
- SecurityTokenConstants.KeyIdentifier keyIdentifier) throws XMLSecurityException {
-
- super(inboundSecurityContext, null, keyIdentifier);
+ public ECKeyValueSecurityToken(ECKeyValueType ecKeyValueType, InboundSecurityContext inboundSecurityContext)
+ throws XMLSecurityException {
+ super(inboundSecurityContext, IDGenerator.generateID(null), SecurityTokenConstants.KeyIdentifier_KeyValue, true);
if (ecKeyValueType.getECParameters() != null) {
throw new XMLSecurityException("stax.ecParametersNotSupported");
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/KeyNameSecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/KeyNameSecurityToken.java?rev=1490970&r1=1490969&r2=1490970&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/KeyNameSecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/KeyNameSecurityToken.java Sat Jun 8 12:34:22 2013
@@ -18,8 +18,8 @@
*/
package org.apache.xml.security.stax.impl.securityToken;
-import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.InboundSecurityContext;
+import org.apache.xml.security.stax.impl.util.IDGenerator;
import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
@@ -31,9 +31,8 @@ public class KeyNameSecurityToken extend
private String keyName;
- public KeyNameSecurityToken(String keyName, InboundSecurityContext inboundSecurityContext,
- SecurityTokenConstants.KeyIdentifier keyIdentifier) throws XMLSecurityException {
- super(inboundSecurityContext, null, keyIdentifier);
+ public KeyNameSecurityToken(String keyName, InboundSecurityContext inboundSecurityContext) {
+ super(inboundSecurityContext, IDGenerator.generateID(null), SecurityTokenConstants.KeyIdentifier_KeyName, false);
this.keyName = keyName;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/RsaKeyValueSecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/RsaKeyValueSecurityToken.java?rev=1490970&r1=1490969&r2=1490970&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/RsaKeyValueSecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/RsaKeyValueSecurityToken.java Sat Jun 8 12:34:22 2013
@@ -21,6 +21,7 @@ package org.apache.xml.security.stax.imp
import org.apache.xml.security.binding.xmldsig.RSAKeyValueType;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.InboundSecurityContext;
+import org.apache.xml.security.stax.impl.util.IDGenerator;
import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
import java.math.BigInteger;
@@ -38,9 +39,8 @@ public class RsaKeyValueSecurityToken ex
private RSAKeyValueType rsaKeyValueType;
- public RsaKeyValueSecurityToken(RSAKeyValueType rsaKeyValueType, InboundSecurityContext inboundSecurityContext,
- SecurityTokenConstants.KeyIdentifier keyIdentifier) throws XMLSecurityException {
- super(inboundSecurityContext, null, keyIdentifier);
+ public RsaKeyValueSecurityToken(RSAKeyValueType rsaKeyValueType, InboundSecurityContext inboundSecurityContext) {
+ super(inboundSecurityContext, IDGenerator.generateID(null), SecurityTokenConstants.KeyIdentifier_KeyValue, true);
this.rsaKeyValueType = rsaKeyValueType;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java?rev=1490970&r1=1490969&r2=1490970&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java Sat Jun 8 12:34:22 2013
@@ -22,6 +22,7 @@ import org.apache.xml.security.binding.x
import org.apache.xml.security.binding.xmldsig11.ECKeyValueType;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.*;
+import org.apache.xml.security.stax.impl.util.IDGenerator;
import org.apache.xml.security.stax.securityToken.SecurityTokenConstants.TokenType;
import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
@@ -65,8 +66,7 @@ public class SecurityTokenFactoryImpl ex
XMLSecurityUtils.getQNameType(keyInfoType.getContent(), XMLSecurityConstants.TAG_dsig_KeyName);
if (keyName != null) {
KeyNameSecurityToken token =
- new KeyNameSecurityToken(keyName, inboundSecurityContext,
- SecurityTokenConstants.KeyIdentifier_KeyName);
+ new KeyNameSecurityToken(keyName, inboundSecurityContext);
setTokenKey(securityProperties, keyUsage, token);
return token;
}
@@ -83,8 +83,8 @@ public class SecurityTokenFactoryImpl ex
if (SecurityTokenConstants.KeyUsage_Signature_Verification.equals(keyUsage)
&& securityProperties.getSignatureVerificationKey() != null) {
AbstractInboundSecurityToken token =
- new AbstractInboundSecurityToken(inboundSecurityContext, null,
- SecurityTokenConstants.KeyIdentifier_NoKeyInfo) {
+ new AbstractInboundSecurityToken(inboundSecurityContext, IDGenerator.generateID(null),
+ SecurityTokenConstants.KeyIdentifier_NoKeyInfo, false) {
@Override
public TokenType getTokenType() {
return SecurityTokenConstants.DefaultToken;
@@ -95,8 +95,8 @@ public class SecurityTokenFactoryImpl ex
} else if (SecurityTokenConstants.KeyUsage_Decryption.equals(keyUsage)
&& securityProperties.getDecryptionKey() != null) {
AbstractInboundSecurityToken token =
- new AbstractInboundSecurityToken(inboundSecurityContext, null,
- SecurityTokenConstants.KeyIdentifier_NoKeyInfo) {
+ new AbstractInboundSecurityToken(inboundSecurityContext, IDGenerator.generateID(null),
+ SecurityTokenConstants.KeyIdentifier_NoKeyInfo, false) {
@Override
public TokenType getTokenType() {
return SecurityTokenConstants.DefaultToken;
@@ -115,20 +115,17 @@ public class SecurityTokenFactoryImpl ex
final RSAKeyValueType rsaKeyValueType =
XMLSecurityUtils.getQNameType(keyValueType.getContent(), XMLSecurityConstants.TAG_dsig_RSAKeyValue);
if (rsaKeyValueType != null) {
- return new RsaKeyValueSecurityToken(rsaKeyValueType, inboundSecurityContext,
- SecurityTokenConstants.KeyIdentifier_KeyValue);
+ return new RsaKeyValueSecurityToken(rsaKeyValueType, inboundSecurityContext);
}
final DSAKeyValueType dsaKeyValueType =
XMLSecurityUtils.getQNameType(keyValueType.getContent(), XMLSecurityConstants.TAG_dsig_DSAKeyValue);
if (dsaKeyValueType != null) {
- return new DsaKeyValueSecurityToken(dsaKeyValueType, inboundSecurityContext,
- SecurityTokenConstants.KeyIdentifier_KeyValue);
+ return new DsaKeyValueSecurityToken(dsaKeyValueType, inboundSecurityContext);
}
final ECKeyValueType ecKeyValueType =
XMLSecurityUtils.getQNameType(keyValueType.getContent(), XMLSecurityConstants.TAG_dsig11_ECKeyValue);
if (ecKeyValueType != null) {
- return new ECKeyValueSecurityToken(ecKeyValueType, inboundSecurityContext,
- SecurityTokenConstants.KeyIdentifier_KeyValue);
+ return new ECKeyValueSecurityToken(ecKeyValueType, inboundSecurityContext);
}
throw new XMLSecurityException("stax.unsupportedKeyValue");
}
@@ -152,7 +149,7 @@ public class SecurityTokenFactoryImpl ex
}
X509SecurityToken token =
new X509SecurityToken(tokenType, inboundSecurityContext,
- "", SecurityTokenConstants.KeyIdentifier_X509Certificate);
+ IDGenerator.generateID(null), SecurityTokenConstants.KeyIdentifier_X509KeyIdentifier, true);
token.setX509Certificates(new X509Certificate[]{cert});
setTokenKey(securityProperties, keyUsage, token);
@@ -172,8 +169,8 @@ public class SecurityTokenFactoryImpl ex
throw new XMLSecurityException("stax.noKey", keyUsage);
}
X509IssuerSerialSecurityToken token =
- new X509IssuerSerialSecurityToken(SecurityTokenConstants.X509V3Token, inboundSecurityContext,
- "", SecurityTokenConstants.KeyIdentifier_X509IssuerSerial);
+ new X509IssuerSerialSecurityToken(
+ SecurityTokenConstants.X509V3Token, inboundSecurityContext, IDGenerator.generateID(null));
token.setIssuerName(issuerSerialType.getX509IssuerName());
token.setSerialNumber(issuerSerialType.getX509SerialNumber());
@@ -192,8 +189,8 @@ public class SecurityTokenFactoryImpl ex
throw new XMLSecurityException("stax.noKey", keyUsage);
}
X509SKISecurityToken token =
- new X509SKISecurityToken(SecurityTokenConstants.X509V3Token, inboundSecurityContext,
- "", SecurityTokenConstants.KeyIdentifier_X509Ski);
+ new X509SKISecurityToken(
+ SecurityTokenConstants.X509V3Token, inboundSecurityContext, IDGenerator.generateID(null));
token.setSkiBytes(skiBytes);
setTokenKey(securityProperties, keyUsage, token);
@@ -213,8 +210,8 @@ public class SecurityTokenFactoryImpl ex
String normalizedSubjectName =
RFC2253Parser.normalize(subjectName);
X509SubjectNameSecurityToken token =
- new X509SubjectNameSecurityToken(SecurityTokenConstants.X509V3Token, inboundSecurityContext,
- "", SecurityTokenConstants.KeyIdentifier_X509SubjectName);
+ new X509SubjectNameSecurityToken(
+ SecurityTokenConstants.X509V3Token, inboundSecurityContext, IDGenerator.generateID(null));
token.setSubjectName(normalizedSubjectName);
setTokenKey(securityProperties, keyUsage, token);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509IssuerSerialSecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509IssuerSerialSecurityToken.java?rev=1490970&r1=1490969&r2=1490970&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509IssuerSerialSecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509IssuerSerialSecurityToken.java Sat Jun 8 12:34:22 2013
@@ -31,9 +31,9 @@ public class X509IssuerSerialSecurityTok
private String issuerName;
private BigInteger serialNumber;
- protected X509IssuerSerialSecurityToken(SecurityTokenConstants.TokenType tokenType, InboundSecurityContext inboundSecurityContext,
- String id, SecurityTokenConstants.KeyIdentifier keyIdentifier) {
- super(tokenType, inboundSecurityContext, id, keyIdentifier);
+ protected X509IssuerSerialSecurityToken(
+ SecurityTokenConstants.TokenType tokenType, InboundSecurityContext inboundSecurityContext, String id) {
+ super(tokenType, inboundSecurityContext, id, SecurityTokenConstants.KeyIdentifier_IssuerSerial, false);
}
public String getIssuerName() {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509SKISecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509SKISecurityToken.java?rev=1490970&r1=1490969&r2=1490970&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509SKISecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509SKISecurityToken.java Sat Jun 8 12:34:22 2013
@@ -29,9 +29,9 @@ public class X509SKISecurityToken extend
private byte[] skiBytes;
- protected X509SKISecurityToken(SecurityTokenConstants.TokenType tokenType, InboundSecurityContext inboundSecurityContext, String id,
- SecurityTokenConstants.KeyIdentifier keyIdentifier) {
- super(tokenType, inboundSecurityContext, id, keyIdentifier);
+ protected X509SKISecurityToken(
+ SecurityTokenConstants.TokenType tokenType, InboundSecurityContext inboundSecurityContext, String id) {
+ super(tokenType, inboundSecurityContext, id, SecurityTokenConstants.KeyIdentifier_SkiKeyIdentifier, false);
}
public byte[] getSkiBytes() {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509SecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509SecurityToken.java?rev=1490970&r1=1490969&r2=1490970&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509SecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509SecurityToken.java Sat Jun 8 12:34:22 2013
@@ -30,9 +30,10 @@ public class X509SecurityToken extends A
private final SecurityTokenConstants.TokenType tokenType;
- protected X509SecurityToken(SecurityTokenConstants.TokenType tokenType, InboundSecurityContext inboundSecurityContext,
- String id, SecurityTokenConstants.KeyIdentifier keyIdentifier) {
- super(inboundSecurityContext, id, keyIdentifier);
+ protected X509SecurityToken(
+ SecurityTokenConstants.TokenType tokenType, InboundSecurityContext inboundSecurityContext,
+ String id, SecurityTokenConstants.KeyIdentifier keyIdentifier, boolean includedInMessage) {
+ super(inboundSecurityContext, id, keyIdentifier, includedInMessage);
this.tokenType = tokenType;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509SubjectNameSecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509SubjectNameSecurityToken.java?rev=1490970&r1=1490969&r2=1490970&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509SubjectNameSecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509SubjectNameSecurityToken.java Sat Jun 8 12:34:22 2013
@@ -29,9 +29,9 @@ public class X509SubjectNameSecurityToke
private String subjectName;
- protected X509SubjectNameSecurityToken(SecurityTokenConstants.TokenType tokenType, InboundSecurityContext inboundSecurityContext,
- String id, SecurityTokenConstants.KeyIdentifier keyIdentifier) {
- super(tokenType, inboundSecurityContext, id, keyIdentifier);
+ protected X509SubjectNameSecurityToken(
+ SecurityTokenConstants.TokenType tokenType, InboundSecurityContext inboundSecurityContext, String id) {
+ super(tokenType, inboundSecurityContext, id, SecurityTokenConstants.KeyIdentifier_X509SubjectName, false);
}
public String getSubjectName() {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityToken.java?rev=1490970&r1=1490969&r2=1490970&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityToken/SecurityToken.java Sat Jun 8 12:34:22 2013
@@ -101,4 +101,10 @@ public interface SecurityToken {
* @return
*/
XMLSecEvent getXMLSecEvent();
+
+ /**
+ * Returns if the token is included in the message or not
+ * @return true if the token is included false otherwise
+ */
+ boolean isIncludedInMessage();
}
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=1490970&r1=1490969&r2=1490970&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 Sat Jun 8 12:34:22 2013
@@ -30,9 +30,9 @@ public class SecurityTokenConstants {
public static final KeyIdentifier KeyIdentifier_KeyValue = new KeyIdentifier("KeyValue");
public static final KeyIdentifier KeyIdentifier_KeyName = new KeyIdentifier("KeyName");
- public static final KeyIdentifier KeyIdentifier_X509IssuerSerial = new KeyIdentifier("X509IssuerSerial");
- public static final KeyIdentifier KeyIdentifier_X509Ski = new KeyIdentifier("X509Ski");
- public static final KeyIdentifier KeyIdentifier_X509Certificate = new KeyIdentifier("X509Certificate");
+ public static final KeyIdentifier KeyIdentifier_IssuerSerial = new KeyIdentifier("IssuerSerial");
+ public static final KeyIdentifier KeyIdentifier_SkiKeyIdentifier = new KeyIdentifier("SkiKeyIdentifier");
+ public static final KeyIdentifier KeyIdentifier_X509KeyIdentifier = new KeyIdentifier("X509KeyIdentifier");
public static final KeyIdentifier KeyIdentifier_X509SubjectName = new KeyIdentifier("X509SubjectName");
public static final KeyIdentifier KeyIdentifier_NoKeyInfo = new KeyIdentifier("NoKeyInfo");
public static final KeyIdentifier KeyIdentifier_EncryptedKey = new KeyIdentifier("EncryptedKey");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.java?rev=1490970&r1=1490969&r2=1490970&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.java Sat Jun 8 12:34:22 2013
@@ -146,7 +146,7 @@ public abstract class AbstractPerformanc
XMLSecurityConstants.SIGNATURE
};
xmlSecurityProperties.setOutAction(actions);
- xmlSecurityProperties.setSignatureKeyIdentifier(SecurityTokenConstants.KeyIdentifier_X509Certificate);
+ xmlSecurityProperties.setSignatureKeyIdentifier(SecurityTokenConstants.KeyIdentifier_X509KeyIdentifier);
xmlSecurityProperties.setSignatureKey(key);
xmlSecurityProperties.setSignatureCerts(new X509Certificate[]{cert});
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=1490970&r1=1490969&r2=1490970&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 Sat Jun 8 12:34:22 2013
@@ -382,13 +382,13 @@ public class AbstractSignatureVerificati
X509SecurityToken x509SecurityToken =
(X509SecurityToken) tokenEvent.getSecurityToken();
assertNotNull(x509SecurityToken);
- if (SecurityTokenConstants.KeyIdentifier_X509Certificate.equals(keyIdentifier)) {
+ if (SecurityTokenConstants.KeyIdentifier_X509KeyIdentifier.equals(keyIdentifier)) {
assertEquals(cert, x509SecurityToken.getX509Certificates()[0]);
} else if (SecurityTokenConstants.KeyIdentifier_X509SubjectName.equals(keyIdentifier)) {
Key processedKey = x509SecurityToken.getPublicKey();
assertEquals(processedKey, cert.getPublicKey());
assertNotNull(((X509SubjectNameSecurityToken) x509SecurityToken).getSubjectName());
- } else if (SecurityTokenConstants.KeyIdentifier_X509IssuerSerial.equals(keyIdentifier)) {
+ } else if (SecurityTokenConstants.KeyIdentifier_IssuerSerial.equals(keyIdentifier)) {
Key processedKey = x509SecurityToken.getPublicKey();
assertEquals(processedKey, cert.getPublicKey());
assertNotNull(((X509IssuerSerialSecurityToken) x509SecurityToken).getIssuerName());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java?rev=1490970&r1=1490969&r2=1490970&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java Sat Jun 8 12:34:22 2013
@@ -50,7 +50,6 @@ import org.apache.xml.security.exception
import org.apache.xml.security.stax.config.Init;
import org.apache.xml.security.stax.ext.InboundXMLSec;
import org.apache.xml.security.stax.ext.XMLSec;
-import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.XMLSecurityProperties;
import org.apache.xml.security.stax.impl.resourceResolvers.ResolverHttp;
import org.apache.xml.security.stax.impl.securityToken.KeyNameSecurityToken;
@@ -997,7 +996,7 @@ public class BaltimoreTest extends org.j
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
- SecurityTokenConstants.KeyIdentifier_X509IssuerSerial);
+ SecurityTokenConstants.KeyIdentifier_IssuerSerial);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1386,7 +1385,7 @@ public class BaltimoreTest extends org.j
// Check the SecurityEvents
checkSignatureToken(securityEventListener, cert.getPublicKey(),
- SecurityTokenConstants.KeyIdentifier_X509IssuerSerial);
+ SecurityTokenConstants.KeyIdentifier_IssuerSerial);
} finally {
TestUtils.switchAllowNotSameDocumentReferences(false);
HttpRequestRedirectorProxy.stopHttpEngine();
@@ -1570,7 +1569,7 @@ public class BaltimoreTest extends org.j
Key processedKey = x509SecurityToken.getPublicKey();
assertEquals(processedKey, key);
assertNotNull(((X509SubjectNameSecurityToken) x509SecurityToken).getSubjectName());
- } else if (SecurityTokenConstants.KeyIdentifier_X509IssuerSerial.equals(keyIdentifier)) {
+ } else if (SecurityTokenConstants.KeyIdentifier_IssuerSerial.equals(keyIdentifier)) {
Key processedKey = x509SecurityToken.getPublicKey();
assertEquals(processedKey, key);
assertNotNull(((X509IssuerSerialSecurityToken) x509SecurityToken).getIssuerName());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java?rev=1490970&r1=1490969&r2=1490970&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/IAIKTest.java Sat Jun 8 12:34:22 2013
@@ -47,7 +47,6 @@ import org.apache.xml.security.exception
import org.apache.xml.security.stax.config.Init;
import org.apache.xml.security.stax.ext.InboundXMLSec;
import org.apache.xml.security.stax.ext.XMLSec;
-import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.XMLSecurityProperties;
import org.apache.xml.security.stax.impl.securityToken.KeyNameSecurityToken;
import org.apache.xml.security.stax.impl.securityToken.X509IssuerSerialSecurityToken;
@@ -398,7 +397,7 @@ public class IAIKTest extends org.junit.
Key processedKey = x509SecurityToken.getPublicKey();
assertEquals(processedKey, key);
assertNotNull(((X509SubjectNameSecurityToken)x509SecurityToken).getSubjectName());
- } else if (SecurityTokenConstants.KeyIdentifier_X509IssuerSerial.equals(keyIdentifier)) {
+ } else if (SecurityTokenConstants.KeyIdentifier_IssuerSerial.equals(keyIdentifier)) {
Key processedKey = x509SecurityToken.getPublicKey();
assertEquals(processedKey, key);
assertNotNull(((X509IssuerSerialSecurityToken)x509SecurityToken).getIssuerName());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java?rev=1490970&r1=1490969&r2=1490970&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java Sat Jun 8 12:34:22 2013
@@ -764,7 +764,7 @@ public class SignatureCreationTest exten
XMLSecurityConstants.Action[] actions =
new XMLSecurityConstants.Action[]{XMLSecurityConstants.SIGNATURE};
properties.setOutAction(actions);
- properties.setSignatureKeyIdentifier(SecurityTokenConstants.KeyIdentifier_X509Ski);
+ properties.setSignatureKeyIdentifier(SecurityTokenConstants.KeyIdentifier_SkiKeyIdentifier);
properties.setSignatureAlgorithm("http://www.w3.org/2000/09/xmldsig#rsa-sha1");
// Set the key up
@@ -809,7 +809,7 @@ public class SignatureCreationTest exten
XMLSecurityConstants.Action[] actions =
new XMLSecurityConstants.Action[]{XMLSecurityConstants.SIGNATURE};
properties.setOutAction(actions);
- properties.setSignatureKeyIdentifier(SecurityTokenConstants.KeyIdentifier_X509Certificate);
+ properties.setSignatureKeyIdentifier(SecurityTokenConstants.KeyIdentifier_X509KeyIdentifier);
// Set the key up
KeyStore keyStore = KeyStore.getInstance("jks");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java?rev=1490970&r1=1490969&r2=1490970&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java Sat Jun 8 12:34:22 2013
@@ -139,7 +139,7 @@ public class SignatureVerificationTest e
checkSecurityEvents(securityEventListener);
checkSignedElementSecurityEvents(securityEventListener);
checkSignatureToken(securityEventListener, cert, null,
- SecurityTokenConstants.KeyIdentifier_X509Certificate);
+ SecurityTokenConstants.KeyIdentifier_X509KeyIdentifier);
SignedElementSecurityEvent signedElementSecurityEvent = securityEventListener.getSecurityEvent(SecurityEventConstants.SignedElement);
X509TokenSecurityEvent x509TokenSecurityEvent = securityEventListener.getSecurityEvent(SecurityEventConstants.X509Token);
@@ -216,7 +216,7 @@ public class SignatureVerificationTest e
checkSecurityEvents(securityEventListener);
checkSignedElementMultipleSecurityEvents(securityEventListener);
checkSignatureToken(securityEventListener, cert, null,
- SecurityTokenConstants.KeyIdentifier_X509Certificate);
+ SecurityTokenConstants.KeyIdentifier_X509KeyIdentifier);
List<SignedElementSecurityEvent> signedElementSecurityEventList = securityEventListener.getSecurityEvents(SecurityEventConstants.SignedElement);
Assert.assertEquals(2, signedElementSecurityEventList.size());
@@ -436,7 +436,7 @@ public class SignatureVerificationTest e
"http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1");
checkSignedElementSecurityEvents(securityEventListener);
checkSignatureToken(securityEventListener, cert, null,
- SecurityTokenConstants.KeyIdentifier_X509Certificate);
+ SecurityTokenConstants.KeyIdentifier_X509KeyIdentifier);
SignedElementSecurityEvent signedElementSecurityEvent = securityEventListener.getSecurityEvent(SecurityEventConstants.SignedElement);
X509TokenSecurityEvent x509TokenSecurityEvent = securityEventListener.getSecurityEvent(SecurityEventConstants.X509Token);
@@ -516,7 +516,7 @@ public class SignatureVerificationTest e
"http://www.w3.org/2000/09/xmldsig#rsa-sha1");
checkSignedElementSecurityEvents(securityEventListener);
checkSignatureToken(securityEventListener, cert, null,
- SecurityTokenConstants.KeyIdentifier_X509Certificate);
+ SecurityTokenConstants.KeyIdentifier_X509KeyIdentifier);
SignedElementSecurityEvent signedElementSecurityEvent = securityEventListener.getSecurityEvent(SecurityEventConstants.SignedElement);
X509TokenSecurityEvent x509TokenSecurityEvent = securityEventListener.getSecurityEvent(SecurityEventConstants.X509Token);
@@ -596,7 +596,7 @@ public class SignatureVerificationTest e
"http://www.w3.org/2000/09/xmldsig#rsa-sha1");
checkSignedElementSecurityEvents(securityEventListener);
checkSignatureToken(securityEventListener, cert, null,
- SecurityTokenConstants.KeyIdentifier_X509Certificate);
+ SecurityTokenConstants.KeyIdentifier_X509KeyIdentifier);
SignedElementSecurityEvent signedElementSecurityEvent = securityEventListener.getSecurityEvent(SecurityEventConstants.SignedElement);
X509TokenSecurityEvent x509TokenSecurityEvent = securityEventListener.getSecurityEvent(SecurityEventConstants.X509Token);
@@ -676,7 +676,7 @@ public class SignatureVerificationTest e
"http://www.w3.org/2001/04/xmldsig-more#rsa-sha256");
checkSignedElementSecurityEvents(securityEventListener);
checkSignatureToken(securityEventListener, cert, null,
- SecurityTokenConstants.KeyIdentifier_X509Certificate);
+ SecurityTokenConstants.KeyIdentifier_X509KeyIdentifier);
SignedElementSecurityEvent signedElementSecurityEvent = securityEventListener.getSecurityEvent(SecurityEventConstants.SignedElement);
X509TokenSecurityEvent x509TokenSecurityEvent = securityEventListener.getSecurityEvent(SecurityEventConstants.X509Token);
@@ -758,7 +758,7 @@ public class SignatureVerificationTest e
checkSecurityEvents(securityEventListener);
checkSignedElementSecurityEvents(securityEventListener);
checkSignatureToken(securityEventListener, cert, null,
- SecurityTokenConstants.KeyIdentifier_X509IssuerSerial);
+ SecurityTokenConstants.KeyIdentifier_IssuerSerial);
SignedElementSecurityEvent signedElementSecurityEvent = securityEventListener.getSecurityEvent(SecurityEventConstants.SignedElement);
X509TokenSecurityEvent x509TokenSecurityEvent = securityEventListener.getSecurityEvent(SecurityEventConstants.X509Token);
@@ -918,7 +918,7 @@ public class SignatureVerificationTest e
checkSecurityEvents(securityEventListener);
checkSignedElementSecurityEvents(securityEventListener);
checkSignatureToken(securityEventListener, cert, null,
- SecurityTokenConstants.KeyIdentifier_X509Ski);
+ SecurityTokenConstants.KeyIdentifier_SkiKeyIdentifier);
SignedElementSecurityEvent signedElementSecurityEvent = securityEventListener.getSecurityEvent(SecurityEventConstants.SignedElement);
X509TokenSecurityEvent x509TokenSecurityEvent = securityEventListener.getSecurityEvent(SecurityEventConstants.X509Token);