Merging in build support for omitting the Diffie-Hellman algorithm.

9 files changed, 35 insertions, 9 deletions

diff --git a/src/DotNetOpenAuth.OpenId.Provider/DotNetOpenAuth.OpenId.Provider.csproj b/src/DotNetOpenAuth.OpenId.Provider/DotNetOpenAuth.OpenId.Provider.csproj
index 42732fe..88ca13a 100644
--- a/src/DotNetOpenAuth.OpenId.Provider/DotNetOpenAuth.OpenId.Provider.csproj
+++ b/src/DotNetOpenAuth.OpenId.Provider/DotNetOpenAuth.OpenId.Provider.csproj
@@ -31,7 +31,7 @@
     <Compile Include="OpenId\Extensions\UI\UIRequestProvider.cs" />
     <Compile Include="OpenId\HmacShaAssociationProvider.cs" />
     <Compile Include="OpenId\Messages\AssociateDiffieHellmanProviderRequest.cs" />
-    <Compile Include="OpenId\Messages\AssociateDiffieHellmanProviderResponse.cs" />
+    <Compile Include="OpenId\Messages\AssociateDiffieHellmanProviderResponse.cs" Condition=" '$(ExcludeDiffieHellman)' != 'true' " />
     <Compile Include="OpenId\Messages\IAssociateRequestProvider.cs" />
     <Compile Include="OpenId\Messages\AssociateRequestProviderTools.cs" />
     <Compile Include="OpenId\Messages\AssociateSuccessfulResponseProvider.cs" />
@@ -71,7 +71,7 @@
       <Project>{3896A32A-E876-4C23-B9B8-78E17D134CD3}</Project>
       <Name>DotNetOpenAuth.OpenId</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Org.Mentalis.Security.Cryptography\Org.Mentalis.Security.Cryptography.csproj">
+    <ProjectReference Include="..\Org.Mentalis.Security.Cryptography\Org.Mentalis.Security.Cryptography.csproj" Condition=" '$(ExcludeDiffieHellman)' != 'true' ">
       <Project>{26DC877F-5987-48DD-9DDB-E62F2DE0E150}</Project>
       <Name>Org.Mentalis.Security.Cryptography</Name>
     </ProjectReference>
diff --git a/src/DotNetOpenAuth.OpenId.Provider/OpenId/Messages/AssociateDiffieHellmanProviderRequest.cs b/src/DotNetOpenAuth.OpenId.Provider/OpenId/Messages/AssociateDiffieHellmanProviderRequest.cs
index f55fe7a..1a3cf5d 100644
--- a/src/DotNetOpenAuth.OpenId.Provider/OpenId/Messages/AssociateDiffieHellmanProviderRequest.cs
+++ b/src/DotNetOpenAuth.OpenId.Provider/OpenId/Messages/AssociateDiffieHellmanProviderRequest.cs
@@ -31,9 +31,13 @@ namespace DotNetOpenAuth.OpenId.Messages {
 		/// The appropriate association response message.
 		/// </returns>
 		public IProtocolMessage CreateResponseCore() {
+#if !ExcludeDiffieHellman
 			var response = new AssociateDiffieHellmanProviderResponse(this.Version, this);
 			response.AssociationType = this.AssociationType;
 			return response;
+#else
+			throw new NotSupportedException();
+#endif
 		}
 	}
 }
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty/DotNetOpenAuth.OpenId.RelyingParty.csproj b/src/DotNetOpenAuth.OpenId.RelyingParty/DotNetOpenAuth.OpenId.RelyingParty.csproj
index a242783..e3ff0ae 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty/DotNetOpenAuth.OpenId.RelyingParty.csproj
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty/DotNetOpenAuth.OpenId.RelyingParty.csproj
@@ -34,7 +34,7 @@
     <Compile Include="OpenId\Interop\AuthenticationResponseShim.cs" />
     <Compile Include="OpenId\Interop\ClaimsResponseShim.cs" />
     <Compile Include="OpenId\Interop\OpenIdRelyingPartyShim.cs" />
