Relax the RSA/DSA decision for SSH2 keys (#1190)

Rob-Hague · web-flow · commit 49aed6f2190b · 2024-05-22T20:37:00.000+02:00
diff --git a/src/Renci.SshNet/PrivateKeyFile.cs b/src/Renci.SshNet/PrivateKeyFile.cs
@@ -333,7 +333,7 @@ private void Open(Stream privateKey, string passPhrase)
                         throw new SshException("Invalid passphrase.");
                     }
 
-                    if (keyType == "if-modn{sign{rsa-pkcs1-sha1},encrypt{rsa-pkcs1v2-oaep}}")
+                    if (keyType.Contains("rsa"))
                     {
                         var exponent = reader.ReadBigIntWithBits(); // e
                         var d = reader.ReadBigIntWithBits(); // d
@@ -349,7 +349,7 @@ private void Open(Stream privateKey, string passPhrase)
                         _hostAlgorithms.Add(new KeyHostAlgorithm("rsa-sha2-256", _key, new RsaDigitalSignature(decryptedRsaKey, HashAlgorithmName.SHA256)));
 #pragma warning restore CA2000 // Dispose objects before losing scope
                     }
-                    else if (keyType == "dl-modp{sign{dsa-nist-sha1},dh{plain}}")
+                    else if (keyType.Contains("dsa"))
                     {
                         var zero = reader.ReadUInt32();
                         if (zero != 0)

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ private void Open(Stream privateKey, string passPhrase)`
`333`	`333`	`throw new SshException("Invalid passphrase.");`
`334`	`334`	`}`
`335`	`335`
`336`		`- if (keyType == "if-modn{sign{rsa-pkcs1-sha1},encrypt{rsa-pkcs1v2-oaep}}")`
	`336`	`+ if (keyType.Contains("rsa"))`
`337`	`337`	`{`
`338`	`338`	`var exponent = reader.ReadBigIntWithBits(); // e`
`339`	`339`	`var d = reader.ReadBigIntWithBits(); // d`
`@@ -349,7 +349,7 @@ private void Open(Stream privateKey, string passPhrase)`
`349`	`349`	`_hostAlgorithms.Add(new KeyHostAlgorithm("rsa-sha2-256", _key, new RsaDigitalSignature(decryptedRsaKey, HashAlgorithmName.SHA256)));`
`350`	`350`	`#pragma warning restore CA2000 // Dispose objects before losing scope`
`351`	`351`	`}`
`352`		`- else if (keyType == "dl-modp{sign{dsa-nist-sha1},dh{plain}}")`
	`352`	`+ else if (keyType.Contains("dsa"))`
`353`	`353`	`{`
`354`	`354`	`var zero = reader.ReadUInt32();`
`355`	`355`	`if (zero != 0)`