ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1152742 - in /webservices/wss4j/branches/1_5_x-fixes: keys/rsa2048.crt keys/rsa2048.jks keys/rsa2048.pem test/rsa2048.properties test/wssec/TestWSSecuritySKI.java
Date Mon, 01 Aug 2011 11:25:30 GMT
Author: coheigea
Date: Mon Aug  1 11:25:29 2011
New Revision: 1152742

URL: http://svn.apache.org/viewvc?rev=1152742&view=rev
Log:
[WSS-300] - Changed the SKI Test to use the attached keystore.

Added:
    webservices/wss4j/branches/1_5_x-fixes/keys/rsa2048.jks   (with props)
Removed:
    webservices/wss4j/branches/1_5_x-fixes/keys/rsa2048.crt
    webservices/wss4j/branches/1_5_x-fixes/keys/rsa2048.pem
Modified:
    webservices/wss4j/branches/1_5_x-fixes/test/rsa2048.properties
    webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecuritySKI.java

Added: webservices/wss4j/branches/1_5_x-fixes/keys/rsa2048.jks
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/keys/rsa2048.jks?rev=1152742&view=auto
==============================================================================
Binary file - no diff available.

Propchange: webservices/wss4j/branches/1_5_x-fixes/keys/rsa2048.jks
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: webservices/wss4j/branches/1_5_x-fixes/test/rsa2048.properties
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/test/rsa2048.properties?rev=1152742&r1=1152741&r2=1152742&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_x-fixes/test/rsa2048.properties (original)
+++ webservices/wss4j/branches/1_5_x-fixes/test/rsa2048.properties Mon Aug  1 11:25:29 2011
@@ -1,5 +1,5 @@
 org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
 org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=security
+org.apache.ws.security.crypto.merlin.keystore.password=password
 org.apache.ws.security.crypto.merlin.keystore.alias=rsa2048
 org.apache.ws.security.crypto.merlin.file=keys/rsa2048.jks

Modified: webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecuritySKI.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecuritySKI.java?rev=1152742&r1=1152741&r2=1152742&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecuritySKI.java (original)
+++ webservices/wss4j/branches/1_5_x-fixes/test/wssec/TestWSSecuritySKI.java Mon Aug  1 11:25:29
2011
@@ -23,7 +23,6 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import java.io.InputStream;
 import java.security.cert.X509Certificate;
 
 import org.apache.ws.security.components.crypto.Crypto;
@@ -63,11 +62,11 @@ public class TestWSSecuritySKI extends T
     public void testRSA2048() throws Exception {
         // Load the keystore
         Crypto crypto = CryptoFactory.getInstance("rsa2048.properties");
-        X509Certificate[] certs = crypto.getCertificates("rsa2048");
+        X509Certificate[] certs = crypto.getCertificates("test");
         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)));
     }
     



Mime
View raw message