-    <Compile Include="OpenId\Messages\AssociateDiffieHellmanRelyingPartyResponse.cs" />
+    <Compile Include="OpenId\Messages\AssociateDiffieHellmanRelyingPartyResponse.cs" Condition=" '$(ExcludeDiffieHellman)' != 'true' " />
     <Compile Include="OpenId\Messages\AssociateRequestRelyingParty.cs" />
     <Compile Include="OpenId\Messages\AssociateSuccessfulResponseRelyingPartyContract.cs" />
     <Compile Include="OpenId\Messages\IAssociateSuccessfulResponseRelyingParty.cs" />
@@ -70,7 +70,7 @@
       <Project>{3896A32A-E876-4C23-B9B8-78E17D134CD3}</Project>
       <Name>DotNetOpenAuth.OpenId</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Org.Mentalis.Security.Cryptography\Org.Mentalis.Security.Cryptography.csproj">
+    <ProjectReference Include="..\Org.Mentalis.Security.Cryptography\Org.Mentalis.Security.Cryptography.csproj" Condition=" '$(ExcludeDiffieHellman)' != 'true' ">
       <Project>{26DC877F-5987-48DD-9DDB-E62F2DE0E150}</Project>
       <Name>Org.Mentalis.Security.Cryptography</Name>
     </ProjectReference>
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/ChannelElements/OpenIdRelyingPartyMessageFactory.cs b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/ChannelElements/OpenIdRelyingPartyMessageFactory.cs
index 4756c6e..9ec6c53 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/ChannelElements/OpenIdRelyingPartyMessageFactory.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/ChannelElements/OpenIdRelyingPartyMessageFactory.cs
@@ -95,13 +95,14 @@ 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;
-					var associateUnencryptedRequest = request as AssociateUnencryptedRequest;
-
 					if (associateDiffieHellmanRequest != null) {
 						message = new AssociateDiffieHellmanRelyingPartyResponse(protocol.Version, associateDiffieHellmanRequest);
 					}
+#endif
 
+					var associateUnencryptedRequest = request as AssociateUnencryptedRequest;
 					if (associateUnencryptedRequest != null) {
 						message = new AssociateUnencryptedResponseRelyingParty(protocol.Version, associateUnencryptedRequest);
 					}
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Messages/AssociateRequestRelyingParty.cs b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Messages/AssociateRequestRelyingParty.cs
index 99f1a3e..0e00963 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Messages/AssociateRequestRelyingParty.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty/OpenId/Messages/AssociateRequestRelyingParty.cs
@@ -68,11 +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
 			}
 		}
 	}
diff --git a/src/DotNetOpenAuth.OpenId/DotNetOpenAuth.OpenId.csproj b/src/DotNetOpenAuth.OpenId/DotNetOpenAuth.OpenId.csproj
index a215cb9..6f032c6 100644
--- a/src/DotNetOpenAuth.OpenId/DotNetOpenAuth.OpenId.csproj
+++ b/src/DotNetOpenAuth.OpenId/DotNetOpenAuth.OpenId.csproj
@@ -119,11 +119,11 @@
     <Compile Include="OpenId\ProviderEndpointDescription.cs" />
     <Compile Include="OpenId\Realm.cs" />
     <Compile Include="OpenId\RelyingPartyDescription.cs" />
-    <Compile Include="OpenId\DiffieHellmanUtilities.cs" />
+    <Compile Include="OpenId\DiffieHellmanUtilities.cs" Condition=" '$(ExcludeDiffieHellman)' != 'true' " />
     <Compile Include="OpenId\HmacShaAssociation.cs" />
     <Compile Include="OpenId\Messages\AssociateUnencryptedRequest.cs" />
     <Compile Include="OpenId\Messages\AssociateDiffieHellmanRequest.cs" />
-    <Compile Include="OpenId\Messages\AssociateDiffieHellmanResponse.cs" />
+    <Compile Include="OpenId\Messages\AssociateDiffieHellmanResponse.cs" Condition=" '$(ExcludeDiffieHellman)' != 'true' " />
     <Compile Include="OpenId\Messages\AssociateRequest.cs" />
     <Compile Include="OpenId\Messages\AssociateSuccessfulResponse.cs" />
     <Compile Include="OpenId\Messages\AssociateUnencryptedResponse.cs" />
