You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2011/08/01 13:27:09 UTC
svn commit: r1152743 - in /webservices/wss4j/trunk/src/test:
java/org/apache/ws/security/components/crypto/SKITest.java
resources/keys/rsa2048.crt resources/keys/rsa2048.jks
resources/keys/rsa2048.pem
Author: coheigea
Date: Mon Aug 1 11:27:07 2011
New Revision: 1152743
URL: http://svn.apache.org/viewvc?rev=1152743&view=rev
Log:
[WSS-300] - Changed the keystore for the SKI test.
Added:
webservices/wss4j/trunk/src/test/resources/keys/rsa2048.jks (with props)
Removed:
webservices/wss4j/trunk/src/test/resources/keys/rsa2048.crt
webservices/wss4j/trunk/src/test/resources/keys/rsa2048.pem
Modified:
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/SKITest.java
Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/SKITest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/SKITest.java?rev=1152743&r1=1152742&r2=1152743&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/SKITest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/components/crypto/SKITest.java Mon Aug 1 11:27:07 2011
@@ -67,16 +67,16 @@ public class SKITest extends org.junit.A
KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
ClassLoader loader = Loader.getClassLoader(CryptoTest.class);
InputStream input = Merlin.loadInputStream(loader, "keys/rsa2048.jks");
- keyStore.load(input, "security".toCharArray());
+ keyStore.load(input, "password".toCharArray());
((Merlin)crypto).setKeyStore(keyStore);
CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
- cryptoType.setAlias("rsa2048");
+ cryptoType.setAlias("test");
X509Certificate[] certs = crypto.getX509Certificates(cryptoType);
assertTrue(certs != null && certs.length > 0);
byte[] skiBytes = crypto.getSKIBytesFromCert(certs[0]);
- String knownBase64Encoding = "39rBJRcGsSn7u07V+a5hhs4+4V0=";
+ String knownBase64Encoding = "tgkZUMZ461ZSA1nZkBu6E5GDxLM=";
assertTrue(knownBase64Encoding.equals(Base64.encode(skiBytes)));
}
}
Added: webservices/wss4j/trunk/src/test/resources/keys/rsa2048.jks
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/resources/keys/rsa2048.jks?rev=1152743&view=auto
==============================================================================
Binary file - no diff available.
Propchange: webservices/wss4j/trunk/src/test/resources/keys/rsa2048.jks
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream