Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b

mcs/class/corlib/System.Security.Cryptography/CryptoConfig.fullaot.cs

@@ -196,7 +196,7 @@ namespace System.Security.Cryptography {
 				name = "System.Security.Cryptography.X509Certificates.X509Chain, System";
 				break;
 			case "aes":
-#if MOBILE_STATIC
+#if FULL_AOT_DESKTOP  // TODO: why is this special cased? we could use AesManaged like other full AOT profiles
 				name = "System.Security.Cryptography.AesCryptoServiceProvider, System.Core";
 #else
 				name = "System.Security.Cryptography.AesManaged, System.Core";

mcs/class/corlib/System.Security.Cryptography/DSACryptoServiceProvider.cs

@@ -231,6 +231,28 @@ namespace System.Security.Cryptography {
 			return dsa.VerifySignature (rgbHash, rgbSignature);
 		}
 
+		protected override byte[] HashData (byte[] data, int offset, int count, HashAlgorithmName hashAlgorithm)
+		{
+			if (hashAlgorithm != HashAlgorithmName.SHA1)
+			{
+				throw new CryptographicException(Environment.GetResourceString("Cryptography_UnknownHashAlgorithm", hashAlgorithm.Name));
+			}
+
+			var hash = HashAlgorithm.Create (hashAlgorithm.Name);
+			return hash.ComputeHash (data, offset, count);
+		}
+
+		protected override byte[] HashData (System.IO.Stream data, HashAlgorithmName hashAlgorithm)
+		{
+			if (hashAlgorithm != HashAlgorithmName.SHA1)
+			{
+				throw new CryptographicException(Environment.GetResourceString("Cryptography_UnknownHashAlgorithm", hashAlgorithm.Name));
+			}
+
+			var hash = HashAlgorithm.Create (hashAlgorithm.Name);
+			return hash.ComputeHash (data);
+		}
+
 		protected override void Dispose (bool disposing) 
 		{
 			if (!m_disposed) {

mcs/class/corlib/System.Security.Cryptography/IncrementalHash.cs

@@ -1,46 +0,0 @@
-//
-// IncrementalHash.cs
-//
-// Authors:
-//	Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2016 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
-// "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 NETSTANDARD
-
-namespace System.Security.Cryptography
-{
-    public sealed class IncrementalHash : IDisposable
-    {
-        private IncrementalHash () { }
-        public HashAlgorithmName AlgorithmName { get { throw new NotImplementedException (); } }
-        public void AppendData (byte[] data) { }
-        public void AppendData (byte[] data, int offset, int count) { }
-        public static IncrementalHash CreateHash (HashAlgorithmName hashAlgorithm) { throw new NotImplementedException (); }
-        public static IncrementalHash CreateHMAC (HashAlgorithmName hashAlgorithm, byte[] key) { throw new NotImplementedException (); }
-        public void Dispose () { }
-        public byte[] GetHashAndReset () { throw new NotImplementedException (); }
-    }
-}
-
-#endif