2005-01-31 Zoltan Varga <vargaz@freemail.hu>

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

diff --git a/mcs/class/corlib/System.Security.Cryptography/HMAC.cs b/mcs/class/corlib/System.Security.Cryptography/HMAC.cs
index bc0dacf27064a74ccac326f2695ebc22a81b3178..a73e690ac51731564363e3295e0e25d2ba3fc98f 100755 (executable)
--- a/mcs/class/corlib/System.Security.Cryptography/HMAC.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/HMAC.cs
@@ -2,14 +2,32 @@
 // HMAC.cs: Generic HMAC inplementation
 //
 // Author:
-//     Sebastien Pouliot (spouliot@motus.com)
+//     Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) 2003 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004 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.
 //
 
-#if NET_1_2
-
-using System;
+#if NET_2_0
 
 using Mono.Security.Cryptography;
 
@@ -114,7 +132,7 @@ namespace System.Security.Cryptography {
                        _algo.TransformBlock (buf, 0, buf.Length, buf, 0);
                        _algo.TransformFinalBlock (intermediate, 0, intermediate.Length);
                        byte[] hash = _algo.Hash;
-                       _algo.Clear ();
+                       _algo.Initialize ();
                        // zeroize sensitive data
                        Array.Clear (buf, 0, buf.Length);       
                        Array.Clear (intermediate, 0, intermediate.Length);
@@ -137,16 +155,16 @@ namespace System.Security.Cryptography {
 
                // static methods
 
-               public static HMAC Create () 
+               public static new HMAC Create () 
                {
                        return Create ("System.Security.Cryptography.HMAC");
                }
 
-               public static HMAC Create (string algName) 
+               public static new HMAC Create (string algName) 
                {
                        return (HMAC) CryptoConfig.CreateFromName (algName);
                }
        }
 }
 
-#endif
\ No newline at end of file
+#endif