diff options
| author | Bryce McKinlay <bryce@gcc.gnu.org> | 2001-04-25 16:45:15 +0100 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2001-04-25 16:45:15 +0100 |
| commit | 28f7d9d05ad70afad626d4bc54c633d31eb7430a (patch) | |
| tree | e9e280e2d95c4a16d714ee23d9f0345ef0401260 /libjava/java/security/DigestInputStream.java | |
| parent | 744cfa53c3f98a0cb0d952a176c8bc03aee1abba (diff) | |
| download | gcc-28f7d9d05ad70afad626d4bc54c633d31eb7430a.zip gcc-28f7d9d05ad70afad626d4bc54c633d31eb7430a.tar.gz gcc-28f7d9d05ad70afad626d4bc54c633d31eb7430a.tar.bz2 | |
decl.c (init_decl_processing): Add new class "protectionDomain" field.
gcc/java:
2001-04-25 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
* decl.c (init_decl_processing): Add new class "protectionDomain"
field.
* class.c (make_class_data): Set initial value for "protectionDomain".
libjava:
2001-04-25 Bryce McKinlay <bryce@albatross.co.nz>
java.security merge and ClassLoader compliance fixes.
* java/lang/Class.h (Class): Include ProtectionDomain.h.
New protectionDomain field.
(forName): Add initialize parameter. Fixes declaration to comply with
JDK spec.
* java/lang/natClass.cc (forName): Correct declaration of the three-arg
variant. Honour "initialize" flag.
(getProtectionDomain0): New method.
* java/lang/Class.java: Fix forName() declaration.
(getPackage): New method based on Classpath implementation.
(getProtectionDomain0): New native method decl.
(getProtectionDomain): New method.
* java/lang/ClassLoader.java (getParent): Now final.
(definedPackages): New field.
(getPackage): New.
(defineClass): New variant with protectionDomain argument.
(definePackage): New.
(getPackages): New.
(findSystemClass): Now final.
(getSystemResourceAsStream): Remove redundant "final" modifier.
(getSystemResource): Remove redundant "final" modifier.
(getResources): Now final.
(protectionDomainPermission): New static field.
(unknownProtectionDomain): Ditto.
(defaultProtectionDomain): Ditto.
(getSystemClassLoader): Now non-native.
* java/util/ResourceBundle.java (tryGetSomeBundle): Use the correct
arguments for Class.forName().
* java/lang/Package.java: New file.
* gnu/gcj/runtime/VMClassLoader.java (getVMClassLoader): Removed.
(instance): Static initialize singleton.
(findClass): Override this, not findSystemClass.
* java/lang/natClassLoader.cc (defineClass0): Set class's
protectionDomain field as specified.
(getSystemClassLoader): Removed.
(findClass): Renamed from findSystemClass. Call the interpreter via
URLClassLoader.findClass if loading class via dlopen fails.
* java/security/*.java: java.security import/merge with Classpath.
* java/security/acl/*.java: Likewise.
* java/security/interfaces/*.java: Likewise.
* java/security/spec/*.java: Likewise.
* java/net/NetPermission.java: Likewise.
* java/net/SocketPermission.java: Likewise.
* gnu/java/security/provider/DefaultPolicy.java: Likewise.
* Makefile.am: Add new classes.
* Makefile.in: Rebuilt.
* gcj/javaprims.h: CNI namespace rebuild.
From-SVN: r41543
Diffstat (limited to 'libjava/java/security/DigestInputStream.java')
| -rw-r--r-- | libjava/java/security/DigestInputStream.java | 155 |
1 files changed, 155 insertions, 0 deletions
diff --git a/libjava/java/security/DigestInputStream.java b/libjava/java/security/DigestInputStream.java new file mode 100644 index 0000000..bfb6c40 --- /dev/null +++ b/libjava/java/security/DigestInputStream.java @@ -0,0 +1,155 @@ +/* DigestInputStream.java --- An Input stream tied to a message digest + Copyright (C) 1999 Free Software Foundation, Inc. + +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. + +As a special exception, if you link this library with other files to +produce an executable, this library does not by itself cause the +resulting executable to be covered by the GNU General Public License. +This exception does not however invalidate any other reasons why the +executable file might be covered by the GNU General Public License. */ + +package java.security; +//import java.security.MessageDigest; +import java.io.InputStream; +import java.io.FilterInputStream; +import java.io.IOException; + +/** + DigestInputStream is a class that ties an InputStream with a + MessageDigest. The Message Digest is used by the class to + update it self as bytes are read from the InputStream. + + The updating to the digest depends on the on flag which is set + to true by default to tell the class to update the data + in the message digest. + + @version 0.0 + @author Mark Benvenuto <ivymccough@worldnet.att.net> + */ +public class DigestInputStream extends FilterInputStream +{ + /** + The message digest for the DigestInputStream + */ + protected MessageDigest digest; + + //Manages the on flag + private boolean state = true; + + /** + Constructs a new DigestInputStream. + It associates a MessageDigest with the stream to + compute the stream as data is written. + + @param stream An InputStream to associate this stream with + @param digest A MessageDigest to hash the stream with + */ + public DigestInputStream(InputStream stream, MessageDigest digest) + { + super(stream); + //this.in = stream; + this.digest = digest; + } + + /** + Returns the MessageDigest associated with this DigestInputStream + + @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; + } + + /** + Reads a byte from the input stream and updates the digest. + This method reads the underlying input stream and if the + on flag is true then updates the message digest. + + @return Returns a byte from the input stream, -1 is returned to indicate that + the end of stream was reached before this read call + + @throws IOException if an IO error occurs in the underlying input stream, + this error is thrown + */ + public int read() throws IOException + { + int temp = in.read(); + + if (state == true && temp != -1) + digest.update((byte) temp); + + return temp; + } + + /** + Reads bytes from the input stream and updates the digest. + This method reads the underlying input stream and if the + on flag is true then updates the message digest. + + @param b a byte array to store the data from the input stream + @param off an offset to start at in the array + @param len length of data to read + @return Returns count of bytes read, -1 is returned to indicate that + the end of stream was reached before this read call + + @throws IOException if an IO error occurs in the underlying input stream, + this error is thrown + */ + public int read(byte[]b, int off, int len) throws IOException + { + int temp = in.read(b, off, len); + + if (state == true && temp != -1) + digest.update(b, off, len); + + return temp; + } + + /** + Sets the flag specifing if this DigestInputStream 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 input stream and underlying message digest to a string. + + @return A string representing the input stream and message digest. + */ + public String toString() + { + return "[Digest Input Stream] " + digest.toString(); + } +} |