Merge branch 'v2.5' into monoorigin/mono

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

1 files changed, 45 insertions, 0 deletions

diff --git a/src/DotNetOpenId/Configuration/RelyingPartySecuritySettingsElement.cs b/src/DotNetOpenId/Configuration/RelyingPartySecuritySettingsElement.cs
new file mode 100644
index 0000000..a76d993
--- /dev/null
+++ b/src/DotNetOpenId/Configuration/RelyingPartySecuritySettingsElement.cs
@@ -0,0 +1,45 @@
+using System.Configuration;

+using DotNetOpenId.RelyingParty;

+

+namespace DotNetOpenId.Configuration {

+	internal class RelyingPartySecuritySettingsElement : ConfigurationElement {

+		public RelyingPartySecuritySettingsElement() { }

+

+		public RelyingPartySecuritySettings CreateSecuritySettings() {

+			RelyingPartySecuritySettings settings = new RelyingPartySecuritySettings();

+			settings.RequireSsl = RequireSsl;

+			settings.MinimumRequiredOpenIdVersion = MinimumRequiredOpenIdVersion;

+			settings.MinimumHashBitLength = MinimumHashBitLength;

+			settings.MaximumHashBitLength = MaximumHashBitLength;

+			return settings;

+		}

+

+		const string requireSslConfigName = "requireSsl";

+		[ConfigurationProperty(requireSslConfigName, DefaultValue = false)]

+		public bool RequireSsl {

+			get { return (bool)this[requireSslConfigName]; }

+			set { this[requireSslConfigName] = value; }

+		}

+

+		const string minimumRequiredOpenIdVersionConfigName = "minimumRequiredOpenIdVersion";

+		[ConfigurationProperty(minimumRequiredOpenIdVersionConfigName, DefaultValue = "V10")]

+		public ProtocolVersion MinimumRequiredOpenIdVersion {

+			get { return (ProtocolVersion)this[minimumRequiredOpenIdVersionConfigName]; }

+			set { this[minimumRequiredOpenIdVersionConfigName] = value; }

+		}

+

+		const string minimumHashBitLengthConfigName = "minimumHashBitLength";

+		[ConfigurationProperty(minimumHashBitLengthConfigName, DefaultValue = DotNetOpenId.SecuritySettings.minimumHashBitLengthDefault)]

+		public int MinimumHashBitLength {

+			get { return (int)this[minimumHashBitLengthConfigName]; }

+			set { this[minimumHashBitLengthConfigName] = value; }

+		}

+

+		const string maximumHashBitLengthConfigName = "maximumHashBitLength";

+		[ConfigurationProperty(maximumHashBitLengthConfigName, DefaultValue = DotNetOpenId.SecuritySettings.maximumHashBitLengthRPDefault)]

+		public int MaximumHashBitLength {

+			get { return (int)this[maximumHashBitLengthConfigName]; }

+			set { this[maximumHashBitLengthConfigName] = value; }

+		}

+	}

+}