Skip to content

Use hardware-accelerated AES CryptoServiceProvider #865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Nov 28, 2023
Merged

Use hardware-accelerated AES CryptoServiceProvider #865

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
af5b858
Add FEATURE_AES_CSP to use hardware-accelerated AesCryptoServiceProvider
Aug 29, 2021
9622631
Restructure, move most of the feature code to AesCipher.cs
Aug 30, 2021
75fa982
Fix the AES Padding
Aug 30, 2021
5cc5d4a
fix rebase issues
Nov 1, 2023
086ad43
Minor fixes
Nov 1, 2023
a9f68fb
Merge branch 'develop' into feature_AES_CSP
zybexXL Nov 5, 2023
39db35b
Rework based on suggestions
Nov 6, 2023
63bfc76
Move all changes to AesCypher.cs, as per Rob-Hague suggestion
Nov 7, 2023
5ef1df6
update AesCipherTest.cs generator
Nov 7, 2023
ac2c36d
Fix continuous session encrypt/decrypt
Nov 9, 2023
ada6ccb
Reduce CTR memory usage in Net 6+
Nov 10, 2023
799a5c5
Factor out the implementations and re-add the existing constructor
Rob-Hague Nov 12, 2023
0a9be47
Merge branch 'develop' into feature_AES_CSP
zybexXL Nov 12, 2023
0d5ecd9
Merge branch 'sshnet:develop' into feature_AES_CSP
zybexXL Nov 13, 2023
36cea67
remove ctor; revert tests; remove unused _iv member
Rob-Hague Nov 13, 2023
d53c12c
Merge pull request #1 from Rob-Hague/feature_AES_CSP
zybexXL Nov 20, 2023
2a11508
Merge branch 'develop' into feature_AES_CSP
zybexXL Nov 20, 2023
84df6e4
Reorder Encryption cipher preference list
Nov 20, 2023
c056fbc
Remove redundant AES tests
Nov 20, 2023
1902ed7
Refactor ArrayXOR()
Nov 20, 2023
d34f521
Merge branch 'develop' into feature_AES_CSP
zybexXL Nov 20, 2023
6529a63
Add test for IV overflow
Rob-Hague Nov 21, 2023
2cedd26
Performance bump for AES CTR (thanks @robhague)
Nov 21, 2023
15de75e
fix merge conflict
Nov 21, 2023
554c2d6
Move AesCipherMode enum to its own file
Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/Renci.SshNet/ConnectionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,11 +360,13 @@ public ConnectionInfo(string host, int port, string username, ProxyTypes proxyTy

Encryptions = new Dictionary<string, CipherInfo>
{
{ "aes256-ctr", new CipherInfo(256, (key, iv) => new AesCipher(key, new CtrCipherMode(iv), padding: null)) },
{ "3des-cbc", new CipherInfo(192, (key, iv) => new TripleDesCipher(key, new CbcCipherMode(iv), padding: null)) },
{ "aes128-cbc", new CipherInfo(128, (key, iv) => new AesCipher(key, new CbcCipherMode(iv), padding: null)) },
{ "aes192-cbc", new CipherInfo(192, (key, iv) => new AesCipher(key, new CbcCipherMode(iv), padding: null)) },
{ "aes256-cbc", new CipherInfo(256, (key, iv) => new AesCipher(key, new CbcCipherMode(iv), padding: null)) },
{ "aes128-cbc", new CipherInfo(128, (key, iv) => new AesCipher(key, iv, AesCipherMode.CBC, pkcs7Padding: false)) },
{ "aes192-cbc", new CipherInfo(192, (key, iv) => new AesCipher(key, iv, AesCipherMode.CBC, pkcs7Padding: false)) },
{ "aes256-cbc", new CipherInfo(256, (key, iv) => new AesCipher(key, iv, AesCipherMode.CBC, pkcs7Padding: false)) },
{ "aes128-ctr", new CipherInfo(128, (key, iv) => new AesCipher(key, iv, AesCipherMode.CTR, pkcs7Padding: false)) },
{ "aes192-ctr", new CipherInfo(192, (key, iv) => new AesCipher(key, iv, AesCipherMode.CTR, pkcs7Padding: false)) },
{ "aes256-ctr", new CipherInfo(256, (key, iv) => new AesCipher(key, iv, AesCipherMode.CTR, pkcs7Padding: false)) },
{ "blowfish-cbc", new CipherInfo(128, (key, iv) => new BlowfishCipher(key, new CbcCipherMode(iv), padding: null)) },
{ "twofish-cbc", new CipherInfo(256, (key, iv) => new TwofishCipher(key, new CbcCipherMode(iv), padding: null)) },
{ "twofish192-cbc", new CipherInfo(192, (key, iv) => new TwofishCipher(key, new CbcCipherMode(iv), padding: null)) },
Expand All @@ -374,8 +376,6 @@ public ConnectionInfo(string host, int port, string username, ProxyTypes proxyTy
{ "arcfour128", new CipherInfo(128, (key, iv) => new Arc4Cipher(key, dischargeFirstBytes: true)) },
{ "arcfour256", new CipherInfo(256, (key, iv) => new Arc4Cipher(key, dischargeFirstBytes: true)) },
{ "cast128-cbc", new CipherInfo(128, (key, iv) => new CastCipher(key, new CbcCipherMode(iv), padding: null)) },
{ "aes128-ctr", new CipherInfo(128, (key, iv) => new AesCipher(key, new CtrCipherMode(iv), padding: null)) },
{ "aes192-ctr", new CipherInfo(192, (key, iv) => new AesCipher(key, new CtrCipherMode(iv), padding: null)) },
};

HmacAlgorithms = new Dictionary<string, HashInfo>
Expand Down
19 changes: 13 additions & 6 deletions src/Renci.SshNet/PrivateKeyFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,13 +226,13 @@ private void Open(Stream privateKey, string passPhrase)
cipher = new CipherInfo(64, (key, iv) => new DesCipher(key, new CbcCipherMode(iv), new PKCS7Padding()));
break;
case "AES-128-CBC":
cipher = new CipherInfo(128, (key, iv) => new AesCipher(key, new CbcCipherMode(iv), new PKCS7Padding()));
cipher = new CipherInfo(128, (key, iv) => new AesCipher(key, iv, AesCipherMode.CBC, pkcs7Padding: true));
break;
case "AES-192-CBC":
cipher = new CipherInfo(192, (key, iv) => new AesCipher(key, new CbcCipherMode(iv), new PKCS7Padding()));
cipher = new CipherInfo(192, (key, iv) => new AesCipher(key, iv, AesCipherMode.CBC, pkcs7Padding: true));
break;
case "AES-256-CBC":
cipher = new CipherInfo(256, (key, iv) => new AesCipher(key, new CbcCipherMode(iv), new PKCS7Padding()));
cipher = new CipherInfo(256, (key, iv) => new AesCipher(key, iv, AesCipherMode.CBC, pkcs7Padding: true));
break;
default:
throw new SshException(string.Format(CultureInfo.InvariantCulture, "Private key cipher \"{0}\" is not supported.", cipherName));
Expand Down Expand Up @@ -522,16 +522,23 @@ private static Key ParseOpenSshV1Key(byte[] keyFileData, string passPhrase)
switch (cipherName)
{
case "aes256-cbc":
cipher = new AesCipher(key, new CbcCipherMode(iv), new PKCS7Padding());
cipher = new AesCipher(key, iv, AesCipherMode.CBC, pkcs7Padding: false);
break;
case "aes256-ctr":
cipher = new AesCipher(key, new CtrCipherMode(iv), new PKCS7Padding());
cipher = new AesCipher(key, iv, AesCipherMode.CTR, pkcs7Padding: false);
break;
default:
throw new SshException("Cipher '" + cipherName + "' is not supported for an OpenSSH key.");
}

privateKeyBytes = cipher.Decrypt(privateKeyBytes);
try
{
privateKeyBytes = cipher.Decrypt(privateKeyBytes);
}
finally
{
cipher.Dispose();
}
}

// validate private key length
Expand Down
Loading