Merge branch 'v2.5' into monoorigin/mono

Conflicts:
	src/DotNetOpenId/Properties/AssemblyInfo.cs
	src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs

1 files changed, 0 insertions, 22 deletions

diff --git a/src/DotNetOpenId/HmacSha1Association.cs b/src/DotNetOpenId/HmacSha1Association.cs
deleted file mode 100644
index da344f1..0000000
--- a/src/DotNetOpenId/HmacSha1Association.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;

-using System.Security.Cryptography;

-using System.Collections.Generic;

-using System.Diagnostics;

-

-namespace DotNetOpenId {

-	internal class HmacSha1Association : Association {

-

-		public HmacSha1Association(string handle, byte[] secret, TimeSpan totalLifeLength)

-			: base(handle, secret, totalLifeLength, DateTime.UtcNow) {

-			Debug.Assert(secret.Length == CryptUtil.Sha1.HashSize / 8);

-		}

-

-		internal override string GetAssociationType(Protocol protocol) {

-			return protocol.Args.SignatureAlgorithm.HMAC_SHA1;

-		}

-

-		protected override HashAlgorithm CreateHasher() {

-			return new HMACSHA1(SecretKey);

-		}

-	}

-}
\ No newline at end of file