Merge pull request #2780 from dotnet-bot/from-tfs

Merge changes from TFS

Author: bartonjs

src/System.Security.Cryptography.Algorithms/src/System.Security.Cryptography.Algorithms.csproj

@@ -33,6 +33,7 @@
     <Compile Include="System\Security\Cryptography\SHA256.cs" />
     <Compile Include="System\Security\Cryptography\SHA384.cs" />
     <Compile Include="System\Security\Cryptography\SHA512.cs" />
+    <Compile Include="System\Security\Cryptography\HMACMD5.cs" />
     <Compile Include="System\Security\Cryptography\HMACSHA1.cs" />
     <Compile Include="System\Security\Cryptography\HMACSHA256.cs" />
     <Compile Include="System\Security\Cryptography\HMACSHA384.cs" />

src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/HMACMD5.cs

@@ -0,0 +1,83 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+using System.Security.Cryptography;
+
+using Internal.Cryptography;
+
+namespace System.Security.Cryptography
+{
+    //
+    // If you change anything in this class, you must make the same change in the other HMAC* classes. This is a pain but given that the 
+    // preexisting contract from the desktop locks all of these into deriving directly from HMAC, it can't be helped.
+    //
+
+    public class HMACMD5 : HMAC
+    {
+        public HMACMD5()
+            : this(Helpers.GenerateRandom(64))
+        {
+        }
+
+        public HMACMD5(byte[] key)
+        {
+            this.HashName = HashAlgorithmNames.MD5;
+            _hMacCommon = new HMACCommon(HashAlgorithmNames.MD5, key);
+            base.Key = key;
+        }
+
+        public override int HashSize
+        {
+            get
+            {
+                return _hMacCommon.HashSizeInBits;
+            }
+        }
+
+        public override byte[] Key
+        {
+            get
+            {
+                return base.Key;
+            }
+            set
+            {
+                base.Key = value;
+                _hMacCommon.ChangeKey(value);
+            }
+        }
+
+        protected override void HashCore(byte[] rgb, int ib, int cb)
+        {
+            _hMacCommon.AppendHashData(rgb, ib, cb);
+        }
+
+        protected override byte[] HashFinal()
+        {
+            return _hMacCommon.FinalizeHashAndReset();
+        }
+
+        public override void Initialize()
+        {
+            // Nothing to do here. We expect HashAlgorithm to invoke HashFinal() and Initialize() as a pair. This reflects the 
+            // reality that our native crypto providers (e.g. CNG) expose hash finalization and object reinitialization as an atomic operation.
+            return;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                HMACCommon hMacCommon = _hMacCommon;
+                _hMacCommon = null;
+                if (hMacCommon != null)
+                    hMacCommon.Dispose(disposing);
+            }
+            base.Dispose(disposing);
+        }
+
+        private HMACCommon _hMacCommon;
+    }
+}

src/System.Security.Cryptography.Algorithms/tests/HmacMD5Tests.cs

@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Test.Cryptography;
+using Xunit;
+
+namespace System.Security.Cryptography.Hashing.Algorithms.Tests
+{
+    public class HmacMD5Tests : Rfc2202HmacTests
+    {
+        private static readonly byte[][] s_testKeys2202 =
+        {
+            null,
+            ByteUtils.RepeatByte(0x0b, 16),
+            ByteUtils.AsciiBytes("Jefe"),
+            ByteUtils.RepeatByte(0xaa, 16),
+            ByteUtils.HexToByteArray("0102030405060708090a0b0c0d0e0f10111213141516171819"),
+            ByteUtils.RepeatByte(0x0c, 16),
+            ByteUtils.RepeatByte(0xaa, 80),
+            ByteUtils.RepeatByte(0xaa, 80),
+        };
+
+        public HmacMD5Tests()
+            : base(s_testKeys2202)
+        {
+        }
+
+        protected override HMAC Create()
+        {
+            return new HMACMD5();
+        }
+
+        [Fact]
+        public void HmacMD5_Rfc2202_1()
+        {
+            VerifyHmac(1, "9294727a3638bb1c13f48ef8158bfc9d");
+        }
+
+        [Fact]
+        public void HmacMD5_Rfc2202_2()
+        {
+            VerifyHmac(2, "750c783e6ab0b503eaa86e310a5db738");
+        }
+
+        [Fact]
+        public void HmacMD5_Rfc2202_3()
+        {
+            VerifyHmac(3, "56be34521d144c88dbb8c733f0e8b3f6");
+        }
+
+        [Fact]
+        public void HmacMD5_Rfc2202_4()
+        {
+            VerifyHmac(4, "697eaf0aca3a3aea3a75164746ffaa79");
+        }
+
+        [Fact]
+        public void HmacMD5_Rfc2202_5()
+        {
+            VerifyHmac(5, "56461ef2342edc00f9bab995690efd4c");
+        }
+
+        [Fact]
+        public void HmacMD5_Rfc2202_6()
+        {
+            VerifyHmac(6, "6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd");
+        }
+
+        [Fact]
+        public void HmacMD5_Rfc2202_7()
+        {
+            VerifyHmac(7, "6f630fad67cda0ee1fb1f562db3aa53e");
+        }
+    }
+}

