river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r1235231 - in /river/jtsk/skunk/peterConcurrentPolicy/qa: ./ jtreg/certs/ jtreg/certs/keys/ jtreg/certs/keys/old/ jtreg/certs/keystores/ jtreg/certs/requests/
Date Tue, 24 Jan 2012 12:55:34 GMT
Author: peter_firmstone
Date: Tue Jan 24 12:55:33 2012
New Revision: 1235231

URL: http://svn.apache.org/viewvc?rev=1235231&view=rev
Log:
River-404

Bouncy castle based self signed certificate generator to replace DSTC JCSI.

Added:
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/CA.class   (with props)
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/old/
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/old/test-ca1.cert   (with props)
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/old/test-ca1.key   (with props)
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/old/test-ca2.cert   (with props)
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/old/test-ca2.key   (with props)
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1A.request
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1B.request
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1C.request
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1D.request
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1E.request
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2A.request
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2B.request
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2C.request
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2D.request
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2E.request
Modified:
    river/jtsk/skunk/peterConcurrentPolicy/qa/build.xml
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/CA.java
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/Makefile
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/test-ca1.cert
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/test-ca1.key
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/test-ca2.cert
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/test-ca2.key
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-ca.truststore
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-ca1.truststore
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1A.keystore
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1B.keystore
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1C.keystore
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1D.keystore
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1E.keystore
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2A.keystore
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2B.keystore
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2C.keystore
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2D.keystore
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2E.keystore
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/users.truststore
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/run-ca.sh
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/test-ca1.properties
    river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/test-ca2.properties

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/build.xml
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/build.xml?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/qa/build.xml (original)
+++ river/jtsk/skunk/peterConcurrentPolicy/qa/build.xml Tue Jan 24 12:55:33 2012
@@ -227,7 +227,7 @@
             <!--<arg value="net/jini/security/policy/DynamicPolicyProvider/dynamicBasePolicy/Test.java"/>-->
             <!--<arg value="net/jini/security/Security/implicitGrants/Test.java"/>-->
             <!--<arg value="net/jini/security/GrantPermission/implies/Test.java" />-->
-            <arg value="net/jini/url/httpmd/TestEqual.java"/>
+            <!--<arg value="net/jini/url/httpmd/TestEqual.java"/>-->
         </jtreg>
         <move todir="${river.lib.dir}">
             <filelist dir="${jtreg.dir}/JTlib-tmp">

Added: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/CA.class
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/CA.class?rev=1235231&view=auto
==============================================================================
Binary file - no diff available.

Propchange: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/CA.class
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/CA.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/CA.java?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/CA.java (original)
+++ river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/CA.java Tue Jan 24 12:55:33 2012
@@ -17,12 +17,17 @@
  */
 //import com.dstc.security.pki.ConsoleCATool;
 //import com.dstc.security.provider.DSTC;
+import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.math.BigInteger;
 import java.security.InvalidKeyException;
+import java.security.Key;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.NoSuchAlgorithmException;
@@ -33,11 +38,16 @@ import java.security.SecureRandom;
 import java.security.Security;
 import java.security.SignatureException;
 import java.security.cert.Certificate;
+import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
+import java.security.spec.InvalidKeySpecException;
 import java.util.Date;
 import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
 import javax.security.auth.x500.X500Principal;
 import org.bouncycastle.cert.X509CertificateHolder;
 import org.bouncycastle.cert.X509v1CertificateBuilder;
