diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2005-03-31 02:48:26 +0400 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2005-03-31 02:48:26 +0400 |
| commit | 4a93eca61ace3b72e9c7d3241e22894ac6527751 (patch) | |
| tree | dbd032d4df2424646bcb58ddec5e5241c16ef1d4 | |
| parent | af152d7dc90d09d1aecb8e0d9eb26cb8c24dcc9d (diff) | |
Some from Sebastienmono-1.1.6
svn path=/branches/mono-1-1-6/mcs/; revision=42401
4 files changed, 14 insertions, 2 deletions
diff --git a/mcs/class/Mono.Security/Mono.Security.Cryptography/ChangeLog b/mcs/class/Mono.Security/Mono.Security.Cryptography/ChangeLog index 72d42be1a71..23254826619 100644 --- a/mcs/class/Mono.Security/Mono.Security.Cryptography/ChangeLog +++ b/mcs/class/Mono.Security/Mono.Security.Cryptography/ChangeLog @@ -1,3 +1,8 @@ +2005-03-30 Sebastien Pouliot <sebastien@ximian.com> + + * SymmetricTransform.cs: Fixed a padding bug affecting that can occurs + when no padding is used. + 2005-03-07 Sebastien Pouliot <sebastien@ximian.com> * MD2Managed.cs: Removed memory allocation from the transform method. diff --git a/mcs/class/Mono.Security/Mono.Security.Cryptography/SymmetricTransform.cs b/mcs/class/Mono.Security/Mono.Security.Cryptography/SymmetricTransform.cs index b52b05e79ef..036df4108d3 100755 --- a/mcs/class/Mono.Security/Mono.Security.Cryptography/SymmetricTransform.cs +++ b/mcs/class/Mono.Security/Mono.Security.Cryptography/SymmetricTransform.cs @@ -414,7 +414,8 @@ namespace Mono.Security.Cryptography { lastBlock = false; } - byte padding = res [total - 1]; + // total may be 0 (e.g. PaddingMode.None) + byte padding = ((total > 0) ? res [total - 1] : (byte) 0); switch (algo.Padding) { #if NET_2_0 case PaddingMode.ANSIX923: diff --git a/mcs/class/corlib/Mono.Security.Cryptography/ChangeLog b/mcs/class/corlib/Mono.Security.Cryptography/ChangeLog index e2395ca02fa..0fb37d799c9 100644 --- a/mcs/class/corlib/Mono.Security.Cryptography/ChangeLog +++ b/mcs/class/corlib/Mono.Security.Cryptography/ChangeLog @@ -1,3 +1,8 @@ +2005-03-30 Sebastien Pouliot <sebastien@ximian.com> + + * SymmetricTransform.cs: Fixed a padding bug affecting that can occurs + when no padding is used. + 2005-01-11 Sebastien Pouliot <sebastien@ximian.com> * DSAManaged.cs: PublicOnly now reports false when a key hasn't yet diff --git a/mcs/class/corlib/Mono.Security.Cryptography/SymmetricTransform.cs b/mcs/class/corlib/Mono.Security.Cryptography/SymmetricTransform.cs index b52b05e79ef..036df4108d3 100755 --- a/mcs/class/corlib/Mono.Security.Cryptography/SymmetricTransform.cs +++ b/mcs/class/corlib/Mono.Security.Cryptography/SymmetricTransform.cs @@ -414,7 +414,8 @@ namespace Mono.Security.Cryptography { lastBlock = false; } - byte padding = res [total - 1]; + // total may be 0 (e.g. PaddingMode.None) + byte padding = ((total > 0) ? res [total - 1] : (byte) 0); switch (algo.Padding) { #if NET_2_0 case PaddingMode.ANSIX923: |