Merge branch 'v4.0' into dev11

Conflicts:
	src/DotNetOpenAuth.sln

1 files changed, 0 insertions, 8 deletions

diff --git a/src/DotNetOpenAuth.OpenId/OpenId/Messages/AssociateDiffieHellmanRequest.cs b/src/DotNetOpenAuth.OpenId/OpenId/Messages/AssociateDiffieHellmanRequest.cs
index ebe9f34..ed96ce7 100644
--- a/src/DotNetOpenAuth.OpenId/OpenId/Messages/AssociateDiffieHellmanRequest.cs
+++ b/src/DotNetOpenAuth.OpenId/OpenId/Messages/AssociateDiffieHellmanRequest.cs
@@ -12,9 +12,7 @@ namespace DotNetOpenAuth.OpenId.Messages {
 	using System.Text;
 	using DotNetOpenAuth.Messaging;
 	using DotNetOpenAuth.Messaging.Reflection;
-#if !ExcludeDiffieHellman
 	using Org.Mentalis.Security.Cryptography;
-#endif
 
 	/// <summary>
 	/// An OpenID direct request from Relying Party to Provider to initiate an association that uses Diffie-Hellman encryption.
@@ -78,7 +76,6 @@ namespace DotNetOpenAuth.OpenId.Messages {
 		[MessagePart("openid.dh_consumer_public", IsRequired = true, AllowEmpty = false)]
 		internal byte[] DiffieHellmanConsumerPublic { get; set; }
 
-#if !ExcludeDiffieHellman
 		/// <summary>
 		/// Gets the Diffie-Hellman algorithm.
 		/// </summary>
@@ -86,13 +83,11 @@ namespace DotNetOpenAuth.OpenId.Messages {
 		/// This property is initialized with a call to <see cref="InitializeRequest"/>.
 		/// </remarks>
 		internal DiffieHellman Algorithm { get; private set; }
-#endif
 
 		/// <summary>
 		/// Called by the Relying Party to initialize the Diffie-Hellman algorithm and consumer public key properties.
 		/// </summary>
 		internal void InitializeRequest() {
-#if !ExcludeDiffieHellman
 			if (this.DiffieHellmanModulus == null || this.DiffieHellmanGen == null) {
 				throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, OpenIdStrings.DiffieHellmanRequiredPropertiesNotSet, string.Join(", ", new string[] { "DiffieHellmanModulus", "DiffieHellmanGen" })));
 			}
@@ -100,9 +95,6 @@ namespace DotNetOpenAuth.OpenId.Messages {
 			this.Algorithm = new DiffieHellmanManaged(this.DiffieHellmanModulus ?? DefaultMod, this.DiffieHellmanGen ?? DefaultGen, DefaultX);
 			byte[] consumerPublicKeyExchange = this.Algorithm.CreateKeyExchange();
 			this.DiffieHellmanConsumerPublic = DiffieHellmanUtilities.EnsurePositive(consumerPublicKeyExchange);
-#else
-			throw new NotSupportedException();
-#endif
 		}
 	}
 }