Changed the compile-time switch for DH support into a runtime check for the supporting assembling.

Fixes #87

2 files changed, 14 insertions, 14 deletions

diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/ChannelElements/OpenIdRelyingPartyMessageFactory.cs b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/ChannelElements/OpenIdRelyingPartyMessageFactory.cs
index ea771e1..957fd1b 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/ChannelElements/OpenIdRelyingPartyMessageFactory.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/ChannelElements/OpenIdRelyingPartyMessageFactory.cs
@@ -95,12 +95,12 @@ namespace DotNetOpenAuth.OpenId.ChannelElements {
 					// This is a special recognized error case that we create a special message for.
 					message = new AssociateUnsuccessfulResponse(protocol.Version, associateRequest);
 				} else if (message == null) {
-#if !ExcludeDiffieHellman
-					var associateDiffieHellmanRequest = request as AssociateDiffieHellmanRequest;
-					if (associateDiffieHellmanRequest != null) {
-						message = new AssociateDiffieHellmanRelyingPartyResponse(protocol.Version, associateDiffieHellmanRequest);
+					if (OpenIdUtilities.IsDiffieHellmanPresent) {
+						var associateDiffieHellmanRequest = request as AssociateDiffieHellmanRequest;
+						if (associateDiffieHellmanRequest != null) {
+							message = new AssociateDiffieHellmanRelyingPartyResponse(protocol.Version, associateDiffieHellmanRequest);
+						}
 					}
-#endif
 
 					var associateUnencryptedRequest = request as AssociateUnencryptedRequest;
 					if (associateUnencryptedRequest != null) {
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Messages/AssociateRequestRelyingParty.cs b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Messages/AssociateRequestRelyingParty.cs
index 28deb20..1ac8488 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Messages/AssociateRequestRelyingParty.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Messages/AssociateRequestRelyingParty.cs
@@ -68,15 +68,15 @@ namespace DotNetOpenAuth.OpenId.Messages {
 				associateRequest.AssociationType = associationType;
 				return associateRequest;
 			} else {
-#if !ExcludeDiffieHellman
-				var associateRequest = new AssociateDiffieHellmanRequest(provider.Version, provider.Uri);
-				associateRequest.AssociationType = associationType;
-				associateRequest.SessionType = sessionType;
-				associateRequest.InitializeRequest();
-				return associateRequest;
-#else
-				return null;
-#endif
+				if (OpenIdUtilities.IsDiffieHellmanPresent) {
+					var associateRequest = new AssociateDiffieHellmanRequest(provider.Version, provider.Uri);
+					associateRequest.AssociationType = associationType;
+					associateRequest.SessionType = sessionType;
+					associateRequest.InitializeRequest();
+					return associateRequest;
+				} else {
+					return null;
+				}
 			}
 		}
 	}