Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilier warning: CA2202 & refactor

Browse Source 
https://msdn.microsoft.com/en-us/library/ms182334.aspx
This commit is contained in:
Sean Kaim
2016-11-11 16:25:47 -05:00
parent 348fc156de
commit 00ec25d38c
11 changed files with 42 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mRemoteV1/App/Runtime.cs
View File

@@ -16,6 +16,7 @@ using System.Security;
using System.Threading;
using System.Windows.Forms;
using System.Xml;
using mRemoteNG.Config.Connections.Multiuser;
using mRemoteNG.Security;
using mRemoteNG.Security.SymmetricEncryption;
using mRemoteNG.UI.Forms;
@@ -215,23 +216,19 @@ namespace mRemoteNG.App
Directory.CreateDirectory(dirname);
// Use File.Open with FileMode.CreateNew so that we don't overwrite an existing file
using (var fileStream = File.Open(filename, FileMode.CreateNew, FileAccess.Write, FileShare.None))
var fileStream = File.Open(filename, FileMode.CreateNew, FileAccess.Write, FileShare.None);
using (var xmlTextWriter = new XmlTextWriter(fileStream, System.Text.Encoding.UTF8))
{
using (var xmlTextWriter = new XmlTextWriter(fileStream, System.Text.Encoding.UTF8))
{
xmlTextWriter.Formatting = Formatting.Indented;
xmlTextWriter.Indentation = 4;
xmlTextWriter.WriteStartDocument();
xmlTextWriter.WriteStartElement("Connections"); // Do not localize
xmlTextWriter.WriteAttributeString("Name", Language.strConnections);
xmlTextWriter.WriteAttributeString("Export", "", "False");
xmlTextWriter.WriteAttributeString("Protected", "", "GiUis20DIbnYzWPcdaQKfjE2H5jh//L5v4RGrJMGNXuIq2CttB/d/BxaBP2LwRhY");
xmlTextWriter.WriteAttributeString("ConfVersion", "", "2.5");
xmlTextWriter.WriteEndElement();
xmlTextWriter.WriteEndDocument();
xmlTextWriter.Close();
}
xmlTextWriter.Formatting = Formatting.Indented;
xmlTextWriter.Indentation = 4;
xmlTextWriter.WriteStartDocument();
xmlTextWriter.WriteStartElement("Connections"); // Do not localize
xmlTextWriter.WriteAttributeString("Name", Language.strConnections);
xmlTextWriter.WriteAttributeString("Export", "", "False");
xmlTextWriter.WriteAttributeString("Protected", "", "GiUis20DIbnYzWPcdaQKfjE2H5jh//L5v4RGrJMGNXuIq2CttB/d/BxaBP2LwRhY");
xmlTextWriter.WriteAttributeString("ConfVersion", "", "2.5");
xmlTextWriter.WriteEndElement();
xmlTextWriter.WriteEndDocument();
}
// Load config

1
mRemoteV1/App/Startup.cs
View File

@@ -14,6 +14,7 @@ using System.IO;
using System.Management;
using System.Threading;
using System.Windows.Forms;
using mRemoteNG.Config.Connections.Multiuser;
using mRemoteNG.UI;
using WeifenLuo.WinFormsUI.Docking;

3
mRemoteV1/Config/Connections/Multiuser/ConnectionsUpdateAvailableEventArgs.cs
View File

