Merge branch 'v4.2' into v4.3

AArnott · AArnott · commit f25a7c6661a3 · 2013-04-22T21:19:41.000-07:00
diff --git a/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs b/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs
@@ -696,11 +696,14 @@ internal static string GetCryptoRandomDataAsBase64(int binaryLength) {
 		/// Gets a NON-cryptographically strong random string of base64 characters.
 		/// </summary>
 		/// <param name="binaryLength">The length of the byte sequence to generate.</param>
-		/// <returns>A base64 encoding of the generated random data,
-		/// whose length in characters will likely be greater than <paramref name="binaryLength"/>.</returns>
-		internal static string GetNonCryptoRandomDataAsBase64(int binaryLength) {
+		/// <param name="useWeb64">A value indicating whether web64 encoding is used to avoid the need to escape characters.</param>
+		/// <returns>
+		/// A base64 encoding of the generated random data,
+		/// whose length in characters will likely be greater than <paramref name="binaryLength" />.
+		/// </returns>
+		internal static string GetNonCryptoRandomDataAsBase64(int binaryLength, bool useWeb64 = false) {
 			byte[] uniq_bytes = GetNonCryptoRandomData(binaryLength);
-			string uniq = Convert.ToBase64String(uniq_bytes);
+			string uniq = useWeb64 ? ConvertToBase64WebSafeString(uniq_bytes) : Convert.ToBase64String(uniq_bytes);
 			return uniq;
 		}
 
diff --git a/src/DotNetOpenAuth.OAuth2.Client/OAuth2/WebServerClient.cs b/src/DotNetOpenAuth.OAuth2.Client/OAuth2/WebServerClient.cs
@@ -113,7 +113,7 @@ public OutgoingWebResponse PrepareRequestUserAuthorization(IAuthorizationState a
 			if (this.AuthorizationTracker == null) {
 				var context = this.Channel.GetHttpContext();
 
-				string xsrfKey = MessagingUtilities.GetNonCryptoRandomDataAsBase64(16);
+				string xsrfKey = MessagingUtilities.GetNonCryptoRandomDataAsBase64(16, useWeb64: true);
 				cookie = new HttpCookie(XsrfCookieName, xsrfKey) {
 					HttpOnly = true,
 					Secure = FormsAuthentication.RequireSSL,
diff --git a/src/DotNetOpenAuth.OpenId/OpenId/Extensions/SimpleRegistration/ClaimsResponse.cs b/src/DotNetOpenAuth.OpenId/OpenId/Extensions/SimpleRegistration/ClaimsResponse.cs
@@ -209,7 +209,7 @@ public CultureInfo Culture {
 					// of language and country based on user settings.
 					try {
 						this.culture = CultureInfo.GetCultureInfo(cultureString);
-					} catch (CultureNotFoundException) {
+					} catch (ArgumentException) { // CultureNotFoundException derives from this, and .NET 3.5 throws the base type
 						// Fallback to just reporting a culture based on language.
 						this.culture = CultureInfo.GetCultureInfo(this.Language);
 					}

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ public CultureInfo Culture {`
`209`	`209`	`// of language and country based on user settings.`
`210`	`210`	`try {`
`211`	`211`	`this.culture = CultureInfo.GetCultureInfo(cultureString);`
`212`		`- } catch (CultureNotFoundException) {`
	`212`	`+ } catch (ArgumentException) { // CultureNotFoundException derives from this, and .NET 3.5 throws the base type`
`213`	`213`	`// Fallback to just reporting a culture based on language.`
`214`	`214`	`this.culture = CultureInfo.GetCultureInfo(this.Language);`
`215`	`215`	`}`