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 2012/09/11 18:05:52 UTC
svn commit: r1383463 [2/2] - 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...
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=1383463&r1=1383462&r2=1383463&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 Tue Sep 11 16:05:51 2012
@@ -18,13 +18,12 @@
*/
package org.apache.xml.security.stax.impl.securityToken;
-import java.math.BigInteger;
-
-import javax.security.auth.callback.CallbackHandler;
-
import org.apache.xml.security.stax.ext.SecurityContext;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import javax.security.auth.callback.CallbackHandler;
+import java.math.BigInteger;
+
/**
* @author $Author: coheigea $
* @version $Revision: 1354898 $ $Date: 2012-06-28 11:19:02 +0100 (Thu, 28 Jun 2012) $
@@ -34,8 +33,8 @@ public class X509IssuerSerialSecurityTok
private BigInteger serialNumber;
protected X509IssuerSerialSecurityToken(XMLSecurityConstants.TokenType tokenType, SecurityContext securityContext,
- CallbackHandler callbackHandler, String id,
- XMLSecurityConstants.KeyIdentifierType keyIdentifierType) {
+ CallbackHandler callbackHandler, String id,
+ XMLSecurityConstants.KeyIdentifierType keyIdentifierType) {
super(tokenType, securityContext, callbackHandler, id, keyIdentifierType);
}
@@ -54,5 +53,4 @@ public class X509IssuerSerialSecurityTok
public void setSerialNumber(BigInteger serialNumber) {
this.serialNumber = serialNumber;
}
-
}
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=1383463&r1=1383462&r2=1383463&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 Tue Sep 11 16:05:51 2012
@@ -18,22 +18,22 @@
*/
package org.apache.xml.security.stax.impl.securityToken;
-import javax.security.auth.callback.CallbackHandler;
-
import org.apache.xml.security.stax.ext.SecurityContext;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import javax.security.auth.callback.CallbackHandler;
+
/**
* @author $Author: coheigea $
* @version $Revision: 1354898 $ $Date: 2012-06-28 11:19:02 +0100 (Thu, 28 Jun 2012) $
*/
public class X509SKISecurityToken extends X509SecurityToken {
-
+
private byte[] skiBytes;
protected X509SKISecurityToken(XMLSecurityConstants.TokenType tokenType, SecurityContext securityContext,
- CallbackHandler callbackHandler, String id,
- XMLSecurityConstants.KeyIdentifierType keyIdentifierType) {
+ CallbackHandler callbackHandler, String id,
+ XMLSecurityConstants.KeyIdentifierType keyIdentifierType) {
super(tokenType, securityContext, callbackHandler, id, keyIdentifierType);
}
@@ -44,6 +44,4 @@ public class X509SKISecurityToken extend
public void setSkiBytes(byte[] skiBytes) {
this.skiBytes = skiBytes;
}
-
-
}
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=1383463&r1=1383462&r2=1383463&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 Tue Sep 11 16:05:51 2012
@@ -18,24 +18,18 @@
*/
package org.apache.xml.security.stax.impl.securityToken;
-import java.security.Key;
-import java.security.PublicKey;
-import java.security.cert.X509Certificate;
-
-import javax.security.auth.callback.CallbackHandler;
-
import org.apache.xml.security.stax.ext.SecurityContext;
-import org.apache.xml.security.stax.ext.SecurityToken;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.XMLSecurityException;
+import javax.security.auth.callback.CallbackHandler;
+
/**
* @author $Author: coheigea $
* @version $Revision: 1354898 $ $Date: 2012-06-28 11:19:02 +0100 (Thu, 28 Jun 2012) $
*/
-public class X509SecurityToken extends AbstractSecurityToken {
- private X509Certificate[] x509Certificates;
- private Key key;
+public class X509SecurityToken extends AbstractInboundSecurityToken {
+
private final XMLSecurityConstants.TokenType tokenType;
protected X509SecurityToken(XMLSecurityConstants.TokenType tokenType, SecurityContext securityContext,
@@ -46,48 +40,11 @@ public class X509SecurityToken extends A
}
@Override
- public boolean isAsymmetric() {
+ public boolean isAsymmetric() throws XMLSecurityException {
return true;
}
@Override
- public Key getKey(String algorithmURI, XMLSecurityConstants.KeyUsage keyUsage, String correlationID) throws XMLSecurityException {
- return key;
- }
-
- public void setKey(Key key) {
- this.key = key;
- }
-
- @Override
- public PublicKey getPubKey(String algorithmURI, XMLSecurityConstants.KeyUsage keyUsage, String correlationID) throws XMLSecurityException {
- X509Certificate[] x509Certificates = getX509Certificates();
- if (x509Certificates == null || x509Certificates.length == 0) {
- //todo review: getKey should always return the priv-key resp. the secret and not a public key
- //todo review SecurityTokenFactoryImpl too where setKey() is called.
- if (getKey(algorithmURI, keyUsage, correlationID) instanceof PublicKey) {
- return (PublicKey)getKey(algorithmURI, keyUsage, correlationID);
- }
- return null;
- }
- return x509Certificates[0].getPublicKey();
- }
-
- @Override
- public X509Certificate[] getX509Certificates() throws XMLSecurityException {
- return this.x509Certificates;
- }
-
- public void setX509Certificates(X509Certificate[] x509Certificates) {
- this.x509Certificates = x509Certificates;
- }
-
- @Override
- public SecurityToken getKeyWrappingToken() {
- return null;
- }
-
- @Override
public XMLSecurityConstants.TokenType getTokenType() {
return 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=1383463&r1=1383462&r2=1383463&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 Tue Sep 11 16:05:51 2012
@@ -18,22 +18,22 @@
*/
package org.apache.xml.security.stax.impl.securityToken;
-import javax.security.auth.callback.CallbackHandler;
-
import org.apache.xml.security.stax.ext.SecurityContext;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import javax.security.auth.callback.CallbackHandler;
+
/**
* @author $Author: coheigea $
* @version $Revision: 1354898 $ $Date: 2012-06-28 11:19:02 +0100 (Thu, 28 Jun 2012) $
*/
public class X509SubjectNameSecurityToken extends X509SecurityToken {
-
+
private String subjectName;
protected X509SubjectNameSecurityToken(XMLSecurityConstants.TokenType tokenType, SecurityContext securityContext,
- CallbackHandler callbackHandler, String id,
- XMLSecurityConstants.KeyIdentifierType keyIdentifierType) {
+ CallbackHandler callbackHandler, String id,
+ XMLSecurityConstants.KeyIdentifierType keyIdentifierType) {
super(tokenType, securityContext, callbackHandler, id, keyIdentifierType);
}
@@ -44,5 +44,4 @@ public class X509SubjectNameSecurityToke
public void setSubjectName(String subjectName) {
this.subjectName = subjectName;
}
-
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/KeyValueTokenSecurityEvent.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/KeyValueTokenSecurityEvent.java?rev=1383463&r1=1383462&r2=1383463&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/KeyValueTokenSecurityEvent.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/KeyValueTokenSecurityEvent.java Tue Sep 11 16:05:51 2012
@@ -38,7 +38,7 @@ public class KeyValueTokenSecurityEvent
public KeyValueTokenType getKeyValueTokenType() {
try {
- String algo = getSecurityToken().getPublicKey(null, null, null).getAlgorithm();
+ String algo = getSecurityToken().getPublicKey().getAlgorithm();
return KeyValueTokenType.valueOf(algo);
} catch (IllegalArgumentException e) {
return null;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java?rev=1383463&r1=1383462&r2=1383463&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java Tue Sep 11 16:05:51 2012
@@ -150,8 +150,8 @@ public class DecryptionTest extends org.
// Check the SecurityEvents
checkEncryptedElementSecurityEvents(securityEventListener);
- checkEncryptionToken(securityEventListener, null, secretKey,
- XMLSecurityConstants.XMLKeyIdentifierType.NO_KEY_INFO, "");
+ checkEncryptionToken(securityEventListener, null, secretKey,
+ XMLSecurityConstants.XMLKeyIdentifierType.NO_KEY_INFO , "");
checkEncryptionMethod(
securityEventListener, "http://www.w3.org/2001/04/xmlenc#tripledes-cbc", null);
}
@@ -206,7 +206,7 @@ public class DecryptionTest extends org.
// Check the SecurityEvents
checkEncryptedContentSecurityEvents(securityEventListener);
- checkEncryptionToken(securityEventListener, null, secretKey,
+ checkEncryptionToken(securityEventListener, null, secretKey,
XMLSecurityConstants.XMLKeyIdentifierType.NO_KEY_INFO, "");
checkEncryptionMethod(
securityEventListener, "http://www.w3.org/2001/04/xmlenc#tripledes-cbc", null);
@@ -263,7 +263,7 @@ public class DecryptionTest extends org.
// Check the SecurityEvents
checkEncryptedElementSecurityEvents(securityEventListener);
- checkEncryptionToken(securityEventListener, null, secretKey,
+ checkEncryptionToken(securityEventListener, null, secretKey,
XMLSecurityConstants.XMLKeyIdentifierType.NO_KEY_INFO, "");
checkEncryptionMethod(
securityEventListener, "http://www.w3.org/2001/04/xmlenc#aes256-cbc", null);
@@ -323,7 +323,7 @@ public class DecryptionTest extends org.
// Check the SecurityEvents
checkMultipleEncryptedElementSecurityEvents(securityEventListener);
- checkEncryptionToken(securityEventListener, null, secretKey,
+ checkEncryptionToken(securityEventListener, null, secretKey,
XMLSecurityConstants.XMLKeyIdentifierType.NO_KEY_INFO, "");
checkEncryptionMethod(
securityEventListener, "http://www.w3.org/2001/04/xmlenc#tripledes-cbc", null);
@@ -388,7 +388,7 @@ public class DecryptionTest extends org.
// Check the SecurityEvents
checkEncryptedContentSecurityEvents(securityEventListener);
- checkEncryptionToken(securityEventListener, null, secretKey,
+ checkEncryptionToken(securityEventListener, null, secretKey,
XMLSecurityConstants.XMLKeyIdentifierType.ENCRYPTED_KEY,
"http://www.w3.org/2001/04/xmlenc#aes128-cbc");
checkEncryptionMethod(
@@ -453,11 +453,11 @@ public class DecryptionTest extends org.
// Check the CreditCard decrypted ok
nodeList = document.getElementsByTagNameNS("urn:example:po", "CreditCard");
- Assert.assertEquals(nodeList.getLength(), 1);
+ Assert.assertEquals(1, nodeList.getLength());
// Check the SecurityEvents
checkEncryptedContentSecurityEvents(securityEventListener);
- checkEncryptionToken(securityEventListener, null, secretKey,
+ checkEncryptionToken(securityEventListener, null, secretKey,
XMLSecurityConstants.XMLKeyIdentifierType.ENCRYPTED_KEY,
"http://www.w3.org/2001/04/xmlenc#aes256-cbc");
checkEncryptionMethod(
@@ -526,7 +526,7 @@ public class DecryptionTest extends org.
// Check the SecurityEvents
checkEncryptedContentSecurityEvents(securityEventListener);
- checkEncryptionToken(securityEventListener, null, secretKey,
+ checkEncryptionToken(securityEventListener, null, secretKey,
XMLSecurityConstants.XMLKeyIdentifierType.ENCRYPTED_KEY,
"http://www.w3.org/2001/04/xmlenc#aes192-cbc");
checkEncryptionMethod(
@@ -586,7 +586,7 @@ public class DecryptionTest extends org.
// Check the SecurityEvents
checkEncryptedElementSecurityEvents(securityEventListener);
- checkEncryptionToken(securityEventListener, null, secretKey,
+ checkEncryptionToken(securityEventListener, null, secretKey,
XMLSecurityConstants.XMLKeyIdentifierType.NO_KEY_INFO, "");
checkEncryptionMethod(
securityEventListener, "http://www.w3.org/2001/04/xmlenc#tripledes-cbc", "");
@@ -646,7 +646,7 @@ public class DecryptionTest extends org.
// Check the SecurityEvents
checkEncryptedElementSecurityEvents(securityEventListener);
- checkEncryptionToken(securityEventListener, null, secretKey,
+ checkEncryptionToken(securityEventListener, null, secretKey,
XMLSecurityConstants.XMLKeyIdentifierType.NO_KEY_INFO, "");
checkEncryptionMethod(
securityEventListener, "http://www.w3.org/2001/04/xmlenc#aes128-cbc", "");
@@ -708,7 +708,7 @@ public class DecryptionTest extends org.
// Check the SecurityEvents
checkEncryptedElementSecurityEvents(securityEventListener);
- checkEncryptionToken(securityEventListener, null, secretKey,
+ checkEncryptionToken(securityEventListener, null, secretKey,
XMLSecurityConstants.XMLKeyIdentifierType.NO_KEY_INFO, "");
checkEncryptionMethod(
securityEventListener, "http://www.w3.org/2001/04/xmlenc#aes192-cbc", "");
@@ -772,7 +772,7 @@ public class DecryptionTest extends org.
// Check the SecurityEvents
checkEncryptedElementSecurityEvents(securityEventListener);
- checkEncryptionToken(securityEventListener, null, secretKey,
+ checkEncryptionToken(securityEventListener, null, secretKey,
XMLSecurityConstants.XMLKeyIdentifierType.NO_KEY_INFO, "");
checkEncryptionMethod(
securityEventListener, "http://www.w3.org/2001/04/xmlenc#aes256-cbc", "");
@@ -831,7 +831,7 @@ public class DecryptionTest extends org.
Assert.assertEquals(nodeList.getLength(), 1);
// Check the SecurityEvents
- checkEncryptionToken(securityEventListener, null, secretKey,
+ checkEncryptionToken(securityEventListener, null, secretKey,
XMLSecurityConstants.XMLKeyIdentifierType.NO_KEY_INFO, "");
checkEncryptionMethod(
securityEventListener, "http://www.w3.org/2001/04/xmlenc#tripledes-cbc", "");
@@ -896,7 +896,7 @@ public class DecryptionTest extends org.
assertEquals("ns2.com", attr.getValue());
// Check the SecurityEvents
- checkEncryptionToken(securityEventListener, null, secretKey,
+ checkEncryptionToken(securityEventListener, null, secretKey,
XMLSecurityConstants.XMLKeyIdentifierType.NO_KEY_INFO, "");
checkEncryptionMethod(
securityEventListener, "http://www.w3.org/2001/04/xmlenc#tripledes-cbc", "");
@@ -961,7 +961,7 @@ public class DecryptionTest extends org.
assertEquals("", attr.getValue());
// Check the SecurityEvents
- checkEncryptionToken(securityEventListener, null, secretKey,
+ checkEncryptionToken(securityEventListener, null, secretKey,
XMLSecurityConstants.XMLKeyIdentifierType.NO_KEY_INFO, "");
checkEncryptionMethod(
securityEventListener, "http://www.w3.org/2001/04/xmlenc#tripledes-cbc", "");
@@ -1075,23 +1075,21 @@ public class DecryptionTest extends org.
protected void checkEncryptionToken(
TestSecurityEventListener securityEventListener,
- X509Certificate cert,
- Key key,
+ X509Certificate cert, Key key,
XMLSecurityConstants.XMLKeyIdentifierType keyIdentifierType,
- String algorithm
- ) throws XMLSecurityException {
+ String algorithm) throws XMLSecurityException {
if (keyIdentifierType == XMLSecurityConstants.XMLKeyIdentifierType.NO_KEY_INFO) {
DefaultTokenSecurityEvent tokenEvent =
(DefaultTokenSecurityEvent) securityEventListener.getSecurityEvent(SecurityEventConstants.DefaultToken);
assertNotNull(tokenEvent);
- Key processedKey = tokenEvent.getSecurityToken().getSecretKey("", null, null);
+ Key processedKey = tokenEvent.getSecurityToken().getSecretKey().values().iterator().next();
assertEquals(processedKey, key);
} else if (keyIdentifierType == XMLSecurityConstants.XMLKeyIdentifierType.ENCRYPTED_KEY) {
EncryptedKeyTokenSecurityEvent tokenEvent =
(EncryptedKeyTokenSecurityEvent) securityEventListener.getSecurityEvent(
SecurityEventConstants.EncryptedKeyToken);
assertNotNull(tokenEvent);
- Key processedKey = tokenEvent.getSecurityToken().getSecretKey(algorithm, null, null);
+ Key processedKey = tokenEvent.getSecurityToken().getSecretKey().values().iterator().next();
assertEquals(processedKey, key);
}
}
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=1383463&r1=1383462&r2=1383463&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 Tue Sep 11 16:05:51 2012
@@ -361,13 +361,13 @@ public class AbstractSignatureVerificati
DefaultTokenSecurityEvent tokenEvent =
(DefaultTokenSecurityEvent) securityEventListener.getSecurityEvent(SecurityEventConstants.DefaultToken);
assertNotNull(tokenEvent);
- Key processedKey = tokenEvent.getSecurityToken().getSecretKey("", null, null);
+ Key processedKey = tokenEvent.getSecurityToken().getSecretKey().values().iterator().next();
assertEquals(processedKey, key);
} else if (keyIdentifierType == XMLSecurityConstants.XMLKeyIdentifierType.KEY_NAME) {
KeyNameTokenSecurityEvent tokenEvent =
(KeyNameTokenSecurityEvent) securityEventListener.getSecurityEvent(SecurityEventConstants.KeyNameToken);
assertNotNull(tokenEvent);
- Key processedKey = tokenEvent.getSecurityToken().getSecretKey("", null, null);
+ Key processedKey = tokenEvent.getSecurityToken().getSecretKey().values().iterator().next();
assertEquals(processedKey, key);
assertNotNull(((KeyNameSecurityToken) tokenEvent.getSecurityToken()).getKeyName());
} else {
@@ -382,12 +382,12 @@ public class AbstractSignatureVerificati
assertEquals(cert, x509SecurityToken.getX509Certificates()[0]);
} else if (keyIdentifierType ==
XMLSecurityConstants.XMLKeyIdentifierType.X509_SUBJECT_NAME) {
- Key processedKey = x509SecurityToken.getKey("", null, null);
+ Key processedKey = x509SecurityToken.getPublicKey();
assertEquals(processedKey, cert.getPublicKey());
assertNotNull(((X509SubjectNameSecurityToken) x509SecurityToken).getSubjectName());
} else if (keyIdentifierType ==
XMLSecurityConstants.XMLKeyIdentifierType.X509_ISSUER_SERIAL) {
- Key processedKey = x509SecurityToken.getKey("", null, null);
+ Key processedKey = x509SecurityToken.getPublicKey();
assertEquals(processedKey, cert.getPublicKey());
assertNotNull(((X509IssuerSerialSecurityToken) x509SecurityToken).getIssuerName());
assertNotNull(((X509IssuerSerialSecurityToken) x509SecurityToken).getSerialNumber());
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=1383463&r1=1383462&r2=1383463&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 Tue Sep 11 16:05:51 2012
@@ -1488,17 +1488,17 @@ public class BaltimoreTest extends org.j
DefaultTokenSecurityEvent tokenEvent =
(DefaultTokenSecurityEvent) securityEventListener.getSecurityEvent(SecurityEventConstants.DefaultToken);
assertNotNull(tokenEvent);
- Key processedKey = tokenEvent.getSecurityToken().getSecretKey("", null, null);
+ Key processedKey = tokenEvent.getSecurityToken().getSecretKey().values().iterator().next();
assertEquals(processedKey, key);
} else if (keyIdentifierType == XMLSecurityConstants.XMLKeyIdentifierType.KEY_NAME) {
KeyNameTokenSecurityEvent tokenEvent =
(KeyNameTokenSecurityEvent) securityEventListener.getSecurityEvent(SecurityEventConstants.KeyNameToken);
assertNotNull(tokenEvent);
if (key instanceof SecretKey) {
- Key processedKey = tokenEvent.getSecurityToken().getSecretKey("", null, null);
+ Key processedKey = tokenEvent.getSecurityToken().getSecretKey().values().iterator().next();
assertEquals(processedKey, key);
} else {
- Key processedKey = tokenEvent.getSecurityToken().getPublicKey("", null, null);
+ Key processedKey = tokenEvent.getSecurityToken().getPublicKey();
assertEquals(processedKey, key);
}
assertNotNull(((KeyNameSecurityToken) tokenEvent.getSecurityToken()).getKeyName());
@@ -1511,12 +1511,12 @@ public class BaltimoreTest extends org.j
assertNotNull(x509SecurityToken);
if (keyIdentifierType ==
XMLSecurityConstants.XMLKeyIdentifierType.X509_SUBJECT_NAME) {
- Key processedKey = x509SecurityToken.getKey("", null, null);
+ Key processedKey = x509SecurityToken.getPublicKey();
assertEquals(processedKey, key);
assertNotNull(((X509SubjectNameSecurityToken) x509SecurityToken).getSubjectName());
} else if (keyIdentifierType ==
XMLSecurityConstants.XMLKeyIdentifierType.X509_ISSUER_SERIAL) {
- Key processedKey = x509SecurityToken.getKey("", null, null);
+ Key processedKey = x509SecurityToken.getPublicKey();
assertEquals(processedKey, key);
assertNotNull(((X509IssuerSerialSecurityToken) x509SecurityToken).getIssuerName());
assertNotNull(((X509IssuerSerialSecurityToken) x509SecurityToken).getSerialNumber());
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=1383463&r1=1383462&r2=1383463&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 Tue Sep 11 16:05:51 2012
@@ -367,13 +367,13 @@ public class IAIKTest extends org.junit.
DefaultTokenSecurityEvent tokenEvent =
(DefaultTokenSecurityEvent)securityEventListener.getSecurityEvent(SecurityEventConstants.DefaultToken);
assertNotNull(tokenEvent);
- Key processedKey = tokenEvent.getSecurityToken().getSecretKey("", null, null);
+ Key processedKey = tokenEvent.getSecurityToken().getSecretKey().values().iterator().next();
assertEquals(processedKey, key);
} else if (keyIdentifierType == XMLSecurityConstants.XMLKeyIdentifierType.KEY_NAME) {
KeyNameTokenSecurityEvent tokenEvent =
(KeyNameTokenSecurityEvent)securityEventListener.getSecurityEvent(SecurityEventConstants.KeyNameToken);
assertNotNull(tokenEvent);
- Key processedKey = tokenEvent.getSecurityToken().getSecretKey("", null, null);
+ Key processedKey = tokenEvent.getSecurityToken().getSecretKey().values().iterator().next();
assertEquals(processedKey, key);
assertNotNull(((KeyNameSecurityToken)tokenEvent.getSecurityToken()).getKeyName());
} else {
@@ -385,12 +385,12 @@ public class IAIKTest extends org.junit.
assertNotNull(x509SecurityToken);
if (keyIdentifierType ==
XMLSecurityConstants.XMLKeyIdentifierType.X509_SUBJECT_NAME) {
- Key processedKey = x509SecurityToken.getKey("", null, null);
+ Key processedKey = x509SecurityToken.getPublicKey();
assertEquals(processedKey, key);
assertNotNull(((X509SubjectNameSecurityToken)x509SecurityToken).getSubjectName());
} else if (keyIdentifierType ==
XMLSecurityConstants.XMLKeyIdentifierType.X509_ISSUER_SERIAL) {
- Key processedKey = x509SecurityToken.getKey("", null, null);
+ Key processedKey = x509SecurityToken.getPublicKey();
assertEquals(processedKey, key);
assertNotNull(((X509IssuerSerialSecurityToken)x509SecurityToken).getIssuerName());
assertNotNull(((X509IssuerSerialSecurityToken)x509SecurityToken).getSerialNumber());