[Webfunds-commits] java/webfunds/sox BasicAgent.java BasicRequestPacket.java CommsKeyRequest.java

Thu, 27 Jul 2000 13:45:11 -0400 (AST)

gelderen    00/07/27 13:45:11

  Modified:    webfunds TODO_sox
               webfunds/sox BasicAgent.java BasicRequestPacket.java
                        CommsKeyRequest.java
  Log:
  Cut out all references to the unused CertificateRequest.

Revision  Changes    Path
1.9       +0 -4      java/webfunds/TODO_sox

Index: TODO_sox
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/TODO_sox,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9

--- TODO_sox	2000/04/10 18:07:38	1.8
+++ TODO_sox	2000/07/27 17:45:10	1.9
@@ -22,10 +22,6 @@
 
      Add DG/fast
 
-     Change CertificateRequest and CommsKeyReply over to one
-          single request that identifies the key they want.
-          We need to add a "get OtherKey" facility as well...
-
      Do encryption of keys, followed by encryption of everything.
 
      (at same time) storage manager that can duplicate storage



1.12      +1 -12     java/webfunds/sox/BasicAgent.java

Index: BasicAgent.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/BasicAgent.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BasicAgent.java	2000/07/21 21:31:18	1.11
+++ BasicAgent.java	2000/07/27 17:45:11	1.12
@@ -1,5 +1,5 @@
 /*
- * $Id: BasicAgent.java,v 1.11 2000/07/21 21:31:18 gelderen Exp $
+ * $Id: BasicAgent.java,v 1.12 2000/07/27 17:45:11 gelderen Exp $
  *
  * Copyright (c) Systemics Ltd 1995-1999 on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -82,17 +82,6 @@
         return reply.body();
     }
 
-    /**
-     * Get the primary certificate for this issuer.
-     */
-    private Certificate getCertificate()
-        throws SOXPacketException, SOXKeyException,
-               SOXLaterException, SOXIssuerException
-    {
-        CertificateReply cr = new CertificateReply(
-                              request(new CertificateRequest()));
-        return cr.getCertificate();
-    }
 
     /**
      * Get the current communications certificate for this issuer.



1.7       +3 -7      java/webfunds/sox/BasicRequestPacket.java

Index: BasicRequestPacket.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/BasicRequestPacket.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BasicRequestPacket.java	1999/12/10 14:07:40	1.6
+++ BasicRequestPacket.java	2000/07/27 17:45:11	1.7
@@ -1,5 +1,5 @@
 /*
- * $Id: BasicRequestPacket.java,v 1.6 1999/12/10 14:07:40 iang Exp $
+ * $Id: BasicRequestPacket.java,v 1.7 2000/07/27 17:45:11 gelderen Exp $
  *
  * Copyright (c) Systemics Ltd 1995-1999 on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -53,9 +53,7 @@
     public BasicRequestPacket(BasicRequest body)
     {
         this.body = body;
-        if (body instanceof CertificateRequest)
-            type = CERT_REQ;
-        else if (body instanceof CommsKeyRequest)
+        if (body instanceof CommsKeyRequest)
             type = KEY_REQ;
         else if (body instanceof EncryptedRequest)
             type = ENCR_REQ;
@@ -108,9 +106,7 @@
             encoded = new byte[len];
             dis.read(encoded);
   
-            if (type.equals(CERT_REQ))
-                body = new CertificateRequest(encoded);
-            else if (type.equals(KEY_REQ))
+            if (type.equals(KEY_REQ))
                 body = new CommsKeyRequest(encoded);
             else if (type.equals(ENCR_REQ))
                 body = new EncryptedRequest(encoded);



1.6       +1 -2      java/webfunds/sox/CommsKeyRequest.java

Index: CommsKeyRequest.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/CommsKeyRequest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CommsKeyRequest.java	1999/11/21 01:53:25	1.5
+++ CommsKeyRequest.java	2000/07/27 17:45:11	1.6
@@ -1,5 +1,5 @@
 /*
- * $Id: CommsKeyRequest.java,v 1.5 1999/11/21 01:53:25 iang Exp $
+ * $Id: CommsKeyRequest.java,v 1.6 2000/07/27 17:45:11 gelderen Exp $
  *
  * Copyright (c) Systemics Ltd 1995-1999 on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -8,7 +8,6 @@
 
 import java.io.*;
 
-// should be DEPRECATED, see CertificateRequest
 
 public class CommsKeyRequest
     extends BasicRequest