@@ -176,7 +176,7 @@
       <Project>{60426312-6AE5-4835-8667-37EDEA670222}</Project>
       <Name>DotNetOpenAuth.Messaging</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Org.Mentalis.Security.Cryptography\Org.Mentalis.Security.Cryptography.csproj">
+    <ProjectReference Include="..\Org.Mentalis.Security.Cryptography\Org.Mentalis.Security.Cryptography.csproj" Condition=" '$(ExcludeDiffieHellman)' != 'true' " >
       <Project>{26DC877F-5987-48DD-9DDB-E62F2DE0E150}</Project>
       <Name>Org.Mentalis.Security.Cryptography</Name>
     </ProjectReference>
diff --git a/src/DotNetOpenAuth.OpenId/OpenId/HmacShaAssociation.cs b/src/DotNetOpenAuth.OpenId/OpenId/HmacShaAssociation.cs
index d723756..6a681a0 100644
--- a/src/DotNetOpenAuth.OpenId/OpenId/HmacShaAssociation.cs
+++ b/src/DotNetOpenAuth.OpenId/OpenId/HmacShaAssociation.cs
@@ -161,7 +161,11 @@ namespace DotNetOpenAuth.OpenId {
 					hashSizeInBits < securityRequirements.MinimumHashBitLength) {
 					continue;
 				}
+#if !ExcludeDiffieHellman
 				sessionType = DiffieHellmanUtilities.GetNameForSize(protocol, hashSizeInBits);
+#else
+				sessionType = requireMatchingDHSessionType ? null : protocol.Args.SessionType.NoEncryption;
+#endif
 				if (requireMatchingDHSessionType && sessionType == null) {
 					continue;
 				}
@@ -195,10 +199,14 @@ namespace DotNetOpenAuth.OpenId {
 				return true;
 			}
 
+#if !ExcludeDiffieHellman
 			// When there _is_ a DH session, it must match in hash length with the association type.
 			int associationSecretLengthInBytes = GetSecretLength(protocol, associationType);
 			int sessionHashLengthInBytes = DiffieHellmanUtilities.Lookup(protocol, sessionType).HashSize / 8;
 			return associationSecretLengthInBytes == sessionHashLengthInBytes;
+#else
+			return false;
+#endif
 		}
 
 		/// <summary>
diff --git a/src/DotNetOpenAuth.OpenId/OpenId/Messages/AssociateDiffieHellmanRequest.cs b/src/DotNetOpenAuth.OpenId/OpenId/Messages/AssociateDiffieHellmanRequest.cs
index 5accf26..b4f809f 100644
--- a/src/DotNetOpenAuth.OpenId/OpenId/Messages/AssociateDiffieHellmanRequest.cs
+++ b/src/DotNetOpenAuth.OpenId/OpenId/Messages/AssociateDiffieHellmanRequest.cs
@@ -12,7 +12,9 @@ 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.
@@ -76,6 +78,7 @@ 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>
@@ -83,11 +86,13 @@ 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" })));
 			}
@@ -95,6 +100,9 @@ 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
 		}
 	}
 }
diff --git a/tools/DotNetOpenAuth.targets b/tools/DotNetOpenAuth.targets
index 955847f..6a8689e 100644
--- a/tools/DotNetOpenAuth.targets
+++ b/tools/DotNetOpenAuth.targets
@@ -18,6 +18,7 @@
 		<CodeContractsInstallDir>$(ProjectRoot)tools\Contracts\</CodeContractsInstallDir>
 		<DefineConstants Condition=" '$(SignAssembly)' == 'true' ">$(DefineConstants);StrongNameSigned</DefineConstants>
 		<DefineConstants Condition=" '$(ClrVersion)' == '4' ">$(DefineConstants);CLR4</DefineConstants>
+		<DefineConstants Condition=" '$(ExcludeDiffieHellman)' == 'true' ">$(DefineConstants);ExcludeDiffieHellman</DefineConstants>
 		<AssemblySearchPaths>$(ProjectRoot)lib;$(AssemblySearchPaths)</AssemblySearchPaths>
 		<AssemblySearchPaths Condition="Exists('$(ProjectRoot)lib\net-$(TargetFrameworkVersion)')">$(ProjectRoot)lib\net-$(TargetFrameworkVersion);$(AssemblySearchPaths)</AssemblySearchPaths>
 	</PropertyGroup>