@@ -54,17 +64,19 @@ import org.bouncycastle.operator.jcajce.
  * conflicts with the RSAJCA provider that comes with the JDK 1.3.
  */
 public class CA {
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
+        // The original implementation only consisted of these two calls.
 	//Security.insertProviderAt(new DSTC(), 1);
 	//com.dstc.security.pki.ConsoleCATool.main(args);
         String configFile = System.getProperty("jcsi.ca.conf", "${user.home}${/}.jcsi${/}ca.properties");
         Properties p = new Properties();
         File conf = new File(configFile);
+        conf.canRead();
         try {
             InputStream in = new FileInputStream(conf);
             p.load(in);
         } catch (IOException ex) {
-            ex.printStackTrace(System.err);
+            processException(ex);
         }
         Security.insertProviderAt(new BouncyCastleProvider(), 1);
         KeyPairGenerator keyGen = null;
@@ -73,9 +85,9 @@ public class CA {
         try {
             keyGen = KeyPairGenerator.getInstance(algorithm, "BC");
         } catch (NoSuchAlgorithmException ex) {
-            ex.printStackTrace(System.err);
+            processException(ex);
         } catch (NoSuchProviderException ex) {
-            ex.printStackTrace(System.err);
+            processException(ex);
         }
         SecureRandom random = new SecureRandom();
         keyGen.initialize(keyLen, random);
@@ -93,7 +105,7 @@ public class CA {
         try {
             sigGen = new JcaContentSignerBuilder(signerAlgorithm).setProvider("BC").build(privKey);
         } catch (OperatorCreationException ex) {
-            ex.printStackTrace(System.err);
+            processException(ex);
         }
 
         X500Principal issuer = new X500Principal(issuerDN);
@@ -118,24 +130,81 @@ public class CA {
         try {
             cert = converter.getCertificate(certHolder);
         } catch (CertificateException ex) {
-            ex.printStackTrace(System.err);
+            processException(ex);
         }
         try {
             cert.verify(publicKey);
-            // TODO: write private key and certificate to files.
         } catch (CertificateException ex) {
-            ex.printStackTrace(System.err);
+            processException(ex);
         } catch (NoSuchAlgorithmException ex) {
-            ex.printStackTrace(System.err);
+            processException(ex);
         } catch (InvalidKeyException ex) {
-            ex.printStackTrace(System.err);
+            processException(ex);
         } catch (NoSuchProviderException ex) {
-            ex.printStackTrace(System.err);
+            processException(ex);
         } catch (SignatureException ex) {
-            ex.printStackTrace(System.err);
+            processException(ex);
+        }
+        
+        // Pasword Protect the private key in preparate to write to file.
+        String password = p.getProperty("jcsi.ca.privKey.password", "changeit");
+        byte[] salt = "salt and pepper shakers &*@".getBytes();
+        int iterationCount = 2048;
+        PBEKeySpec pbeSpec = new PBEKeySpec(password.toCharArray(), salt, iterationCount);
+        Cipher cipher = null;
+        SecretKeyFactory skf = null;
+        byte [] wrappedPrivKey = null;
+        try {
+            cipher = Cipher.getInstance("PBEWithSHA1AndDES", "BC");
+            skf = SecretKeyFactory.getInstance("PBEWithSHA1AndDES", "BC");
+            cipher.init(Cipher.WRAP_MODE, skf.generateSecret(pbeSpec));
+            wrappedPrivKey = cipher.wrap(privKey);
+        } catch (InvalidKeySpecException ex) {
+            processException(ex);
+        } catch (NoSuchAlgorithmException ex) {
+            processException(ex);
+        } catch (NoSuchProviderException ex) {
+            processException(ex);
+        } catch (NoSuchPaddingException ex) {
+            processException(ex);
+        }catch (InvalidKeyException ex) {
+            processException(ex);
+        }catch (IllegalBlockSizeException ex) {
+            processException(ex);
+        }
+        
+        String directory = p.getProperty("jcsi.ca.key.dir", ".");
+        
+        String keyFileName = p.getProperty("jcsi.ca.privKey", "private.key");
+        String certFileName = p.getProperty("jcsi.ca.cert", "user.cert");
+        
+        File keyFile = new File(directory + "/" + keyFileName);
+        keyFile.canWrite();
+        File certFile = new File (directory + "/" + certFileName);
+        certFile.canWrite();
+        OutputStream out = null;
+        try {
+            out = new BufferedOutputStream(new FileOutputStream(certFile));
+            out.write(cert.getEncoded());
+            out.flush();
+            out.close();
+            out = new BufferedOutputStream(new FileOutputStream(keyFile));
+            out.write(wrappedPrivKey);
+            out.flush();
+            out.close();
+        } catch (FileNotFoundException ex) {
+            processException(ex);
+        } catch (CertificateEncodingException ex) {
+            processException(ex);
+        } catch (IOException ex) {
+            processException(ex);
         }
         
     }
     
+    private static void processException(Exception ex) throws Exception{
+        ex.printStackTrace(System.err);
+        throw ex;
+    }
     
 }

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/Makefile
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/Makefile?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/Makefile (original)
+++ river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/Makefile Tue Jan 24 12:55:33 2012
@@ -15,10 +15,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #*/
-DSTCROOT =	/home/tjb/lib/jcsi/jcsi_v1.0b1
-JDK13HOME =	/files/jdk13
+#DSTCROOT =	/home/tjb/lib/jcsi/jcsi_v1.0b1 #replaced with BC_LIB
+#JDK13HOME =	/files/jdk13 #replaced with JAVA_HOME
 
-KEYTOOL=${JDK13HOME}/bin/keytool
+BC_LIB = ../../../bouncy-castle
+
+KEYTOOL=${JAVA_HOME}/bin/keytool
 KEYSTORECMD=${KEYTOOL} -storepass keypass -keypass keypass -validity 3650
 
 JINIGROUP=OU=Jini Group, O=Sun Microsystems Inc, L=Burlington, ST=MA, C=US
@@ -26,10 +28,16 @@ JINIGROUP=OU=Jini Group, O=Sun Microsyst
 CA_NAMES=1 2
 USER_NAMES=A B C D E
 
+#compile:
+#	${JAVA_HOME}/bin/javac \
+#	  -d . \
+#	  -classpath .:${DSTCROOT}/classes:${DSTCROOT}/jars/jcsi.jar \
+#	  *.java
+
 compile:
-	${JDK13HOME}/bin/javac \
+	${JAVA_HOME}/bin/javac \
 	  -d . \
-	  -classpath .:${DSTCROOT}/classes:${DSTCROOT}/jars/jcsi.jar \
+	  -classpath .:${BC_LIB}/bcprov-jdk16-146.jar:${BC_LIB}/bcmail-jdk16-146.jar \
 	  *.java
 
 create:

Added: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/old/test-ca1.cert
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/old/test-ca1.cert?rev=1235231&view=auto
==============================================================================
Binary file - no diff available.

Propchange: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/old/test-ca1.cert
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/old/test-ca1.key
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/old/test-ca1.key?rev=1235231&view=auto
==============================================================================
Binary file - no diff available.

Propchange: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/old/test-ca1.key
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/old/test-ca2.cert
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/old/test-ca2.cert?rev=1235231&view=auto
==============================================================================
Binary file - no diff available.

Propchange: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/old/test-ca2.cert
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/old/test-ca2.key
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/old/test-ca2.key?rev=1235231&view=auto
==============================================================================
Binary file - no diff available.

Propchange: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/old/test-ca2.key
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/test-ca1.cert
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/test-ca1.cert?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
Binary files - no diff available.

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/test-ca1.key
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/test-ca1.key?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/test-ca1.key (original)
+++ river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/test-ca1.key Tue Jan 24 12:55:33
2012
@@ -1 +1 @@
-0‚p0	*†H†÷
0
Hello th‚P©»ÓSˆ…(åç´VøºÈŠPhŠD€o®Ró£º=úļ™9†×챇}=Æ9ò…+|P²-v-û7ãEa)BV‘V°þÐڐ²I×jØ54e.'¯‘Ò6Ñ¥ÀƒÔCÌСν]:ƒŸÜAÇOqÖбEÉiVÜ@×MI<ëg¢ŸÙm¿Ž,Mö=¼%¾Eù$Yk–uò¦“í$ü°æ~¤=Lj{šàÀ†i
BøÍÊ,|F³$-\*^ÆðÏǔѪ#V˜½@½ÖQ€_ˆúHî-Z¥’u÷­8l8Ø\¹ê„¸ŸŒ§}ˬTÿ+8–œâ]¡P²¨º08!¬½H¹µy3Æ´1†É²+À9òºËžªûÞr 6Yù‚ÌbùjpOV
…´Ó%WmM\¼7L*íø!<PéÜûÜé]œœkk8l
\ No newline at end of file
+ôŽÆ¬9¨ó`¯Üž#FQÔ©àïùñwb[{¨I]t¼àx鏞qŒþ9£B´sÅb±ÔóPì´+…[2kí“Q<ÒZ6`_åôÓ(¹ˆ°O0,Ã,ĐÌwúP§fd¿Ñ‘‰õ£xa]ž-Úû6=Ùē¼ì¼½DÁ—mA>GåÿæOqªŽ¼Öb·2ÒvÛç>³Ù{×|„êÒ´&VÎ$ЊK#8”Hå%^{ðU­Ö\ëÆôn{߾ŵ±ÃO­¦í|­A‰Ý~¥ñtŽH…aWõLBÎÞ?ûš]UO‘*&âc#FÖ7ŠÃ•¶ø%áIúTDŽc3«ŒÚëÒèÁäÞI%µ™Â?¢c¢‹@è&BÍkw!,£íx(Á¾ì5N'ÀÈU¸T´QZíÜuåŠ}÷«cÓ¾Ëí¿ÒÙh£õÕ:=§PMÞXëîÔ'£¼]+&Á“0P÷«ù›©  «6¸¯×U»©È;V
:
`æ^Ç'-’ÖÎW¡ä„9]ôü²NÜÝÀ®…KóÕ0¬Ísæªí¡‚˜ÿX”Å/¤ïðÜF–"“ðû$ÈpÒ5Vzu5Ý_—L‘)ˆîWAñ‘㢴
)‡o]0á•éÁ7I=­>F%6H[.iÛLJ=àS™–®²“¸BšH¼ú`Ó†ü‘99ÊLJ쇅_Ïý½7s⟪ïkâ³Ç‚h¶Ï2_¾ž¶¯¹ûu.ï"&•ã˜ví¬$™“eƛÙ
±‹æ—×ÝÙ7`}_-èkó½]rr&ö˜f§ûÓÎ"¯ÀH‘iÿ¬|ŽFßH×ÄVIŠÔoÒP¶ÛËZws6L
̛&#
\ No newline at end of file

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/test-ca2.cert
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/test-ca2.cert?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
Binary files - no diff available.

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/test-ca2.key
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/test-ca2.key?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
Files river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/test-ca2.key (original) and
river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keys/test-ca2.key Tue Jan 24 12:55:33
2012 differ

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-ca.truststore
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-ca.truststore?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
Binary files - no diff available.

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-ca1.truststore
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-ca1.truststore?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
Binary files - no diff available.

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1A.keystore
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1A.keystore?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
Binary files - no diff available.

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1B.keystore
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1B.keystore?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
Binary files - no diff available.

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1C.keystore
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1C.keystore?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
Binary files - no diff available.

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1D.keystore
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1D.keystore?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
Binary files - no diff available.

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1E.keystore
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user1E.keystore?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
Binary files - no diff available.

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2A.keystore
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2A.keystore?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
Binary files - no diff available.

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2B.keystore
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2B.keystore?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
Binary files - no diff available.

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2C.keystore
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2C.keystore?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
Binary files - no diff available.

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2D.keystore
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2D.keystore?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
Binary files - no diff available.

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2E.keystore
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/test-user2E.keystore?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
Binary files - no diff available.

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/users.truststore
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/keystores/users.truststore?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
Binary files - no diff available.

Added: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1A.request
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1A.request?rev=1235231&view=auto
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1A.request (added)
+++ river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1A.request Tue
Jan 24 12:55:33 2012
@@ -0,0 +1,14 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICfzCCAjwCAQAwejELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1BMRMwEQYDVQQHEwpCdXJsaW5n
+dG9uMR0wGwYDVQQKExRTdW4gTWljcm9zeXN0ZW1zIEluYzETMBEGA1UECxMKSmluaSBHcm91cDEV
+MBMGA1UEAxMMVGVzdCBVc2VyIDFBMIIBtzCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9K
+nC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVCl
+pJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3R
+SAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdM
+Cz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/
+C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYQAAoGAfcTTJqaT
+ncetLbmCOeZuukuPgtVauDMHIEIYojoAVxuW0hWKtOXxBfjjUuLFPFyWeB72Q+t0mUgG7yEff2vL
+Qzkt1aEHvrtTtitxNBevSNA1tsuAAkZCQ/pk4gCnV2XTwo1yOavnX0cspX8fAiFkOy42h8aeMZQ3
+GR/L/Sgy9ESgADALBgcqhkjOOAQDBQADMAAwLQIVAI3WFWuXRR6YxzJiQB9NdkcRpxdoAhQ9OTGK
+PkNzMSFNiwtXp1SmxMtqXA==
+-----END NEW CERTIFICATE REQUEST-----

Added: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1B.request
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1B.request?rev=1235231&view=auto
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1B.request (added)
+++ river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1B.request Tue
Jan 24 12:55:33 2012
@@ -0,0 +1,14 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICfjCCAjwCAQAwejELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1BMRMwEQYDVQQHEwpCdXJsaW5n
+dG9uMR0wGwYDVQQKExRTdW4gTWljcm9zeXN0ZW1zIEluYzETMBEGA1UECxMKSmluaSBHcm91cDEV
+MBMGA1UEAxMMVGVzdCBVc2VyIDFCMIIBtzCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9K
+nC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVCl
+pJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3R
+SAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdM
+Cz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/
+C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYQAAoGAbwR2Xs+d
+KyK1tzySEkDeg+2v8uVq8t1OTZ6G6qzTTG5CXaRiHovUpeTXIxyt3avi90Rs4rPFaEmMMVIEpRhB
+BM84385dNxJVKz24WhmSJMw6Qzh1c2MmmA84ZQwkUmc6JfxtawEfn+2I16zQZ46Ie53OtyEIqNie
+MkaDKE8WPoigADALBgcqhkjOOAQDBQADLwAwLAIUOuHIGC1f3AuIQll7wYFTFb4lBiUCFAmvSwBp
+p7LQZSseEhpriWLTKwZN
+-----END NEW CERTIFICATE REQUEST-----

Added: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1C.request
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1C.request?rev=1235231&view=auto
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1C.request (added)
+++ river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1C.request Tue
Jan 24 12:55:33 2012
@@ -0,0 +1,14 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICfjCCAjwCAQAwejELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1BMRMwEQYDVQQHEwpCdXJsaW5n
+dG9uMR0wGwYDVQQKExRTdW4gTWljcm9zeXN0ZW1zIEluYzETMBEGA1UECxMKSmluaSBHcm91cDEV
+MBMGA1UEAxMMVGVzdCBVc2VyIDFDMIIBtzCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9K
+nC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVCl
+pJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3R
+SAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdM
+Cz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/
+C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYQAAoGAVrz9URNL
+6kYvV5etnJQpZ90sF0BAHdbo71kpNdIQG06rAYlCZK2dZZb99lSdyp4aALSPf2DmRDchYRceFlRa
+yZcDmrFma2kgMkhNNtDAp8WUFcknOyg3VD9rlmN/Gk8ObLnWgn9jRpmwmGywR/hTwGbhhLeehHSy
+ENkDNzk49mOgADALBgcqhkjOOAQDBQADLwAwLAIUMGWUZpMFttNyXsJ63zot1uAo5soCFFJEN6Yo
+v0vP3Ka8o70KFZGU24Al
+-----END NEW CERTIFICATE REQUEST-----

Added: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1D.request
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1D.request?rev=1235231&view=auto
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1D.request (added)
+++ river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1D.request Tue
Jan 24 12:55:33 2012
@@ -0,0 +1,14 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICfzCCAjwCAQAwejELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1BMRMwEQYDVQQHEwpCdXJsaW5n
+dG9uMR0wGwYDVQQKExRTdW4gTWljcm9zeXN0ZW1zIEluYzETMBEGA1UECxMKSmluaSBHcm91cDEV
+MBMGA1UEAxMMVGVzdCBVc2VyIDFEMIIBtzCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9K
+nC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVCl
+pJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3R
+SAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdM
+Cz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/
+C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYQAAoGAIRgNzsDM
+YPMWZeA+knGST1Ocnsgz9hEFV2+zPB3njiSTpTnH3JhqYhNW1q9TvGd556gyqbMrXgypiTJ0INUA
+lBS5NlAOhcyNMXji4i5IHYqidPtpBIKDOlWN/2dztSWxDrpUZBqpU++LssuJ4/lYnvYHm28of1ne
+xWUOfa3QQzygADALBgcqhkjOOAQDBQADMAAwLQIVAILpdW1Fn3vTOhkWXoZEpRHIVxErAhRilTBj
+RM+wW5gh44RzRervtzEfKQ==
+-----END NEW CERTIFICATE REQUEST-----

Added: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1E.request
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1E.request?rev=1235231&view=auto
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1E.request (added)
+++ river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user1E.request Tue
Jan 24 12:55:33 2012
@@ -0,0 +1,14 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICfzCCAjwCAQAwejELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1BMRMwEQYDVQQHEwpCdXJsaW5n
+dG9uMR0wGwYDVQQKExRTdW4gTWljcm9zeXN0ZW1zIEluYzETMBEGA1UECxMKSmluaSBHcm91cDEV
+MBMGA1UEAxMMVGVzdCBVc2VyIDFFMIIBtzCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9K
+nC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVCl
+pJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3R
+SAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdM
+Cz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/
+C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYQAAoGAJEfDPgfb
+LxOJY/GrCMuAVCFNquuNUUSF/xHHBk4xqXXtuyopH59COKQHF1O54w748IN5RA2qTL8+b0JBYo2f
+3VrJHeB/opgejR8EpoB6sdmDyuOpIynRhlJDJ/Qsr9m7S7aXZupds9jleYOQ8M5BDzyuyFtx4Xrx
+7LWOSL8RXLSgADALBgcqhkjOOAQDBQADMAAwLQIVAIgZyloLj3PUAI0Hl86Ki5qE4bhQAhR2kjZn
+TSnkAVFljvmLANWtEn8M6A==
+-----END NEW CERTIFICATE REQUEST-----

Added: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2A.request
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2A.request?rev=1235231&view=auto
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2A.request (added)
+++ river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2A.request Tue
Jan 24 12:55:33 2012
@@ -0,0 +1,14 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICfjCCAjwCAQAwejELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1BMRMwEQYDVQQHEwpCdXJsaW5n
+dG9uMR0wGwYDVQQKExRTdW4gTWljcm9zeXN0ZW1zIEluYzETMBEGA1UECxMKSmluaSBHcm91cDEV
+MBMGA1UEAxMMVGVzdCBVc2VyIDJBMIIBtzCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9K
+nC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVCl
+pJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3R
+SAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdM
+Cz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/
+C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYQAAoGAE7KidG6T
+/MW0jBqJuCVYdBOIWPm8o67PfmaBUe/MVI5Oxf2vffcKWxwwkCDJNWzP2Us7rVf+1cte5gj+CAHX
+ruEiSs/JlkCstzUncurSgxtK1suEbgsom0f88k21jSVA+h2XuLHNhZx7c7uOJEyIpcWRzKuLKL/O
+wVI6I8ojxiigADALBgcqhkjOOAQDBQADLwAwLAIUNBdhZKiIWmu1krkWW26wUtImSIoCFEZ8ClXc
+ZTLMZkA/LZXl0HzSvL7r
+-----END NEW CERTIFICATE REQUEST-----

Added: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2B.request
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2B.request?rev=1235231&view=auto
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2B.request (added)
+++ river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2B.request Tue
Jan 24 12:55:33 2012
@@ -0,0 +1,14 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICfzCCAj0CAQAwejELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1BMRMwEQYDVQQHEwpCdXJsaW5n
+dG9uMR0wGwYDVQQKExRTdW4gTWljcm9zeXN0ZW1zIEluYzETMBEGA1UECxMKSmluaSBHcm91cDEV
+MBMGA1UEAxMMVGVzdCBVc2VyIDJCMIIBuDCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9K
+nC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVCl
+pJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3R
+SAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdM
+Cz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/
+C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYUAAoGBAOa1JBl2
+PYI8awrIqAWsgB+jHRlW7Gf47iTIGKBAhwvGLz0zhKpJMS9Z0WUYBTCzPzhiCkNFatGS1QcMNQdc
+RZ95s6IUF3C/DfnSgER9apsZUoMIixpMQKH/HnX2A3Ad+70tc2azN3P19Jcd71MGFR8BrrNPP45x
+qBQhH5yhffF7oAAwCwYHKoZIzjgEAwUAAy8AMCwCFCcpsyMswXoiBqYaLg1F+1QQ7PwwAhQvh8am
+qBE6FwbcJgvOQkB+dKvjfg==
+-----END NEW CERTIFICATE REQUEST-----

Added: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2C.request
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2C.request?rev=1235231&view=auto
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2C.request (added)
+++ river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2C.request Tue
Jan 24 12:55:33 2012
@@ -0,0 +1,14 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICfjCCAjwCAQAwejELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1BMRMwEQYDVQQHEwpCdXJsaW5n
+dG9uMR0wGwYDVQQKExRTdW4gTWljcm9zeXN0ZW1zIEluYzETMBEGA1UECxMKSmluaSBHcm91cDEV
+MBMGA1UEAxMMVGVzdCBVc2VyIDJDMIIBtzCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9K
+nC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVCl
+pJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3R
+SAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdM
+Cz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/
+C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYQAAoGAKypwnMfK
+S9pj9PnhrYPHtBip7q2IGCD9mlDTZSKpM75JspVS3FpASH2m9DrBmUKCP4KLP/xLP7kSmFWa6iOd
+/szWX/REf6Logcv7Z+CL4lQPu3qpaowuxb4gg32cMShJGknavgt+i0O4pT7JVCmCOQdVFnybRcCO
+o+qIn4jA23mgADALBgcqhkjOOAQDBQADLwAwLAIUb3yGTfOL6ohFMbZatWk6MFGthZECFCDGzbvO
+IveCd1GbbeZM69AzbfDW
+-----END NEW CERTIFICATE REQUEST-----

Added: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2D.request
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2D.request?rev=1235231&view=auto
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2D.request (added)
+++ river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2D.request Tue
Jan 24 12:55:33 2012
@@ -0,0 +1,14 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICgDCCAj0CAQAwejELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1BMRMwEQYDVQQHEwpCdXJsaW5n
+dG9uMR0wGwYDVQQKExRTdW4gTWljcm9zeXN0ZW1zIEluYzETMBEGA1UECxMKSmluaSBHcm91cDEV
+MBMGA1UEAxMMVGVzdCBVc2VyIDJEMIIBuDCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9K
+nC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVCl
+pJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3R
+SAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdM
+Cz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/
+C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYUAAoGBAO4xNQyb
+7Q9tCJzPSNBDCOGqN4IUjAxuzFV2uz/6HBPs9uPiDGDwyDuIU8CuAl/tLe+WZMTCG9+fuqp+tUER
+NMr4+lFZ1Ww+yVlwZGgNrQ1GfA0NU6i9r36kG4uP7ItxCQVzMku96TpjJFGJmCnRI5cFlB5yXCsU
+USPyVvLsypHqoAAwCwYHKoZIzjgEAwUAAzAAMC0CFH2kyyPh/AA6jGw1K6JIhZUx5pwxAhUAjoEL
+fOTcYsMyIu2KbNrGe6/2F2s=
+-----END NEW CERTIFICATE REQUEST-----

Added: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2E.request
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2E.request?rev=1235231&view=auto
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2E.request (added)
+++ river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/requests/test-user2E.request Tue
Jan 24 12:55:33 2012
@@ -0,0 +1,14 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICfzCCAjwCAQAwejELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1BMRMwEQYDVQQHEwpCdXJsaW5n
+dG9uMR0wGwYDVQQKExRTdW4gTWljcm9zeXN0ZW1zIEluYzETMBEGA1UECxMKSmluaSBHcm91cDEV
+MBMGA1UEAxMMVGVzdCBVc2VyIDJFMIIBtzCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9K
+nC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVCl
+pJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3R
+SAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdM
+Cz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/
+C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYQAAoGAGUNtyYcK
+PkQXgGQ3p+LY0KAcWWNGr4ag6l4BRdy9VsVD9i8mrT9r06lXCPHVkQCsKrRtCSHekIqwGA0sXLlP
+rqH+LU20nMsmWusEAOlFo1+iPJE5Fdphqh+YyOnqYCaNIb0XA+rN5VtRT6RJrxLuSALFsc7SIvf7
+jiKis0wy2dqgADALBgcqhkjOOAQDBQADMAAwLQIUSZrw5+O5yVJPm1/OIAmafPfa8TkCFQCL7bh+
+9wayCMZ894YYDn8MfvkHng==
+-----END NEW CERTIFICATE REQUEST-----

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/run-ca.sh
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/run-ca.sh?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/run-ca.sh (original)
+++ river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/run-ca.sh Tue Jan 24 12:55:33 2012
@@ -20,13 +20,19 @@
 # the first argument.
 
 # Directory containing classes that patch JCSI
-PATCHROOT=/home/tjb/.jcsi
+#PATCHROOT=/home/tjb/.jcsi
 # JSCI classes
-DSTCROOT=/home/tjb/lib/jcsi/jcsi_v1.0b1
+#DSTCROOT=/home/tjb/lib/jcsi/jcsi_v1.0b1
+
+# JCSI has been replaced with Bouncy Castle
+BC_LIB=../../../bouncy-castle
 
 # JCSI uses a different format for requesting Cipher algorithms than is
 # supported by the JDK 1.4, so use 1.3
-JDK13HOME=/files/jdk13
+#JDK13HOME=/files/jdk13
+
+#$JDK13HOME/bin/java -cp .:$PATCHROOT:$DSTCROOT/classes:$DSTCROOT/jars/jcsi.jar \
+#     -Djcsi.ca.conf=$1 CA
 
-$JDK13HOME/bin/java -cp .:$PATCHROOT:$DSTCROOT/classes:$DSTCROOT/jars/jcsi.jar \
-     -Djcsi.ca.conf=$1 CA
+$JAVA_HOME/bin/java -cp .:${BC_LIB}/bcprov-jdk16-146.jar:${BC_LIB}/bcmail-jdk16-146.jar \
+      -Djcsi.ca.conf=$1 CA

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/test-ca1.properties
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/test-ca1.properties?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/test-ca1.properties (original)
+++ river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/test-ca1.properties Tue Jan 24 12:55:33
2012
@@ -14,8 +14,10 @@ jcsi.ca.keyLength=1024
 jcsi.ca.issuerDN=CN=Test CA 1, OU=Jini Group, O=Sun Microsystems Inc, L=Burlington, ST=MA,
C=US
 
 # algorithms the CA uses
-jcsi.ca.sigAlg=SHA-1/DSA
-jcsi.ca.keyAlg=DSA
+# was SHA-1/DSA
+jcsi.ca.sigAlg=SHA1withRSA
+# was DSA
+jcsi.ca.keyAlg=RSA
 
 # the CA's key directory
 jcsi.ca.key.dir=keys

Modified: river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/test-ca2.properties
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/test-ca2.properties?rev=1235231&r1=1235230&r2=1235231&view=diff
==============================================================================
--- river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/test-ca2.properties (original)
+++ river/jtsk/skunk/peterConcurrentPolicy/qa/jtreg/certs/test-ca2.properties Tue Jan 24 12:55:33
2012
@@ -14,8 +14,10 @@ jcsi.ca.keyLength=1024
 jcsi.ca.issuerDN=CN=Test CA 2, OU=Jini Group, O=Sun Microsystems Inc, L=Burlington, ST=MA,
C=US
 
 # algorithms the CA uses
-jcsi.ca.sigAlg=SHA-1/DSA
-jcsi.ca.keyAlg=DSA
+# was SHA-1/DSA
+jcsi.ca.sigAlg=SHA1withRSA
+# was DSA
+jcsi.ca.keyAlg=RSA
 
 # the CA's key directory
 jcsi.ca.key.dir=keys



Mime
View raw message