2004-05-27 Sebastien Pouliot <sebastien@ximian.com>

	* SymmetricTransform.cs: Added missing exception handling in
	TransformBlock and TransformFinalBlock.

svn path=/trunk/mcs/; revision=28259

diff --git a/mcs/class/Mono.Security/Mono.Security.Cryptography/ChangeLog b/mcs/class/Mono.Security/Mono.Security.Cryptography/ChangeLog
index 1f378cbb8e88f645fea59d72f1882ab16d695e11..508b578243ffa90a90bf67b8d11d714da2174462 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Security.Cryptography/ChangeLog
+++ b/mcs/class/Mono.Security/Mono.Security.Cryptography/ChangeLog
@@ -2,7 +2,8 @@
 
        * ARC4Managed.cs: Added missing exception handling in TransformBlock 
        and TransformFinalBlock.
-       * SymmetricTransform.cs: Fixed possible integer overflow.
+       * SymmetricTransform.cs: Fixed possible integer overflow. Added 
+       missing exception handling in TransformBlock and TransformFinalBlock.
 
 2004-05-10  Sebastien Pouliot  <sebastien@ximian.com>
 

diff --git a/mcs/class/Mono.Security/Mono.Security.Cryptography/SymmetricTransform.cs b/mcs/class/Mono.Security/Mono.Security.Cryptography/SymmetricTransform.cs
index 0efad25e85fadeaafb8b929da9cc0539074f9a18..f3784c6eec3a0ade41fbe004e981803b479971bc 100755 (executable)
--- a/mcs/class/Mono.Security/Mono.Security.Cryptography/SymmetricTransform.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Cryptography/SymmetricTransform.cs
@@ -182,15 +182,39 @@ namespace Mono.Security.Cryptography {
                        throw new NotImplementedException ("CTS not yet supported");
                }
 
+               private void CheckInput (byte[] inputBuffer, int inputOffset, int inputCount)
+               {
+                       if (inputBuffer == null)
+                               throw new ArgumentNullException ("inputBuffer");
+                       if (inputOffset < 0)
+                               throw new ArgumentOutOfRangeException ("inputOffset", "< 0");
+                       if (inputCount < 0)
+                               throw new ArgumentOutOfRangeException ("inputCount", "< 0");
+                       // ordered to avoid possible integer overflow
+                       if (inputOffset > inputBuffer.Length - inputCount)
+                               throw new ArgumentException ("inputBuffer", Locale.GetText ("Overflow"));
+               }
+
                // this method may get called MANY times so this is the one to optimize
