[corlib] Parse datetime string using culture calendar. Fixes #18052

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

diff --git a/mcs/class/corlib/System.Security.Cryptography/HMACSHA1.cs b/mcs/class/corlib/System.Security.Cryptography/HMACSHA1.cs
index ecd2a13023eb4ee7e7c639c3b6683f3da69975fb..baf644a6ab12166bc9feb55f1f6c6e4060653784 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/HMACSHA1.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/HMACSHA1.cs
@@ -2,10 +2,11 @@
 // HMACSHA1.cs: Handles HMAC with SHA-1
 //
 // Author:
-//     Sebastien Pouliot  <sebastien@ximian.com>
+//     Sebastien Pouliot  <sebastien@xamarin.com>
 //
 // (C) 2003 Motus Technologies Inc. (http://www.motus.com)
 // Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+// Copyright 2013 Xamarin Inc. (http://www.xamarin.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -47,93 +48,6 @@ namespace System.Security.Cryptography {
        //      not free :-(
        //      http://webstore.ansi.org/ansidocstore/product.asp?sku=ANSI+X9%2E71%2D2000
 
-#if ! NET_2_0
-       public class HMACSHA1: KeyedHashAlgorithm {
-               private HMACAlgorithm hmac;
-               private bool m_disposed;
-       
-               public HMACSHA1 () : this (KeyBuilder.Key (8))
-               {
-               }
-       
-               public HMACSHA1 (byte[] rgbKey) : base ()
-               {
-                       hmac = new HMACAlgorithm ("SHA1");
-                       HashSizeValue = 160;
-                       Key = rgbKey;
-                       m_disposed = false;
-               }
-       
-               ~HMACSHA1 () 
-               {
-                       Dispose (false);
-               }
-       
-               public override byte[] Key {
-                       get { return base.Key; }
-                       set { 
-                               hmac.Key = value; 
-                               base.Key = value;
-                       }
-               } 
-       
-               public string HashName {
-                       get { return hmac.HashName; }
-                       set { 
-                               // only if its not too late for a change
-                               if (State == 0)
-                                       hmac.HashName = value; 
-                       }
-               }
-       
-               protected override void Dispose (bool disposing) 
-               {
-                       if (!m_disposed) {
-                               if (hmac != null)
-                                       hmac.Dispose();
-                               base.Dispose (disposing);
-                               m_disposed = true;
-                       }
-               }
-       
-               public override void Initialize ()
-               {
-                       if (m_disposed)
-                               throw new ObjectDisposedException ("HMACSHA1");
-                       // let us throw an exception if hash name is invalid
-                       // for HMACSHA1 (obviously this can't be done by the 
-                       // generic HMAC class)
-                       if (!(hmac.Algo is SHA1)) {
-                               string algo = (hmac.Algo == null) ? "none" : hmac.Algo.GetType ().ToString ();
-                               string msg = Locale.GetText ("Invalid hash algorithm '{0}', expected '{1}'.");
-                               throw new InvalidCastException (String.Format (msg, algo, "SHA1"));
-                       }
-                       State = 0;
-                       hmac.Initialize ();
-               }
-       
-               protected override void HashCore (byte[] rgb, int ib, int cb)
-               {
-                       if (m_disposed)
-                               throw new ObjectDisposedException ("HMACSHA1");
-
-                       if (State == 0) {
-                               Initialize ();
-                               State = 1;
-                       }
-                       hmac.Core (rgb, ib, cb);
-               }
-       
-               protected override byte[] HashFinal ()
-               {
-                       if (m_disposed)
-                               throw new ObjectDisposedException ("HMACSHA1");
-
-                       State = 0;
-                       return hmac.Final ();
-               }
-       }
-#else
        [ComVisible (true)]
        public class HMACSHA1 : HMAC {
 
@@ -142,19 +56,22 @@ namespace System.Security.Cryptography {
                {
                }
 
-               public HMACSHA1 (byte[] rgbKey)
+               public HMACSHA1 (byte[] key)
                {
+#if FULL_AOT_RUNTIME
+                       SetHash ("SHA1", new SHA1Managed ());
+#else
                        HashName = "SHA1";
+#endif
                        HashSizeValue = 160;
-                       Key = rgbKey;
+                       Key = key;
                }
 
-               public HMACSHA1 (byte[] rgbKey, bool useManagedSha1)
+               public HMACSHA1 (byte[] key, bool useManagedSha1)
                {
                        HashName = "System.Security.Cryptography.SHA1" + (useManagedSha1 ? "Managed" : "CryptoServiceProvider");
                        HashSizeValue = 160;
-                       Key = rgbKey;
+                       Key = key;
                }
        }
-#endif
 }