ObsoleteAttribute cleanup

2 files changed, 0 insertions, 311 deletions

diff --git a/crypto/src/util/zlib/ZDeflaterOutputStream.cs b/crypto/src/util/zlib/ZDeflaterOutputStream.cs
deleted file mode 100644
index d0978942a..000000000
--- a/crypto/src/util/zlib/ZDeflaterOutputStream.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using System;
-using System.IO;
-
-namespace Org.BouncyCastle.Utilities.Zlib {
-    /// <summary>
-    /// Summary description for DeflaterOutputStream.
-    /// </summary>
-    [Obsolete("Use 'ZOutputStream' instead")]
-    public class ZDeflaterOutputStream : Stream {
-        protected ZStream z=new ZStream();
-        protected int flushLevel=JZlib.Z_NO_FLUSH;
-        private const int BUFSIZE = 4192;
-        protected byte[] buf=new byte[BUFSIZE];
-        private byte[] buf1=new byte[1];
-
-        protected Stream outp;
-
-        public ZDeflaterOutputStream(Stream outp) : this(outp, 6, false) {
-        }
-    
-        public ZDeflaterOutputStream(Stream outp, int level) : this(outp, level, false) {
-        }
-    
-        public ZDeflaterOutputStream(Stream outp, int level, bool nowrap) {
-            this.outp=outp;
-            z.deflateInit(level, nowrap);
-        }
-    
-    
-        public override bool CanRead {
-            get {
-                // TODO:  Add DeflaterOutputStream.CanRead getter implementation
-                return false;
-            }
-        }
-    
-        public override bool CanSeek {
-            get {
-                // TODO:  Add DeflaterOutputStream.CanSeek getter implementation
-                return false;
-            }
-        }
-    
-        public override bool CanWrite {
-            get {
-                // TODO:  Add DeflaterOutputStream.CanWrite getter implementation
-                return true;
-            }
-        }
-    
-        public override long Length {
-            get {
-                // TODO:  Add DeflaterOutputStream.Length getter implementation
-                return 0;
-            }
-        }
-    
-        public override long Position {
-            get {
-                // TODO:  Add DeflaterOutputStream.Position getter implementation
-                return 0;
-            }
-            set {
-                // TODO:  Add DeflaterOutputStream.Position setter implementation
-            }
-        }
-    
-        public override void Write(byte[] b, int off, int len) {
-            if(len==0)
-                return;
-            int err;
-            z.next_in=b;
-            z.next_in_index=off;
-            z.avail_in=len;
-            do{
-                z.next_out=buf;
-                z.next_out_index=0;
-                z.avail_out=BUFSIZE;
-                err=z.deflate(flushLevel);
-                if(err!=JZlib.Z_OK)
-                    throw new IOException("deflating: "+z.msg);
-				if (z.avail_out < BUFSIZE)
-				{
-					outp.Write(buf, 0, BUFSIZE-z.avail_out);
-				}
-            }
-            while(z.avail_in>0 || z.avail_out==0);
-        }
-    
-        public override long Seek(long offset, SeekOrigin origin) {
-            // TODO:  Add DeflaterOutputStream.Seek implementation
-            return 0;
-        }
-    
-        public override void SetLength(long value) {
-            // TODO:  Add DeflaterOutputStream.SetLength implementation
-
-        }
-    
-        public override int Read(byte[] buffer, int offset, int count) {
-            // TODO:  Add DeflaterOutputStream.Read implementation
-            return 0;
-        }
-    
-        public override void Flush() {
-            outp.Flush();
-        }
-    
-        public override void WriteByte(byte b) {
-            buf1[0]=(byte)b;
-            Write(buf1, 0, 1);
-        }
-
-        public void Finish() {
-            int err;
-            do{
-                z.next_out=buf;
-                z.next_out_index=0;
-                z.avail_out=BUFSIZE;
-                err=z.deflate(JZlib.Z_FINISH);
-                if(err!=JZlib.Z_STREAM_END && err != JZlib.Z_OK)
-                    throw new IOException("deflating: "+z.msg);
-                if(BUFSIZE-z.avail_out>0){
-                    outp.Write(buf, 0, BUFSIZE-z.avail_out);
-                }
-            }
-            while(z.avail_in>0 || z.avail_out==0);
-            Flush();
-        }
-
-        public void End() {
-            if(z==null)
-                return;
-            z.deflateEnd();
-            z.free();
-            z=null;
-        }
-
-#if PORTABLE
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                try{
-                    try{Finish();}
-                    catch (IOException) {}
-                }
-                finally{
-                    End();
-                    Platform.Dispose(outp);
-                    outp=null;
-                }
-            }
-            base.Dispose(disposing);
-        }
-#else
-        public override void Close() {
-            try{
-                try{Finish();}
-                catch (IOException) {}
-            }
-            finally{
-                End();
-                Platform.Dispose(outp);
-                outp=null;
-            }
-            base.Close();
-        }
-#endif
-    }
-}
diff --git a/crypto/src/util/zlib/ZInflaterInputStream.cs b/crypto/src/util/zlib/ZInflaterInputStream.cs
deleted file mode 100644
index ef742bb00..000000000
--- a/crypto/src/util/zlib/ZInflaterInputStream.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-using System;
-using System.IO;
-
-namespace Org.BouncyCastle.Utilities.Zlib {
-    /// <summary>
-    /// Summary description for DeflaterOutputStream.
-    /// </summary>
-    [Obsolete("Use 'ZInputStream' instead")]
-    public class ZInflaterInputStream : Stream {
-        protected ZStream z=new ZStream();
-        protected int flushLevel=JZlib.Z_NO_FLUSH;
-        private const int BUFSIZE = 4192;
-        protected byte[] buf=new byte[BUFSIZE];
-        private byte[] buf1=new byte[1];
-
-        protected Stream inp=null;
-        private bool nomoreinput=false;
-
-        public ZInflaterInputStream(Stream inp) : this(inp, false) {
-        }
-    
-        public ZInflaterInputStream(Stream inp, bool nowrap) {
-            this.inp=inp;
-            z.inflateInit(nowrap);
-            z.next_in=buf;
-            z.next_in_index=0;
-            z.avail_in=0;
-        }
-    
-        public override bool CanRead {
-            get {
-                // TODO:  Add DeflaterOutputStream.CanRead getter implementation
-                return true;
-            }
-        }
-    
-        public override bool CanSeek {
-            get {
-                // TODO:  Add DeflaterOutputStream.CanSeek getter implementation
-                return false;
-            }
-        }
-    
-        public override bool CanWrite {
-            get {
-                // TODO:  Add DeflaterOutputStream.CanWrite getter implementation
-                return false;
-            }
-        }
-    
-        public override long Length {
-            get {
-                // TODO:  Add DeflaterOutputStream.Length getter implementation
-                return 0;
-            }
-        }
-    
-        public override long Position {
-            get {
-                // TODO:  Add DeflaterOutputStream.Position getter implementation
-                return 0;
-            }
-            set {
-                // TODO:  Add DeflaterOutputStream.Position setter implementation
-            }
-        }
-    
-        public override void Write(byte[] b, int off, int len) {
-        }
-    
-        public override long Seek(long offset, SeekOrigin origin) {
-            // TODO:  Add DeflaterOutputStream.Seek implementation
-            return 0;
-        }
-    
-        public override void SetLength(long value) {
-            // TODO:  Add DeflaterOutputStream.SetLength implementation
-
-        }
-    
-        public override int Read(byte[] b, int off, int len) {
-            if(len==0)
-                return(0);
-            int err;
-            z.next_out=b;
-            z.next_out_index=off;
-            z.avail_out=len;
-            do {
-                if((z.avail_in==0)&&(!nomoreinput)) { // if buffer is empty and more input is avaiable, refill it
-                    z.next_in_index=0;
-                    z.avail_in=inp.Read(buf, 0, BUFSIZE);//(BUFSIZE<z.avail_out ? BUFSIZE : z.avail_out));
-                    if(z.avail_in<=0) {
-                        z.avail_in=0;
-                        nomoreinput=true;
-                    }
-                }
-                err=z.inflate(flushLevel);
-                if(nomoreinput&&(err==JZlib.Z_BUF_ERROR))
-                    return(0);
-                if(err!=JZlib.Z_OK && err!=JZlib.Z_STREAM_END)
-                    throw new IOException("inflating: "+z.msg);
-                if((nomoreinput||err==JZlib.Z_STREAM_END)&&(z.avail_out==len))
-                    return(0);
-            } 
-            while(z.avail_out==len&&err==JZlib.Z_OK);
-            //System.err.print("("+(len-z.avail_out)+")");
-            return(len-z.avail_out);
-        }
-    
-        public override void Flush() {
-            inp.Flush();
-        }
-    
-        public override void WriteByte(byte b) {
-        }
-
-#if PORTABLE
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                Platform.Dispose(inp);
-            }
-            base.Dispose(disposing);
-        }
-#else
-        public override void Close()
-        {
-            Platform.Dispose(inp);
-            base.Close();
-        }
-#endif
-
-        public override int ReadByte() {
-            if(Read(buf1, 0, 1)<=0)
-                return -1;
-            return(buf1[0]&0xFF);
-        }
-    }
-}