[kaffe] CVS kaffe (robilad): Replaced DigestOutputStream by implemenation from GNU Classspath

Kaffe CVS cvs-commits at kaffe.org
Tue Sep 21 17:09:14 PDT 2004


PatchSet 5204 
Date: 2004/09/22 00:05:40
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Replaced DigestOutputStream by implemenation from GNU Classspath

2004-09-21  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/security/DigestOutputStream.java:
        Replaced by implementation from GNU Classpath.

Members: 
	ChangeLog:1.2759->1.2760 
	libraries/javalib/java/security/DigestOutputStream.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2759 kaffe/ChangeLog:1.2760
--- kaffe/ChangeLog:1.2759	Tue Sep 21 23:50:48 2004
+++ kaffe/ChangeLog	Wed Sep 22 00:05:40 2004
@@ -6,6 +6,11 @@
 
 2004-09-21  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/security/DigestOutputStream.java:
+        Replaced by implementation from GNU Classpath.
+
+2004-09-21  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/security/DigestInputStream.java:
         Replaced by implementation from GNU Classpath.
 
Index: kaffe/libraries/javalib/java/security/DigestOutputStream.java
diff -u kaffe/libraries/javalib/java/security/DigestOutputStream.java:1.2 kaffe/libraries/javalib/java/security/DigestOutputStream.java:1.3
--- kaffe/libraries/javalib/java/security/DigestOutputStream.java:1.2	Mon Mar 22 11:24:59 2004
+++ kaffe/libraries/javalib/java/security/DigestOutputStream.java	Wed Sep 22 00:05:42 2004
@@ -1,63 +1,157 @@
+/* DigestOutputStream.java --- An output stream tied to a message digest
+   Copyright (C) 1999 Free Software Foundation, Inc.
 
-/*
- * Java core library component.
- *
- * Copyright (c) 1999
- *	Archie L. Cobbs.  All rights reserved.
- * Copyright (c) 1999
- *	Transvirtual Technologies, Inc.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
- *
- * Author: Archie L. Cobbs <archie at whistle.com>
- */
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
 
 package java.security;
 
+import java.io.OutputStream;
 import java.io.FilterOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
 
-public class DigestOutputStream extends FilterOutputStream {
-	protected MessageDigest digest;
-	private boolean on;
-
-	public DigestOutputStream(OutputStream out, MessageDigest digest) {
-		super(out);
-		this.digest = digest;
-		this.on = true;
-	}
-
-	public MessageDigest getMessageDigest() {
-		return digest;
-	}
-
-	public void setMessageDigest(MessageDigest digest) {
-		this.digest = digest;
-	}
-
-	public void write(int b) throws IOException {
-		out.write(b);
-		if (on) {
-			digest.update((byte)b);
-		}
-	}
-
-	public void write(byte[] b, int off, int len) throws IOException {
-		out.write(b, off, len);
-		if (on) {
-			digest.update(b, off, len);
-		}
-	}
-
-	public void on(boolean on) {
-		this.on = on;
-	}
-
-	public String toString() {
-		return "DigestOutputStream(" + out.toString()
-			+ ", " + digest.toString() + ")";
-	}
-}
+/**
+   DigestOutputStream is a class that ties an OutputStream with a
+   MessageDigest. The Message Digest is used by the class to update it
+   self as bytes are written to the OutputStream.
+
+   The updating to the digest depends on the on flag which is set to
+   true by default that tells the class to update the data in the
+   message digest.
 
+   @version 0.0
+   @author Mark Benvenuto <ivymccough at worldnet.att.net>
+ */
+public class DigestOutputStream extends FilterOutputStream
+{
+  /**
+     The message digest for the DigestOutputStream
+   */
+  protected MessageDigest digest;
+
+  //Manages the on flag
+  private boolean state = true;
+
+  /**
+     Constructs a new DigestOutputStream.  It associates a
+     MessageDigest with the stream to compute the stream as data is
+     written.
+
+     @param stream An OutputStream to associate this stream with
+     @param digest A MessageDigest to hash the stream with
+   */
+  public DigestOutputStream(OutputStream stream, MessageDigest digest)
+  {
+    super(stream);
+    this.digest = digest;
+  }
+
+  /**
+     Returns the MessageDigest associated with this DigestOutputStream
+
+     @return The MessageDigest used to hash this stream
+   */
+  public MessageDigest getMessageDigest()
+  {
+    return digest;
+  }
+
+  /**
+     Sets the current MessageDigest to current parameter
+
+     @param digest A MessageDigest to associate with this stream
+   */
+  public void setMessageDigest(MessageDigest digest)
+  {
+    this.digest = digest;
+  }
+
+
+  /**
+     Updates the hash if the on flag is true and then writes a byte to
+     the underlying output stream.
+
+     @param b A byte to write to the output stream
+
+     @exception IOException if the underlying output stream 
+     cannot write the byte, this is thrown.
+   */
+  public void write(int b) throws IOException
+  {
+    if (state)
+      digest.update((byte) b);
+
+    out.write(b);
+  }
+
+  /**
+     Updates the hash if the on flag is true and then writes the bytes
+     to the underlying output stream.
+
+     @param b Bytes to write to the output stream
+     @param off Offset to start to start at in array
+     @param len Length of data to write
+
+     @exception IOException if the underlying output stream 
+     cannot write the bytes, this is thrown.
+   */
+  public void write(byte[]b, int off, int len) throws IOException
+  {
+    if (state)
+      digest.update(b, off, len);
+
+    out.write(b, off, len);
+  }
+
+  /**
+     Sets the flag specifying if this DigestOutputStream updates the
+     digest in the write() methods. The default is on;
+
+     @param on True means it digests stream, false means it does not
+   */
+  public void on(boolean on)
+  {
+    state = on;
+  }
+
+  /**
+     Converts the output stream and underlying message digest to a string.
+
+     @return A string representing the output stream and message digest.
+   */
+  public String toString()
+  {
+    return "[Digest Output Stream] " + digest.toString();
+  }
+}




More information about the kaffe mailing list