[Webfunds-commits] java/webfunds/sox Armoury.java

Jeroen C. van Gelderen gelderen@cypherpunks.ai
Thu, 13 Jul 2000 20:12:07 -0400 (AST)


gelderen    00/07/13 20:12:07

  Modified:    webfunds/sox Armoury.java
  Log:
  Remove obsolete lines.

Revision  Changes    Path
1.25      +3 -12     java/webfunds/sox/Armoury.java

Index: Armoury.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/Armoury.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Armoury.java	2000/07/13 21:13:59	1.24
+++ Armoury.java	2000/07/14 00:12:07	1.25
@@ -1,4 +1,4 @@
-/* $Id: Armoury.java,v 1.24 2000/07/13 21:13:59 gelderen Exp $
+/* $Id: Armoury.java,v 1.25 2000/07/14 00:12:07 gelderen Exp $
  *
  * Copyright (c) Systemics Inc. 1995-2000 on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -37,7 +37,7 @@
  *        <a href="http://www.imc.org/rfc2045">http://www.imc.org/rfc2045</a>
  * </ol>
  *
- * @version $Revision: 1.24 $
+ * @version $Revision: 1.25 $
  */
 public abstract class Armoury
 {
@@ -73,7 +73,7 @@
      * @exception InvalidChecksumException if the checksum fails.
      */
     public static byte[] decode(String msg)
-        throws IOException // , InvalidChecksumException
+        throws IOException
     {
         linecount = 0;
         int state = WAITING;
@@ -374,9 +374,6 @@
     public static X509Cert decodeCert(String buf)
         throws SOXKeyException // , InvalidChecksumException
     {
-//System.err.println("length of bytearray: " + decodeByteArray("CERTIFICATE", buf).length);
-//System.err.println("bytearraydata for cert: " + decodeByteArray("CERTIFICATE", buf).hashCode() );
-        //return new X509Cert(decodeByteArray("CERTIFICATE", buf));
         try
         {
             return new X509Cert(decode(buf) );
@@ -425,9 +422,6 @@
     public static PublicKey decodePublicKey(String buf)
         throws InvalidKeyException
     {
-// return Crypto.decodePublicKey(decodeByteArray("PUBLIC KEY", buf));
-// return new X509Key(decodeByteArray("PUBLIC KEY", buf));
-
         try
         {
             byte[] raw = decodeByteArray("PUBLIC KEY", buf);
@@ -435,7 +429,6 @@
         }
         catch (IOException e)
         {
-            e = null; // jikes
             throw new InvalidKeyException("Bad char / padding in armoured key");
         }
     }
@@ -474,7 +467,6 @@
         }
         catch (Exception e)
         {
-            e = null; // jikes
             throw new InvalidKeyException("Bad char / padding in ascii armour");
         }
     }
@@ -617,7 +609,6 @@
         throws Exception
     {
         byte[] prepared = prepareDataToSign(buf);
-        //System.err.println("prepared: <<<" + new String(prepared) + ">>>");
         byte[] ddd = Crypto.digest(prepared);
         System.err.println("digest  : " + webfunds.utils.Hex.data2hex(ddd));
     }