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

Update PuttyKeyFileGenerator.cs

Browse Source 
Replace use of obsolete SHA1CryptoServiceProvider with replacement call.
This commit is contained in:
BlueBlock
2023-03-16 12:59:28 -04:00
parent c51f38ddc7
commit 2174e56407
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ExternalConnectors/PuttyKeyFileGenerator.cs
View File

@@ -43,7 +43,7 @@ public class PuttyKeyFileGenerator
} }
var privateBlob = System.Convert.ToBase64String(privateBuffer); var privateBlob = System.Convert.ToBase64String(privateBuffer);
HMACSHA1 hmacsha1 = new HMACSHA1(new SHA1CryptoServiceProvider().ComputeHash(Encoding.ASCII.GetBytes("putty-private-key-file-mac-key"))); HMACSHA1 hmacSha1 = new HMACSHA1(SHA1.Create().ComputeHash(Encoding.ASCII.GetBytes("putty-private-key-file-mac-key")));
//byte[] bytesToHash = new byte[4 + 7 + 4 + 4 + 4 + Comment.Length + 4 + publicBuffer.Length + 4 + privateBuffer.Length]; //byte[] bytesToHash = new byte[4 + 7 + 4 + 4 + 4 + Comment.Length + 4 + publicBuffer.Length + 4 + privateBuffer.Length];
byte[] bytesToHash = new byte[prefixSize + keyType.Length + prefixSize + encryptionType.Length + prefixSize + Comment.Length + byte[] bytesToHash = new byte[prefixSize + keyType.Length + prefixSize + encryptionType.Length + prefixSize + Comment.Length +
prefixSize + publicBuffer.Length + prefixSize + privateBuffer.Length]; prefixSize + publicBuffer.Length + prefixSize + privateBuffer.Length];
@@ -57,7 +57,7 @@ public class PuttyKeyFileGenerator
PutPrefixed(bw, privateBuffer); PutPrefixed(bw, privateBuffer);
} }
var hash = string.Join("", hmacsha1.ComputeHash(bytesToHash).Select(x => string.Format("{0:x2}", x))); var hash = string.Join("", hmacSha1.ComputeHash(bytesToHash).Select(x => $"{x:x2}"));
var sb = new StringBuilder(); var sb = new StringBuilder();
sb.AppendLine("PuTTY-User-Key-File-2: " + keyType); sb.AppendLine("PuTTY-User-Key-File-2: " + keyType);
@@ -82,6 +82,7 @@ public class PuttyKeyFileGenerator
return sb.ToString(); return sb.ToString();
} }
private static void PutPrefixed(BinaryWriter bw, byte[] bytes, bool addLeadingNull = false) private static void PutPrefixed(BinaryWriter bw, byte[] bytes, bool addLeadingNull = false)
{ {
bw.Write(BitConverter.GetBytes(bytes.Length + (addLeadingNull ? 1 : 0)).Reverse().ToArray()); bw.Write(BitConverter.GetBytes(bytes.Length + (addLeadingNull ? 1 : 0)).Reverse().ToArray());