Merge branch 'v2.5' into monoorigin/mono

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

1 files changed, 9 insertions, 7 deletions

diff --git a/src/DotNetOpenId.Test/AssociationsTest.cs b/src/DotNetOpenId.Test/AssociationsTest.cs
index 7f4ec26..01dad58 100644
--- a/src/DotNetOpenId.Test/AssociationsTest.cs
+++ b/src/DotNetOpenId.Test/AssociationsTest.cs
@@ -1,13 +1,12 @@
 using System;

-using System.Collections.Generic;

-using System.Text;

+using System.Security.Cryptography;

 using NUnit.Framework;

-using System.Threading;

 

 namespace DotNetOpenId.Test {

 	[TestFixture]

 	public class AssociationsTest {

-		byte[] sha1Secret = new byte[CryptUtil.Sha1.HashSize / 8];

+		static HashAlgorithm sha1 = DiffieHellmanUtil.Lookup(Protocol.Default, Protocol.Default.Args.SessionType.DH_SHA1);

+		byte[] sha1Secret = new byte[sha1.HashSize / 8];

 

 		Associations assocs;

 		[SetUp]

@@ -27,7 +26,8 @@ namespace DotNetOpenId.Test {
 

 		[Test]

 		public void HandleLifecycle() {

-			Association a = new HmacSha1Association("somehandle", sha1Secret, TimeSpan.FromDays(1));

+			Association a = HmacShaAssociation.Create(Protocol.Default, Protocol.Default.Args.SignatureAlgorithm.HMAC_SHA1,

+				"somehandle", sha1Secret, TimeSpan.FromDays(1));

 			assocs.Set(a);

 			Assert.AreSame(a, assocs.Get(a.Handle));

 			Assert.IsTrue(assocs.Remove(a.Handle));

@@ -37,8 +37,10 @@ namespace DotNetOpenId.Test {
 

 		[Test]

 		public void Best() {

-			Association a = new HmacSha1Association("h1", sha1Secret, TimeSpan.FromHours(1));

-			Association b = new HmacSha1Association("h2", sha1Secret, TimeSpan.FromHours(1));

+			Association a = HmacShaAssociation.Create(Protocol.Default, Protocol.Default.Args.SignatureAlgorithm.HMAC_SHA1,

+				"h1", sha1Secret, TimeSpan.FromHours(1));

+			Association b = HmacShaAssociation.Create(Protocol.Default, Protocol.Default.Args.SignatureAlgorithm.HMAC_SHA1,

+				"h2", sha1Secret, TimeSpan.FromHours(1));

 

 			assocs.Set(a);

 			assocs.Set(b);