@@ -1,8 +1,7 @@
using System;
using mRemoteNG.Config.DatabaseConnectors;
namespace mRemoteNG.Config.Connections
namespace mRemoteNG.Config.Connections.Multiuser
{
public delegate void ConnectionsUpdateAvailableEventHandler(object sender, ConnectionsUpdateAvailableEventArgs args);

3
mRemoteV1/Config/Connections/Multiuser/ConnectionsUpdateCheckFinishedEventArgs.cs
View File

@@ -1,7 +1,6 @@
using System;
namespace mRemoteNG.Config.Connections
namespace mRemoteNG.Config.Connections.Multiuser
{
public delegate void UpdateCheckFinishedEventHandler(object sender, ConnectionsUpdateCheckFinishedEventArgs args);

3
mRemoteV1/Config/Connections/Multiuser/IConnectionsUpdateChecker.cs
View File

@@ -1,7 +1,6 @@
using System;
namespace mRemoteNG.Config.Connections
namespace mRemoteNG.Config.Connections.Multiuser
{
public interface IConnectionsUpdateChecker : IDisposable
{

3
mRemoteV1/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs
View File

@@ -2,8 +2,7 @@
using System.Timers;
using mRemoteNG.App;
namespace mRemoteNG.Config.Connections
namespace mRemoteNG.Config.Connections.Multiuser
{
public class RemoteConnectionsSyncronizer : IConnectionsUpdateChecker
{

1
mRemoteV1/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs
View File

@@ -4,6 +4,7 @@ using System;
using System.Data;
using System.Data.SqlClient;
using System.Threading;
using mRemoteNG.Config.Connections.Multiuser;
using mRemoteNG.Config.DatabaseConnectors;
namespace mRemoteNG.Config.Connections

4
mRemoteV1/Config/Serializers/XmlConnectionsSerializer.cs
View File

@@ -52,11 +52,11 @@ namespace mRemoteNG.Config.Serializers
return xml;
}
private string WriteXmlToString(XNode xmlDocument)
private static string WriteXmlToString(XNode xmlDocument)
{
string xmlString;
var xmlWriterSettings = new XmlWriterSettings { Indent = true, IndentChars = " ", Encoding = Encoding.UTF8 };
using (var memoryStream = new MemoryStream())
var memoryStream = new MemoryStream();
using (var xmlTextWriter = XmlWriter.Create(memoryStream, xmlWriterSettings))
{
xmlDocument.WriteTo(xmlTextWriter);

22
mRemoteV1/Security/SymmetricEncryption/AeadCryptographyProvider.cs
View File

@@ -156,19 +156,17 @@ namespace mRemoteNG.Security.SymmetricEncryption
_aeadBlockCipher.DoFinal(cipherText, len);
//Assemble Message
using (var combinedStream = new MemoryStream())
var combinedStream = new MemoryStream();
using (var binaryWriter = new BinaryWriter(combinedStream))
{
using (var binaryWriter = new BinaryWriter(combinedStream))
{
//Prepend Authenticated Payload
binaryWriter.Write(nonSecretPayload);
//Prepend Nonce
binaryWriter.Write(nonce);
//Write Cipher Text
binaryWriter.Write(cipherText);
}
return combinedStream.ToArray();
//Prepend Authenticated Payload
binaryWriter.Write(nonSecretPayload);
//Prepend Nonce
binaryWriter.Write(nonce);
//Write Cipher Text
binaryWriter.Write(cipherText);
}
return combinedStream.ToArray();
}
@@ -217,7 +215,7 @@ namespace mRemoteNG.Security.SymmetricEncryption
if (encryptedMessage == null || encryptedMessage.Length == 0)
throw new ArgumentException(@"Encrypted Message Required!", nameof(encryptedMessage));
using (var cipherStream = new MemoryStream(encryptedMessage))
var cipherStream = new MemoryStream(encryptedMessage);
using (var cipherReader = new BinaryReader(cipherStream))
{
//Grab Payload

22
mRemoteV1/Security/SymmetricEncryption/LegacyRijndaelCryptographyProvider.cs
View File

@@ -84,19 +84,17 @@ namespace mRemoteNG.Security.SymmetricEncryption
var ciphertext = Convert.FromBase64String(ciphertextBase64);
using (var memoryStream = new MemoryStream(ciphertext))
{
var iv = new byte[BlockSizeInBytes];
memoryStream.Read(iv, 0, iv.Length);
rijndaelManaged.IV = iv;
var memoryStream = new MemoryStream(ciphertext);
var iv = new byte[BlockSizeInBytes];
memoryStream.Read(iv, 0, iv.Length);
rijndaelManaged.IV = iv;
using (var cryptoStream = new CryptoStream(memoryStream, rijndaelManaged.CreateDecryptor(), CryptoStreamMode.Read))
using (var streamReader = new StreamReader(cryptoStream, Encoding.UTF8, true))
{
plaintext = streamReader.ReadToEnd();
rijndaelManaged.Clear();
}
} // memoryStream
var cryptoStream = new CryptoStream(memoryStream, rijndaelManaged.CreateDecryptor(), CryptoStreamMode.Read);
using (var streamReader = new StreamReader(cryptoStream, Encoding.UTF8, true))
{
plaintext = streamReader.ReadToEnd();
rijndaelManaged.Clear();
}
} // rijndaelManaged
return plaintext;

1
mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs
View File

@@ -1,6 +1,7 @@
using System;
using mRemoteNG.App;
using mRemoteNG.Config.Connections;
using mRemoteNG.Config.Connections.Multiuser;
using mRemoteNG.Security.SymmetricEncryption;
namespace mRemoteNG.UI.Forms.OptionsPages