2006-02-03 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mcs / class / corlib / System.Security.Cryptography / CryptoStream.cs

diff --git a/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs b/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs
old mode 100755 (executable)
new mode 100644 (file)
index 04b0bc6..28511ee
--- a/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs
@@ -6,11 +6,7 @@
 //     Sebastien Pouliot (sebastien@ximian.com)
 //
 // Portions (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
-// (C) 2004 Novell (http://www.novell.com)
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -32,13 +28,15 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.Globalization;
 using System.IO;
 using System.Runtime.InteropServices;
 
 namespace System.Security.Cryptography {
 
+#if NET_2_0
+       [ComVisible (true)]
+#endif
        public class CryptoStream : Stream {
                private Stream _stream;
                private ICryptoTransform _transform;
@@ -278,8 +276,6 @@ namespace System.Security.Cryptography {
                                        // transform all except the last block (which may be the last block
                                        // of the stream and require TransformFinalBlock)
                                        int numBlock = ((_partialCount + count) / _transform.InputBlockSize);
-                                       if (((_partialCount + count) % _transform.InputBlockSize) == 0) // partial block ?
-                                               numBlock--; // no then reduce
                                        int multiSize = (numBlock * _transform.InputBlockSize);
                                        if (numBlock > 0) {
                                                byte[] multiBlocks = new byte [multiSize];
@@ -349,7 +345,11 @@ namespace System.Security.Cryptography {
                        throw new NotSupportedException ("SetLength");
                }
 
+#if NET_2_0
+               protected override void Dispose (bool disposing) 
+#else
                protected virtual void Dispose (bool disposing) 
+#endif
                {
                        if (!_disposed) {
                                _disposed = true;