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

Ian Grigg iang@cypherpunks.ai
Mon, 21 Aug 2000 10:13:39 -0400 (AST)


iang        00/08/21 10:13:39

  Modified:    webfunds/ricardian Contract.java
  Log:
  added extra layer in SERVER side PKI:
      Contract includes [operator] key which signs [server] key.
  (in other changes by Jeroen, SOX will request server key from
  SOXServer and check that it is signed by contract's [operator] key.)
  compiles, tested with one contract and server.

Revision  Changes    Path
1.34      +5 -4      java/webfunds/ricardian/Contract.java

Index: Contract.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/ricardian/Contract.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Contract.java	2000/08/17 18:17:45	1.33
+++ Contract.java	2000/08/21 14:13:38	1.34
@@ -1,4 +1,4 @@
-/* $Id: Contract.java,v 1.33 2000/08/17 18:17:45 iang Exp $
+/* $Id: Contract.java,v 1.34 2000/08/21 14:13:38 iang Exp $
  *
  * Copyright (c) Systemics Ltd 1995-1999 on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -714,7 +714,8 @@
      */
     public final static String USERID_TOP_LEVEL    = "[cert]",
                                USERID_CONTRACT     = "[contract]",
-                               USERID_SERVER       = "[server]";
+                               USERID_SERVER       = "[server]",
+                               USERID_OPERATOR     = "[operator]";
 
     public final static String FIELD_TOP_LEVEL    = "certification",
                                FIELD_CONTRACT     = "contract",
@@ -774,7 +775,7 @@
         return getCertFromString(text,
                                  fieldName,  // may be the deprecated one
                                  ContractException.KEY_SERVER,
-                                 USERID_SERVER);
+                                 USERID_OPERATOR);
     }
 
     /**
@@ -1074,7 +1075,7 @@
             throw new ContractException(ContractException.KEY_CONTRACT, e);
 
         PGPPublicKey serverKey = (PGPPublicKey)serverCert.getPublicKey();
-        if (!KeyUtil.verifyKey(serverKey, USERID_SERVER, null))
+        if (!KeyUtil.verifyKey(serverKey, USERID_OPERATOR, null))
             throw new ContractException(ContractException.KEY_SERVER, e);
 
         return true;