Merge pull request #1542 from ninjarobot/UriTemplateMatchException

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

diff --git a/mcs/class/corlib/System.Security.Cryptography/TripleDES.cs b/mcs/class/corlib/System.Security.Cryptography/TripleDES.cs
index 33be945b723248807e56294f0058e633f85654a8..3fa0800cdffb20ff46bd18a26d3ecfaf5dea2d3e 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/TripleDES.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/TripleDES.cs
@@ -2,12 +2,33 @@
 // TripleDES.cs: Handles TripleDES (abstract class)
 //
 // Author:
-//     Sebastien Pouliot (spouliot@motus.com)
+//     Sebastien Pouliot <sebastien@ximian.com>
 //
 // (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004-2006 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
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
+using System.Globalization;
+using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 
 namespace System.Security.Cryptography {
@@ -19,14 +40,15 @@ namespace System.Security.Cryptography {
 //     not free :-(
 //     http://webstore.ansi.org/ansidocstore/product.asp?sku=ANSI+X9%2E52%2D1998
 
+[ComVisible (true)]
 public abstract class TripleDES : SymmetricAlgorithm {
 
-       public TripleDES ()
+       protected TripleDES ()
        {
                // from SymmetricAlgorithm
                KeySizeValue = 192;
                BlockSizeValue = 64;
-               FeedbackSizeValue = 64;
+               FeedbackSizeValue = 8;
 
                LegalKeySizesValue = new KeySizes [1];
                LegalKeySizesValue [0] = new KeySizes (128, 192, 64);
@@ -43,14 +65,14 @@ public abstract class TripleDES : SymmetricAlgorithm {
                                while (IsWeakKey (KeyValue))
                                        GenerateKey ();
                        }
-                       return KeyValue;
+                       return (byte[]) KeyValue.Clone ();
                }
                set { 
                        if (value == null)
-                               throw new ArgumentNullException ();
+                               throw new ArgumentNullException ("Key");
                        // this will check for both key size and weak keys
                        if (IsWeakKey (value))
-                               throw new CryptographicException ();
+                               throw new CryptographicException (Locale.GetText ("Weak Key"));
                        KeyValue = (byte[]) value.Clone (); 
                }
        }
@@ -65,6 +87,8 @@ public abstract class TripleDES : SymmetricAlgorithm {
        //      if ( b == c ) then TripleDES == DES(a) (hence weak key)
        public static bool IsWeakKey (byte[] rgbKey)
        {
+               if (rgbKey == null)
+                       throw new CryptographicException (Locale.GetText ("Null Key"));
                // 128 bits (16 bytes) is 3 DES with 2 keys
                if (rgbKey.Length == 16) {
                        // weak if first half == second half
@@ -90,14 +114,18 @@ public abstract class TripleDES : SymmetricAlgorithm {
                        }
                }
                else
-                       throw new CryptographicException ();
+                       throw new CryptographicException (Locale.GetText ("Wrong Key Length"));
 
                return true;
        }
 
        public static new TripleDES Create ()
        {
+#if FULL_AOT_RUNTIME
+               return new System.Security.Cryptography.TripleDESCryptoServiceProvider ();
+#else
                return Create ("System.Security.Cryptography.TripleDES");
+#endif
        }
 
        public static new TripleDES Create (string str)