-               public virtual int TransformBlock (byte [] inputBuffer, int inputOffset, int inputCount, byte [] outputBuffer, int outputOffset) 
+               public virtual int TransformBlock (byte[] inputBuffer, int inputOffset, int inputCount, byte[] outputBuffer, int outputOffset) 
                {
                        if (m_disposed)
                                throw new ObjectDisposedException ("Object is disposed");
-                       // reordered to avoid possible integer overflow
+                       CheckInput (inputBuffer, inputOffset, inputCount);
+                       // check output parameters
+                       if (outputBuffer == null)
+                               throw new ArgumentNullException ("outputBuffer");
+                       if (outputOffset < 0)
+                               throw new ArgumentOutOfRangeException ("outputOffset", "< 0");
+                       // ordered to avoid possible integer overflow
                        if (outputOffset > outputBuffer.Length - inputCount)
-                               throw new CryptographicException ("Insufficient output buffer size.");
+                               throw new ArgumentException ("outputBuffer", Locale.GetText ("Overflow"));
 
+                       return InternalTransformBlock (inputBuffer, inputOffset, inputCount, outputBuffer, outputOffset);
+               }
+
+               private int InternalTransformBlock (byte[] inputBuffer, int inputOffset, int inputCount, byte[] outputBuffer, int outputOffset) 
+               {
                        int offs = inputOffset;
                        int full;
 
@@ -250,7 +274,7 @@ namespace Mono.Security.Cryptography {
 
                        // process all blocks except the last (final) block
                        while (total > BlockSizeByte) {
-                               TransformBlock (inputBuffer, inputOffset, BlockSizeByte, res, outputOffset);
+                               InternalTransformBlock (inputBuffer, inputOffset, BlockSizeByte, res, outputOffset);
                                inputOffset += BlockSizeByte;
                                outputOffset += BlockSizeByte;
                                total -= BlockSizeByte;
@@ -263,15 +287,15 @@ namespace Mono.Security.Cryptography {
                                        res [i] = padding;
                                Buffer.BlockCopy (inputBuffer, inputOffset, res, full, rem);
                                // the last padded block will be transformed in-place
-                               TransformBlock (res, full, BlockSizeByte, res, full);
+                               InternalTransformBlock (res, full, BlockSizeByte, res, full);
                        }
                        else
-                               TransformBlock (inputBuffer, inputOffset, BlockSizeByte, res, outputOffset);
+                               InternalTransformBlock (inputBuffer, inputOffset, BlockSizeByte, res, outputOffset);
 
                        return res;
                }
 
-               private byte[] FinalDecrypt (byte [] inputBuffer, int inputOffset, int inputCount) 
+               private byte[] FinalDecrypt (byte[] inputBuffer, int inputOffset, int inputCount) 
                {
                        if ((inputCount % BlockSizeByte) > 0)
                                throw new CryptographicException ("Invalid input block size.");
@@ -280,7 +304,7 @@ namespace Mono.Security.Cryptography {
                        byte[] res = new byte [total];
                        int outputOffset = 0;
                        while (inputCount > 0) {
-                               TransformBlock (inputBuffer, inputOffset, BlockSizeByte, res, outputOffset);
+                               InternalTransformBlock (inputBuffer, inputOffset, BlockSizeByte, res, outputOffset);
                                inputOffset += BlockSizeByte;
                                outputOffset += BlockSizeByte;
                                inputCount -= BlockSizeByte;
@@ -307,10 +331,11 @@ namespace Mono.Security.Cryptography {
                                return new byte [0];
                }
 
-               public virtual byte [] TransformFinalBlock (byte [] inputBuffer, int inputOffset, int inputCount) 
+               public virtual byte[] TransformFinalBlock (byte[] inputBuffer, int inputOffset, int inputCount) 
                {
                        if (m_disposed)
                                throw new ObjectDisposedException ("Object is disposed");
+                       CheckInput (inputBuffer, inputOffset, inputCount);
 
                        if (encrypt)
                                return FinalEncrypt (inputBuffer, inputOffset, inputCount);

diff --git a/mcs/class/corlib/Mono.Security.Cryptography/ChangeLog b/mcs/class/corlib/Mono.Security.Cryptography/ChangeLog
index 93579b9fd7d484ac0738971d74ea902c10777a61..9ee89e8e248704bf12534374dcbc27f36bb13406 100644 (file)
--- a/mcs/class/corlib/Mono.Security.Cryptography/ChangeLog
+++ b/mcs/class/corlib/Mono.Security.Cryptography/ChangeLog
@@ -1,6 +1,7 @@
 2004-05-27  Sebastien Pouliot  <sebastien@ximian.com>
 
-       * SymmetricTransform.cs: Fixed possible integer overflow.
+       * SymmetricTransform.cs: Fixed possible integer overflow. Added 
+       missing exception handling in TransformBlock and TransformFinalBlock.
 
 2004-05-01  Sebastien Pouliot  <sebastien@ximian.com>
 

diff --git a/mcs/class/corlib/Mono.Security.Cryptography/SymmetricTransform.cs b/mcs/class/corlib/Mono.Security.Cryptography/SymmetricTransform.cs
index 0efad25e85fadeaafb8b929da9cc0539074f9a18..f3784c6eec3a0ade41fbe004e981803b479971bc 100755 (executable)
--- a/mcs/class/corlib/Mono.Security.Cryptography/SymmetricTransform.cs
+++ b/mcs/class/corlib/Mono.Security.Cryptography/SymmetricTransform.cs
@@ -182,15 +182,39 @@ namespace Mono.Security.Cryptography {
                        throw new NotImplementedException ("CTS not yet supported");
                }
 
+               private void CheckInput (byte[] inputBuffer, int inputOffset, int inputCount)
+               {
+                       if (inputBuffer == null)
+                               throw new ArgumentNullException ("inputBuffer");
+                       if (inputOffset < 0)
+                               throw new ArgumentOutOfRangeException ("inputOffset", "< 0");
+                       if (inputCount < 0)
+                               throw new ArgumentOutOfRangeException ("inputCount", "< 0");
+                       // ordered to avoid possible integer overflow
+                       if (inputOffset > inputBuffer.Length - inputCount)
+                               throw new ArgumentException ("inputBuffer", Locale.GetText ("Overflow"));
+               }
+
                // this method may get called MANY times so this is the one to optimize
-               public virtual int TransformBlock (byte [] inputBuffer, int inputOffset, int inputCount, byte [] outputBuffer, int outputOffset) 
+               public virtual int TransformBlock (byte[] inputBuffer, int inputOffset, int inputCount, byte[] outputBuffer, int outputOffset) 
                {
                        if (m_disposed)
                                throw new ObjectDisposedException ("Object is disposed");
-                       // reordered to avoid possible integer overflow
+                       CheckInput (inputBuffer, inputOffset, inputCount);
+                       // check output parameters
+                       if (outputBuffer == null)
+                               throw new ArgumentNullException ("outputBuffer");
+                       if (outputOffset < 0)
+                               throw new ArgumentOutOfRangeException ("outputOffset", "< 0");
+                       // ordered to avoid possible integer overflow
                        if (outputOffset > outputBuffer.Length - inputCount)
-                               throw new CryptographicException ("Insufficient output buffer size.");
+                               throw new ArgumentException ("outputBuffer", Locale.GetText ("Overflow"));
 
+                       return InternalTransformBlock (inputBuffer, inputOffset, inputCount, outputBuffer, outputOffset);
+               }
+
+               private int InternalTransformBlock (byte[] inputBuffer, int inputOffset, int inputCount, byte[] outputBuffer, int outputOffset) 
+               {
                        int offs = inputOffset;
                        int full;
 
@@ -250,7 +274,7 @@ namespace Mono.Security.Cryptography {
 
                        // process all blocks except the last (final) block
                        while (total > BlockSizeByte) {
-                               TransformBlock (inputBuffer, inputOffset, BlockSizeByte, res, outputOffset);
+                               InternalTransformBlock (inputBuffer, inputOffset, BlockSizeByte, res, outputOffset);
                                inputOffset += BlockSizeByte;
                                outputOffset += BlockSizeByte;
                                total -= BlockSizeByte;
@@ -263,15 +287,15 @@ namespace Mono.Security.Cryptography {
                                        res [i] = padding;
                                Buffer.BlockCopy (inputBuffer, inputOffset, res, full, rem);
                                // the last padded block will be transformed in-place
-                               TransformBlock (res, full, BlockSizeByte, res, full);
+                               InternalTransformBlock (res, full, BlockSizeByte, res, full);
                        }
                        else
-                               TransformBlock (inputBuffer, inputOffset, BlockSizeByte, res, outputOffset);
+                               InternalTransformBlock (inputBuffer, inputOffset, BlockSizeByte, res, outputOffset);
 
                        return res;
                }
 
-               private byte[] FinalDecrypt (byte [] inputBuffer, int inputOffset, int inputCount) 
+               private byte[] FinalDecrypt (byte[] inputBuffer, int inputOffset, int inputCount) 
                {
                        if ((inputCount % BlockSizeByte) > 0)
                                throw new CryptographicException ("Invalid input block size.");
@@ -280,7 +304,7 @@ namespace Mono.Security.Cryptography {
                        byte[] res = new byte [total];
                        int outputOffset = 0;
                        while (inputCount > 0) {
-                               TransformBlock (inputBuffer, inputOffset, BlockSizeByte, res, outputOffset);
+                               InternalTransformBlock (inputBuffer, inputOffset, BlockSizeByte, res, outputOffset);
                                inputOffset += BlockSizeByte;
                                outputOffset += BlockSizeByte;
                                inputCount -= BlockSizeByte;
@@ -307,10 +331,11 @@ namespace Mono.Security.Cryptography {
                                return new byte [0];
                }
 
-               public virtual byte [] TransformFinalBlock (byte [] inputBuffer, int inputOffset, int inputCount) 
+               public virtual byte[] TransformFinalBlock (byte[] inputBuffer, int inputOffset, int inputCount) 
                {
                        if (m_disposed)
                                throw new ObjectDisposedException ("Object is disposed");
+                       CheckInput (inputBuffer, inputOffset, inputCount);
 
                        if (encrypt)
                                return FinalEncrypt (inputBuffer, inputOffset, inputCount);