[Webfunds-commits] java/webfunds/ricardian Contract.java SOXServer.java

Fri, 21 Jul 2000 17:32:34 -0400 (AST)

gelderen    00/07/21 17:32:34

  Modified:    webfunds/ricardian Contract.java SOXServer.java
  Log:
  Change all occurrences of X509Cert to j.s.c.Certificate.

Revision  Changes    Path
1.25      +9 -10     java/webfunds/ricardian/Contract.java

Index: Contract.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/ricardian/Contract.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25

--- Contract.java	2000/07/14 23:12:34	1.24
+++ Contract.java	2000/07/21 21:32:34	1.25
@@ -1,4 +1,4 @@
-/* $Id: Contract.java,v 1.24 2000/07/14 23:12:34 gelderen Exp $
+/* $Id: Contract.java,v 1.25 2000/07/21 21:32:34 gelderen Exp $
  *
  * Copyright (c) Systemics Ltd 1995-1999 on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -16,6 +16,7 @@
 import java.net.URL;
 import java.net.MalformedURLException;
 import java.security.*;
+import java.security.cert.Certificate;
 import java.util.Enumeration;
 import java.util.Hashtable;
 
@@ -36,8 +37,6 @@
 import webfunds.sox.SOXKeyException;
 import webfunds.sox.utils.Base64;
 
-import webfunds.x509.X509Cert;
-
 import cryptix.openpgp.PGPMessage;
 import cryptix.openpgp.PGPPublicKey;
 
@@ -663,7 +662,7 @@
      * This key is the one that signs the contract, and is only a hint,
      * the key needs to be authenticated directly by the application.
      */
-    private X509Cert getContractCert()
+    private Certificate getContractCert()
         throws ContractException
     {
         return getCert("contract");
@@ -688,7 +687,7 @@
      * which signs the contract key above.
      * The presence of these keys should indicate which server is in use.
      */
-    private X509Cert getCertificationCert()
+    private Certificate getCertificationCert()
         throws ContractException
     {
         return getCert("certification");
@@ -698,7 +697,7 @@
      * This is the SOX Server comms key.
      * The presence of these keys should indicate which server is in use.
      */
-    protected X509Cert getServerCert()
+    protected Certificate getServerCert()
         throws ContractException
     {
         String CERT = "server_certification";
@@ -719,7 +718,7 @@
         return getCertFromString(field);
     }
 
-    private X509Cert getCert(String name)
+    private Certificate getCert(String name)
         throws ContractException
     {
         String field = getField("keys", name);
@@ -729,7 +728,7 @@
         return getCertFromString(field);
     }
 
-    private X509Cert getCertFromString(String field)
+    private Certificate getCertFromString(String field)
         throws ContractException
     {
         if (field == null || field.length() == 0)
@@ -742,7 +741,7 @@
         if(end >= 0)
             field = field.substring(0, end) + field.substring(end + 2);
 
-        X509Cert retval = null;
+        Certificate retval = null;
         try {
             retval =  Armoury.decodeCert( field );
         } catch (SOXKeyException ex) {
@@ -776,7 +775,7 @@
         } else {  // X.509 signed contract
         
             // Get the Certificate from the contract
-            X509Cert issuerCert = getContractCert();
+            Certificate issuerCert = getContractCert();
     
             // Extract the signature
             byte[] sig;



1.16      +3 -4      java/webfunds/ricardian/SOXServer.java

Index: SOXServer.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/ricardian/SOXServer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SOXServer.java	2000/07/14 23:12:34	1.15
+++ SOXServer.java	2000/07/21 21:32:34	1.16
@@ -1,5 +1,5 @@
 /*
- * $Id: SOXServer.java,v 1.15 2000/07/14 23:12:34 gelderen Exp $
+ * $Id: SOXServer.java,v 1.16 2000/07/21 21:32:34 gelderen Exp $
  *
  * Copyright (c) Systemics Ltd 1995-1999 on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -10,8 +10,7 @@
 import java.net.URL;
 import java.net.MalformedURLException;
 
-import webfunds.x509.X509Cert;
-
+import java.security.cert.Certificate;
 import java.util.Hashtable;
 import java.util.Enumeration;
 import java.util.Vector;
@@ -325,7 +324,7 @@
             //
             // Extract the cert.
             //
-            X509Cert cert;
+            Certificate cert;
             try {
                 cert = con.getServerCert();
             } catch (ContractException ex) {






