[Webfunds-commits] java/webfunds/sox Account.java Armoury.java BasicAgent.java CertPackage.java CertificateReply.java CommsKeyReply.java Encodable.java Issuer.java RegisterRequest.java SimpleIssuer.java SmartIssuer.java Utils.java
Jeroen C. van Gelderen
gelderen@cypherpunks.ai
Fri, 14 Jul 2000 19:12:38 -0400 (AST)
gelderen 00/07/14 19:12:37
Modified: . Makefile
webfunds/ricardian Contract.java SOXServer.java
webfunds/sox Account.java Armoury.java BasicAgent.java
CertPackage.java CertificateReply.java
CommsKeyReply.java Encodable.java Issuer.java
RegisterRequest.java SimpleIssuer.java
SmartIssuer.java Utils.java
Log:
Change all of sun.security.x509.X509Cert to webfunds.x509.X509Cert.
This was done by a script, import statement order will be fixed later.
This commit stabilizes the tree. Only Crypto.java and webfunds.x509.*
depend on the sun.security.* code now and that will be fixed soonish.
Revision Changes Path
1.8 +3 -2 Makefile
Index: Makefile
===================================================================
RCS file: /home/webfunds/cvsroot/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile 2000/07/14 00:29:53 1.7
+++ Makefile 2000/07/14 23:12:34 1.8
@@ -1,5 +1,5 @@
#
-# $Id: Makefile,v 1.7 2000/07/14 00:29:53 gelderen Exp $
+# $Id: Makefile,v 1.8 2000/07/14 23:12:34 gelderen Exp $
#
# This file was written by Jeroen C. van Gelderen and is in the public domain.
@@ -50,7 +50,8 @@
java/sun/security/x509/*.java \
java/webfunds/utils/*.java \
java/webfunds/sox/*.java \
- java/webfunds/sox/utils/*.java
+ java/webfunds/sox/utils/*.java \
+ java/webfunds/x509/*.java
.PHONY: all clean run sox
.DEFAULT: all
1.24 +2 -2 java/webfunds/ricardian/Contract.java
Index: Contract.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/ricardian/Contract.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Contract.java 2000/07/13 20:30:13 1.23
+++ Contract.java 2000/07/14 23:12:34 1.24
@@ -1,4 +1,4 @@
-/* $Id: Contract.java,v 1.23 2000/07/13 20:30:13 gelderen Exp $
+/* $Id: Contract.java,v 1.24 2000/07/14 23:12:34 gelderen Exp $
*
* Copyright (c) Systemics Ltd 1995-1999 on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -36,7 +36,7 @@
import webfunds.sox.SOXKeyException;
import webfunds.sox.utils.Base64;
-import sun.security.x509.X509Cert;
+import webfunds.x509.X509Cert;
import cryptix.openpgp.PGPMessage;
import cryptix.openpgp.PGPPublicKey;
1.15 +2 -2 java/webfunds/ricardian/SOXServer.java
Index: SOXServer.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/ricardian/SOXServer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SOXServer.java 2000/06/10 18:30:08 1.14
+++ SOXServer.java 2000/07/14 23:12:34 1.15
@@ -1,5 +1,5 @@
/*
- * $Id: SOXServer.java,v 1.14 2000/06/10 18:30:08 iang Exp $
+ * $Id: SOXServer.java,v 1.15 2000/07/14 23:12:34 gelderen Exp $
*
* Copyright (c) Systemics Ltd 1995-1999 on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -10,7 +10,7 @@
import java.net.URL;
import java.net.MalformedURLException;
-import sun.security.x509.X509Cert;
+import webfunds.x509.X509Cert;
import java.util.Hashtable;
import java.util.Enumeration;
1.69 +3 -3 java/webfunds/sox/Account.java
Index: Account.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/Account.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- Account.java 2000/07/13 21:11:14 1.68
+++ Account.java 2000/07/14 23:12:35 1.69
@@ -1,4 +1,4 @@
-/* $Id: Account.java,v 1.68 2000/07/13 21:11:14 gelderen Exp $
+/* $Id: Account.java,v 1.69 2000/07/14 23:12:35 gelderen Exp $
*
* Copyright (c) Systemics Inc. 1995-2000 on behalf of
* The WebFunds Development Team. All rights reserved.
@@ -17,7 +17,7 @@
import java.util.Hashtable;
import java.util.Vector;
-import sun.security.x509.X509Cert;
+import webfunds.x509.X509Cert;
/**
@@ -26,7 +26,7 @@
* information, except perhaps for holding a key passphrase,
* which is not stored in the Store (only in a runtime object).
*
- * @version $Revision: 1.68 $
+ * @version $Revision: 1.69 $
* @author Jeroen C. van Gelderen (gelderen@webfunds.org)
* @author Unknown
*/
1.28 +3 -3 java/webfunds/sox/Armoury.java
Index: Armoury.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/Armoury.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Armoury.java 2000/07/14 00:38:55 1.27
+++ Armoury.java 2000/07/14 23:12:35 1.28
@@ -1,4 +1,4 @@
-/* $Id: Armoury.java,v 1.27 2000/07/14 00:38:55 gelderen Exp $
+/* $Id: Armoury.java,v 1.28 2000/07/14 23:12:35 gelderen Exp $
*
* Copyright (c) Systemics Inc. 1995-2000 on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -8,7 +8,7 @@
import java.io.*;
import java.security.*;
-import sun.security.x509.X509Cert;
+import webfunds.x509.X509Cert;
import webfunds.sox.utils.Base64;
@@ -35,7 +35,7 @@
* <a href="http://www.imc.org/rfc2045">http://www.imc.org/rfc2045</a>
* </ol>
*
- * @version $Revision: 1.27 $
+ * @version $Revision: 1.28 $
*/
public abstract class Armoury
{
1.10 +2 -2 java/webfunds/sox/BasicAgent.java
Index: BasicAgent.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/BasicAgent.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BasicAgent.java 2000/04/15 19:05:44 1.9
+++ BasicAgent.java 2000/07/14 23:12:35 1.10
@@ -1,5 +1,5 @@
/*
- * $Id: BasicAgent.java,v 1.9 2000/04/15 19:05:44 iang Exp $
+ * $Id: BasicAgent.java,v 1.10 2000/07/14 23:12:35 gelderen Exp $
*
* Copyright (c) Systemics Ltd 1995-1999 on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -8,7 +8,7 @@
import java.io.PrintWriter;
import java.security.*;
-import sun.security.x509.X509Cert;
+import webfunds.x509.X509Cert;
import webfunds.utils.Debug;
1.6 +2 -2 java/webfunds/sox/CertPackage.java
Index: CertPackage.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/CertPackage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CertPackage.java 2000/07/14 00:37:19 1.5
+++ CertPackage.java 2000/07/14 23:12:35 1.6
@@ -1,4 +1,4 @@
-/* $Id: CertPackage.java,v 1.5 2000/07/14 00:37:19 gelderen Exp $
+/* $Id: CertPackage.java,v 1.6 2000/07/14 23:12:35 gelderen Exp $
*
* Copyright (c) Systemics Inc. 1995-2000 on behalf of
* The WebFunds Development Team. All Rights Reserved.
@@ -8,7 +8,7 @@
import java.security.PrivateKey;
import java.security.PublicKey;
-import sun.security.x509.X509Cert;
+import webfunds.x509.X509Cert;
public class CertPackage
1.6 +2 -2 java/webfunds/sox/CertificateReply.java
Index: CertificateReply.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/CertificateReply.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CertificateReply.java 1999/10/03 01:16:21 1.5
+++ CertificateReply.java 2000/07/14 23:12:35 1.6
@@ -1,5 +1,5 @@
/*
- * $Id: CertificateReply.java,v 1.5 1999/10/03 01:16:21 iang Exp $
+ * $Id: CertificateReply.java,v 1.6 2000/07/14 23:12:35 gelderen Exp $
*
* Copyright (c) Systemics Ltd 1995-1999 on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -7,7 +7,7 @@
package webfunds.sox;
import java.io.*;
-import sun.security.x509.X509Cert;
+import webfunds.x509.X509Cert;
import java.security.PublicKey;
1.5 +2 -2 java/webfunds/sox/CommsKeyReply.java
Index: CommsKeyReply.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/CommsKeyReply.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CommsKeyReply.java 1999/10/03 01:16:21 1.4
+++ CommsKeyReply.java 2000/07/14 23:12:35 1.5
@@ -1,5 +1,5 @@
/*
- * $Id: CommsKeyReply.java,v 1.4 1999/10/03 01:16:21 iang Exp $
+ * $Id: CommsKeyReply.java,v 1.5 2000/07/14 23:12:35 gelderen Exp $
*
* Copyright (c) Systemics Ltd 1995-1999 on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -7,7 +7,7 @@
package webfunds.sox;
import java.io.*;
-import sun.security.x509.X509Cert;
+import webfunds.x509.X509Cert;
import java.security.PublicKey;
1.21 +2 -2 java/webfunds/sox/Encodable.java
Index: Encodable.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/Encodable.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Encodable.java 2000/07/13 22:51:11 1.20
+++ Encodable.java 2000/07/14 23:12:35 1.21
@@ -1,5 +1,5 @@
/*
- * $Id: Encodable.java,v 1.20 2000/07/13 22:51:11 gelderen Exp $
+ * $Id: Encodable.java,v 1.21 2000/07/14 23:12:35 gelderen Exp $
*
* Copyright (c) Systemics Ltd 1995-1999 on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -8,7 +8,7 @@
import java.util.*;
import java.io.*;
-import sun.security.x509.X509Cert;
+import webfunds.x509.X509Cert;
import webfunds.utils.Diagnostics;
1.18 +2 -2 java/webfunds/sox/Issuer.java
Index: Issuer.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/Issuer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Issuer.java 2000/06/05 02:43:23 1.17
+++ Issuer.java 2000/07/14 23:12:35 1.18
@@ -1,5 +1,5 @@
/*
- * $Id: Issuer.java,v 1.17 2000/06/05 02:43:23 gelderen Exp $
+ * $Id: Issuer.java,v 1.18 2000/07/14 23:12:35 gelderen Exp $
*
* Copyright (c) Systemics Ltd 1995-1999 on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -8,7 +8,7 @@
import java.io.*;
import java.security.*;
-import sun.security.x509.X509Cert;
+import webfunds.x509.X509Cert;
import java.util.Date;
import webfunds.utils.Debug;
1.15 +3 -3 java/webfunds/sox/RegisterRequest.java
Index: RegisterRequest.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/RegisterRequest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- RegisterRequest.java 2000/07/13 22:52:08 1.14
+++ RegisterRequest.java 2000/07/14 23:12:35 1.15
@@ -1,4 +1,4 @@
-/* $Id: RegisterRequest.java,v 1.14 2000/07/13 22:52:08 gelderen Exp $
+/* $Id: RegisterRequest.java,v 1.15 2000/07/14 23:12:35 gelderen Exp $
*
* Copyright (c) Systemics Inc. 1995-2000 on behalf of
* The WebFunds Development Team. All Rights Reserved.
@@ -8,14 +8,14 @@
import java.io.*;
import java.security.*;
-import sun.security.x509.X509Cert;
+import webfunds.x509.X509Cert;
/**
* A Request class that registers a client key with an issuer,
* by means of the "Register" request
*
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
*/
public class RegisterRequest
extends Request
1.10 +2 -2 java/webfunds/sox/SimpleIssuer.java
Index: SimpleIssuer.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/SimpleIssuer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SimpleIssuer.java 2000/07/10 17:37:55 1.9
+++ SimpleIssuer.java 2000/07/14 23:12:35 1.10
@@ -1,5 +1,5 @@
/*
- * $Id: SimpleIssuer.java,v 1.9 2000/07/10 17:37:55 iang Exp $
+ * $Id: SimpleIssuer.java,v 1.10 2000/07/14 23:12:35 gelderen Exp $
*
* Copyright (c) Systemics Ltd 1995-1999 on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -8,7 +8,7 @@
import java.io.*;
import java.security.*;
-import sun.security.x509.X509Cert;
+import webfunds.x509.X509Cert;
import java.util.Date;
import webfunds.utils.Debug;
1.10 +2 -3 java/webfunds/sox/SmartIssuer.java
Index: SmartIssuer.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/SmartIssuer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SmartIssuer.java 2000/07/10 17:37:55 1.9
+++ SmartIssuer.java 2000/07/14 23:12:35 1.10
@@ -1,5 +1,5 @@
/*
- * $Id: SmartIssuer.java,v 1.9 2000/07/10 17:37:55 iang Exp $
+ * $Id: SmartIssuer.java,v 1.10 2000/07/14 23:12:35 gelderen Exp $
*
* Copyright (c) Systemics Ltd 1995-1999 on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -8,8 +8,7 @@
import java.io.PrintWriter;
import java.io.Serializable;
-// import java.security.*;
-import sun.security.x509.X509Cert;
+import webfunds.x509.X509Cert;
import java.net.URL;
import java.net.MalformedURLException;
import java.util.Date;
1.15 +2 -2 java/webfunds/sox/Utils.java
Index: Utils.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/Utils.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Utils.java 2000/06/11 22:29:42 1.14
+++ Utils.java 2000/07/14 23:12:35 1.15
@@ -1,5 +1,5 @@
/*
- * $Id: Utils.java,v 1.14 2000/06/11 22:29:42 iang Exp $
+ * $Id: Utils.java,v 1.15 2000/07/14 23:12:35 gelderen Exp $
*
* Copyright (c) Systemics Ltd 1995-1999 on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -8,7 +8,7 @@
import java.io.*;
import java.security.*;
-import sun.security.x509.X509Cert;
+import webfunds.x509.X509Cert;
import webfunds.sox.Crypto;
/**