SymmetricAlgorithm.FeedbackSize must be a multiple of 8 (bits)

diff --git a/mcs/class/corlib/System.Security.Cryptography/SymmetricAlgorithm.cs b/mcs/class/corlib/System.Security.Cryptography/SymmetricAlgorithm.cs
index 60b57e7e7536b33dd99ebfab6ab36f4be80bae13..99b41562aef5e07b5075f35377e8b9fff6e210c7 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/SymmetricAlgorithm.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/SymmetricAlgorithm.cs
@@ -114,6 +114,10 @@ namespace System.Security.Cryptography {
                                        throw new CryptographicException (
                                                Locale.GetText ("feedback size larger than block size"));
                                }
+                               if ((value & 3) != 0) {
+                                       throw new CryptographicException (
+                                               Locale.GetText ("feedback size must be a multiple of 8 (bits)"));
+                               }
                                this.FeedbackSizeValue = value;
                        }
                }

diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/RijndaelTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography/RijndaelTest.cs
index a45dc64d1f4b86a4f614aeffa509f0f6336a2237..ea5c32c15f99ff9f41229f64267a1e1a8b60a343 100644 (file)
--- a/mcs/class/corlib/Test/System.Security.Cryptography/RijndaelTest.cs
+++ b/mcs/class/corlib/Test/System.Security.Cryptography/RijndaelTest.cs
@@ -194,6 +194,13 @@ public class RijndaelTest {
                        }
                }
        }
+
+       [Test]
+       [ExpectedException (typeof (CryptographicException))]
+       public void FeedbackSize_NotMultipleOf8 ()
+       {
+               aes.FeedbackSize = 9;
+       }
 }
 
 }