Merge branch 'v4.3'

2 files changed, 5 insertions, 5 deletions

diff --git a/src/.nuget/NuGet.targets b/src/.nuget/NuGet.targets
index d3befda..db3fdce 100644
--- a/src/.nuget/NuGet.targets
+++ b/src/.nuget/NuGet.targets
@@ -4,13 +4,13 @@
         <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
         
         <!-- Enable the restore command to run before builds -->
-        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
+        <RestorePackages Condition="  '$(RestorePackages)' == '' ">true</RestorePackages>
 
         <!-- Property that enables building a package from a project -->
         <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
 
         <!-- Determines if package restore consent is required to restore packages -->
-        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
+        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'true' ">false</RequireRestoreConsent>
         
         <!-- Download NuGet.exe if it does not already exist -->
         <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
diff --git a/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs b/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs
index 55bc691..9885eb2 100644
--- a/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs
+++ b/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs
@@ -882,7 +882,7 @@ namespace DotNetOpenAuth.Messaging {
 			Requires.NotNull(crypto, "crypto");
 			Requires.NotNull(buffer, "buffer");
 
-			using (var symmetricCrypto = new RijndaelManaged()) {
+			using (var symmetricCrypto = SymmetricAlgorithm.Create()) {
 				symmetricCrypto.Mode = CipherMode.CBC;
 
 				using (var encryptedStream = new MemoryStream()) {
@@ -924,7 +924,7 @@ namespace DotNetOpenAuth.Messaging {
 				byte[] encryptedPrequel = encryptedStreamReader.ReadBuffer(4096);
 				byte[] prequel = crypto.Decrypt(encryptedPrequel, false);
 
-				using (var symmetricCrypto = new RijndaelManaged()) {
+				using (var symmetricCrypto = SymmetricAlgorithm.Create()) {
 					symmetricCrypto.Mode = CipherMode.CBC;
 
 					byte[] symmetricKey = new byte[symmetricCrypto.Key.Length];
@@ -1959,7 +1959,7 @@ namespace DotNetOpenAuth.Messaging {
 		private static SymmetricAlgorithm CreateSymmetricAlgorithm(byte[] key) {
 			SymmetricAlgorithm result = null;
 			try {
-				result = new RijndaelManaged();
+				result = SymmetricAlgorithm.Create();
 				result.Mode = CipherMode.CBC;
 				result.Key = key;
 				return result;