Merge branch 'v4.0' into dev11

Conflicts:
	src/DotNetOpenAuth.sln

1 files changed, 9 insertions, 9 deletions

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;
+				}
 			}
 		}
 	}