src/System.Security.Cryptography.Algorithms/tests/HmacSha1Tests.cs

@@ -1,12 +1,30 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using Test.Cryptography;
 using Xunit;
 
 namespace System.Security.Cryptography.Hashing.Algorithms.Tests
 {
     public class HmacSha1Tests : Rfc2202HmacTests
     {
+        private static readonly byte[][] s_testKeys2202 =
+        {
+            null,
+            ByteUtils.RepeatByte(0x0b, 20),
+            ByteUtils.AsciiBytes("Jefe"),
+            ByteUtils.RepeatByte(0xaa, 20),
+            ByteUtils.HexToByteArray("0102030405060708090a0b0c0d0e0f10111213141516171819"),
+            ByteUtils.RepeatByte(0x0c, 20),
+            ByteUtils.RepeatByte(0xaa, 80),
+            ByteUtils.RepeatByte(0xaa, 80),
+        };
+
+        public HmacSha1Tests()
+            : base(s_testKeys2202)
+        {
+        }
+
         protected override HMAC Create()
         {
             return new HMACSHA1();
@@ -54,4 +72,4 @@ public void HmacSha1_Rfc2202_7()
             VerifyHmac(7, "e8e99d0f45237d786d6bbaa7965c7808bbff1a91");
         }
     }
-}
+}

src/System.Security.Cryptography.Algorithms/tests/Rfc2202HmacTests.cs

@@ -7,18 +7,6 @@ namespace System.Security.Cryptography.Hashing.Algorithms.Tests
 {
     public abstract class Rfc2202HmacTests : HmacTests
     {
-        private static readonly byte[][] s_testKeys2202 =
-        {
-            null,
-            ByteUtils.RepeatByte(0x0b, 20),
-            ByteUtils.AsciiBytes("Jefe"),
-            ByteUtils.RepeatByte(0xaa, 20),
-            ByteUtils.HexToByteArray("0102030405060708090a0b0c0d0e0f10111213141516171819"),
-            ByteUtils.HexToByteArray("0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c"),
-            ByteUtils.RepeatByte(0xaa, 80),
-            ByteUtils.RepeatByte(0xaa, 80),
-        };
-
         private static readonly byte[][] s_testData2202 =
         {
             null,
@@ -31,8 +19,11 @@ public abstract class Rfc2202HmacTests : HmacTests
             ByteUtils.AsciiBytes("Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data"),
         };
 
-        protected Rfc2202HmacTests() :
-            base(s_testKeys2202, s_testData2202)
+        // The keys for test cases 1, 3, and 5 for RFC2202 are sized to match the
+        // algorithm (16 bytes for MD5, 20 for SHA-1), so they need to be provided by
+        // the more derived type.
+        protected Rfc2202HmacTests(byte[][] testKeys) :
+            base(testKeys, s_testData2202)
         {
         }
     }

src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.csproj

@@ -27,6 +27,7 @@
     <Compile Include="DecryptorReusability.cs" />
     <Compile Include="HashAlgorithmTest.cs" />
     <Compile Include="InvalidUsageTests.cs" />
+    <Compile Include="HmacMD5Tests.cs" />
     <Compile Include="HmacSha1Tests.cs" />
     <Compile Include="HmacSha256Tests.cs" />
     <Compile Include="HmacSha384Tests.cs" />