[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Security/Cryptography CryptoAPITransform.cs,1.4,1.5 ECBDecrypt.cs,1.2,1.3 ECBEncrypt.cs,1.1,1.2

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Cryptography
In directory subversions:/tmp/cvs-serv9952/runtime/System/Security/Cryptography

Modified Files:
        CryptoAPITransform.cs ECBDecrypt.cs ECBEncrypt.cs 
Log Message:


Fix some ECB mode bugs; add test case support for testing cipher modes.


Index: CryptoAPITransform.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Cryptography/CryptoAPITransform.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** CryptoAPITransform.cs       26 Nov 2002 11:50:00 -0000      1.4
--- CryptoAPITransform.cs       27 Nov 2002 22:27:06 -0000      1.5
***************
*** 317,320 ****
--- 317,325 ----
                                                ("outputOffset", 
_("ArgRange_Array"));
                                }
+                               if(state == IntPtr.Zero)
+                               {
+                                       throw new ObjectDisposedException
+                                               (null, _("Crypto_MissingKey"));
+                               }
  
                                // Process the input.
***************
*** 344,347 ****
--- 349,357 ----
                                {
                                        throw new 
ArgumentException(_("Arg_InvalidArrayRange"));
+                               }
+                               if(state == IntPtr.Zero)
+                               {
+                                       throw new ObjectDisposedException
+                                               (null, _("Crypto_MissingKey"));
                                }
  

Index: ECBDecrypt.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Cryptography/ECBDecrypt.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ECBDecrypt.cs       22 Nov 2002 00:17:48 -0000      1.2
--- ECBDecrypt.cs       27 Nov 2002 22:27:06 -0000      1.3
***************
*** 35,39 ****
        public static void Initialize(CryptoAPITransform transform)
                        {
!                               transform.tempBuffer = new byte 
[transform.blockSize];
                                transform.tempSize = 0;
                        }
--- 35,39 ----
        public static void Initialize(CryptoAPITransform transform)
                        {
!                               transform.tempBuffer = new byte 
[transform.blockSize * 2];
                                transform.tempSize = 0;
                        }

Index: ECBEncrypt.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Cryptography/ECBEncrypt.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ECBEncrypt.cs       18 Jul 2002 00:30:33 -0000      1.1
--- ECBEncrypt.cs       27 Nov 2002 22:27:06 -0000      1.2
***************
*** 111,116 ****
                                        // Encrypt the block.
                                        CryptoMethods.Encrypt(state, 
outputBuffer,
!                                                                               
  offset + index, outputBuffer,
!                                                                               
  offset + index);
                                }
                                else if(inputCount > 0)
--- 111,117 ----
                                        // Encrypt the block.
                                        CryptoMethods.Encrypt(state, 
outputBuffer,
!                                                                               
  offset + index - blockSize,
!                                                                               
  outputBuffer,
!                                                                               
  offset + index - blockSize);
                                }
                                else if(inputCount > 0)
***************
*** 130,135 ****
                                        // Encrypt the block.
                                        CryptoMethods.Encrypt(state, 
outputBuffer,
!                                                                               
  offset + index, outputBuffer,
!                                                                               
  offset + index);
                                }
  
--- 131,137 ----
                                        // Encrypt the block.
                                        CryptoMethods.Encrypt(state, 
outputBuffer,
!                                                                               
  offset + index - blockSize,
!                                                                               
  outputBuffer,
!                                                                               
  offset + index - blockSize);
                                }