Skip to content

Commit 599718c

Browse files
committed
Update unit tests
1 parent 488c480 commit 599718c

File tree

8 files changed

+49
-1289
lines changed

8 files changed

+49
-1289
lines changed

test/Data/Key.RSA.Encrypted.Des.Ede3.CFB.1234567890.pub

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/Data/Key.RSA.Encrypted.Des.Ede3.CFB.1234567890.txt

Lines changed: 0 additions & 18 deletions
This file was deleted.

test/Renci.SshNet.Tests/Classes/PrivateKeyFileTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,6 @@ public void ConstructorWithFileNameAndPassPhraseShouldBeAbleToReadFileThatIsShar
357357
[DataRow("Key.RSA.Encrypted.Aes.192.CBC.12345.txt", "12345", typeof(RsaKey))]
358358
[DataRow("Key.RSA.Encrypted.Aes.256.CBC.12345.txt", "12345", typeof(RsaKey))]
359359
[DataRow("Key.RSA.Encrypted.Des.Ede3.CBC.12345.txt", "12345", typeof(RsaKey))]
360-
[DataRow("Key.RSA.Encrypted.Des.Ede3.CFB.1234567890.txt", "1234567890", typeof(RsaKey))]
361360
[DataRow("Key.RSA.PKCS8.Encrypted.Aes.256.CBC.12345.txt", "12345", typeof(RsaKey))]
362361
[DataRow("Key.RSA.PKCS8.txt", null, typeof(RsaKey))]
363362
[DataRow("Key.RSA.txt", null, typeof(RsaKey))]

test/Renci.SshNet.Tests/Classes/Security/Cryptography/Ciphers/AesCipherTest.Gen.cs.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@
66

77
Dictionary<string, (string, string, CipherMode?)> modes = new()
88
{
9-
["ecb"] = ("iv: null", "CipherMode.ECB", CipherMode.ECB),
109
["cbc"] = ("(byte[])iv.Clone()", "CipherMode.CBC", CipherMode.CBC),
11-
["cfb"] = ("(byte[])iv.Clone()", "CipherMode.CFB", CipherMode.CFB),
1210
["ctr"] = ("(byte[])iv.Clone()", string.Empty, null),
13-
["ofb"] = ("(byte[])iv.Clone()", "CipherMode.OFB", CipherMode.OFB),
1411
};
1512

1613
Random random = new(123);

test/Renci.SshNet.Tests/Classes/Security/Cryptography/Ciphers/AesCipherTest.cs

Lines changed: 49 additions & 1148 deletions
Large diffs are not rendered by default.

test/Renci.SshNet.Tests/Classes/Security/Cryptography/Ciphers/TripleDesCipherTest.Gen.cs.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
Dictionary<string, (string, CipherMode)> modes = new()
88
{
99
["cbc"] = ("(byte[])iv.Clone(), CipherMode.CBC", CipherMode.CBC),
10-
["cfb"] = ("(byte[])iv.Clone(), CipherMode.CFB", CipherMode.CFB),
1110
};
1211

1312
Random random = new(123);

test/Renci.SshNet.Tests/Classes/Security/Cryptography/Ciphers/TripleDesCipherTest.cs

Lines changed: 0 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -180,105 +180,5 @@ public void TripleDes_CBC_Length32_Pad()
180180

181181
CollectionAssert.AreEqual(input, decrypted);
182182
}
183-
184-
[TestMethod]
185-
public void TripleDes_CFB_Length8_NoPad()
186-
{
187-
var input = new byte[]
188-
{
189-
0x4f, 0xa6, 0x62, 0x4f, 0x3b, 0xfb, 0xa3, 0x63,
190-
};
191-
var key = new byte[]
192-
{
193-
0x38, 0xec, 0x32, 0xfd, 0x7d, 0xdb, 0x38, 0x99, 0x93, 0x53, 0xfc, 0x86, 0x5d, 0x35, 0xe9, 0x68,
194-
0x02, 0xda, 0x1a, 0x43, 0x0b, 0x02, 0x55, 0x57,
195-
};
196-
var iv = new byte[]
197-
{
198-
0x74, 0xed, 0x7d, 0x5a, 0xbf, 0x82, 0x3b, 0x05,
199-
};
200-
201-
// echo -n -e '\x4f\xa6\x62\x4f\x3b\xfb\xa3\x63' | openssl enc -e -des-ede3-cfb -K 38EC32FD7DDB38999353FC865D35E96802DA1A430B025557 -iv 74ED7D5ABF823B05 -nopad | hd
202-
var expected = new byte[]
203-
{
204-
0x28, 0x48, 0x3f, 0xb4, 0x48, 0xce, 0x96, 0xaf,
205-
};
206-
207-
var actual = new TripleDesCipher(key, (byte[])iv.Clone(), CipherMode.CFB, pkcs7Padding: false).Encrypt(input);
208-
209-
CollectionAssert.AreEqual(expected, actual);
210-
211-
var decrypted = new TripleDesCipher(key, (byte[])iv.Clone(), CipherMode.CFB, pkcs7Padding: false).Decrypt(actual);
212-
213-
CollectionAssert.AreEqual(input, decrypted);
214-
}
215-
216-
[TestMethod]
217-
public void TripleDes_CFB_Length17_NoPad()
218-
{
219-
var input = new byte[]
220-
{
221-
0x6a, 0xc2, 0x70, 0x62, 0xff, 0x28, 0x34, 0xce, 0x08, 0x58, 0x9c, 0xe3, 0x76, 0x1b, 0xbb, 0x1a,
222-
0xbc,
223-
};
224-
var key = new byte[]
225-
{
226-
0xf9, 0x4c, 0x60, 0xe1, 0x5f, 0x57, 0x35, 0x96, 0xda, 0x89, 0x8f, 0x5e, 0xde, 0xd9, 0x10, 0x17,
227-
0xf6, 0x1b, 0x9a, 0xc4, 0x87, 0x69, 0xda, 0xa5,
228-
};
229-
var iv = new byte[]
230-
{
231-
0x4b, 0x3b, 0xb3, 0x66, 0x71, 0xe0, 0x58, 0x31,
232-
};
233-
234-
// echo -n -e '\x6a\xc2\x70\x62\xff\x28\x34\xce\x08\x58\x9c\xe3\x76\x1b\xbb\x1a\xbc' | openssl enc -e -des-ede3-cfb -K F94C60E15F573596DA898F5EDED91017F61B9AC48769DAA5 -iv 4B3BB36671E05831 -nopad | hd
235-
var expected = new byte[]
236-
{
237-
0x5a, 0x7e, 0x55, 0x4d, 0x63, 0xc1, 0x80, 0x32, 0x84, 0xdc, 0xd0, 0xa7, 0x6c, 0xea, 0x65, 0x42,
238-
0xc3,
239-
};
240-
241-
var actual = new TripleDesCipher(key, (byte[])iv.Clone(), CipherMode.CFB, pkcs7Padding: false).Encrypt(input);
242-
243-
CollectionAssert.AreEqual(expected, actual);
244-
245-
var decrypted = new TripleDesCipher(key, (byte[])iv.Clone(), CipherMode.CFB, pkcs7Padding: false).Decrypt(actual);
246-
247-
CollectionAssert.AreEqual(input, decrypted);
248-
}
249-
250-
[TestMethod]
251-
public void TripleDes_CFB_Length32_NoPad()
252-
{
253-
var input = new byte[]
254-
{
255-
0x62, 0x9d, 0xc6, 0x36, 0xda, 0x23, 0x0b, 0x6b, 0x3b, 0xcb, 0x24, 0x9f, 0xa4, 0x6f, 0x29, 0x7e,
256-
0x8b, 0xcb, 0x7f, 0xff, 0x21, 0x56, 0x34, 0x90, 0x72, 0xba, 0x95, 0x23, 0xa3, 0xcf, 0x25, 0xfa,
257-
};
258-
var key = new byte[]
259-
{
260-
0x30, 0x5e, 0xfc, 0x40, 0x13, 0xda, 0x3d, 0xd3, 0x10, 0x2f, 0x89, 0xbc, 0x44, 0x3a, 0x01, 0xdb,
261-
0x11, 0x34, 0xda, 0xa5, 0x60, 0x58, 0x10, 0x0c,
262-
};
263-
var iv = new byte[]
264-
{
265-
0x69, 0x35, 0xc3, 0x1f, 0x8d, 0xe7, 0xc7, 0x6b,
266-
};
267-
268-
// echo -n -e '\x62\x9d\xc6\x36\xda\x23\x0b\x6b\x3b\xcb\x24\x9f\xa4\x6f\x29\x7e\x8b\xcb\x7f\xff\x21\x56\x34\x90\x72\xba\x95\x23\xa3\xcf\x25\xfa' | openssl enc -e -des-ede3-cfb -K 305EFC4013DA3DD3102F89BC443A01DB1134DAA56058100C -iv 6935C31F8DE7C76B -nopad | hd
269-
var expected = new byte[]
270-
{
271-
0xb8, 0xcf, 0xf4, 0xf9, 0x88, 0xfd, 0x02, 0xf1, 0xb9, 0xe9, 0xf0, 0xb3, 0x1d, 0x0a, 0x9b, 0x91,
272-
0x30, 0x3e, 0xf7, 0xa2, 0xf6, 0xb4, 0xa5, 0xc4, 0x4d, 0x89, 0x06, 0xed, 0x55, 0xd3, 0x28, 0xd0,
273-
};
274-
275-
var actual = new TripleDesCipher(key, (byte[])iv.Clone(), CipherMode.CFB, pkcs7Padding: false).Encrypt(input);
276-
277-
CollectionAssert.AreEqual(expected, actual);
278-
279-
var decrypted = new TripleDesCipher(key, (byte[])iv.Clone(), CipherMode.CFB, pkcs7Padding: false).Decrypt(actual);
280-
281-
CollectionAssert.AreEqual(input, decrypted);
282-
}
283183
}
284184
}

test/Renci.SshNet.Tests/Classes/Security/Cryptography/RsaKeyTest.cs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -191,23 +191,6 @@ public void Key_RSA_Encrypted_Des_Ede3_CBC_12345()
191191
AssertEqual(p.InverseQ, "C0C0C959707C6ABABA1B908C104EC037CE2C9187B17A659342A22BB44231A8AA53BD4AAD277349D87557F114197265001A1384F63E4746FE4CA1545A8D3BF803C2B7A6F46122F5659885DA60F1F88D1891DDFAA274B58A8AE08C2F2F52E89F9C6E3F79CBE16DD4DF2F9DC96442FA67758DCEF2A6F84451476F8347B3E67CAD5D");
192192
}
193193

194-
[TestMethod]
195-
public void Key_RSA_Encrypted_Des_Ede3_CFB_1234567890()
196-
{
197-
RsaKey rsaKey = GetRsaKey("Key.RSA.Encrypted.Des.Ede3.CFB.1234567890.txt", "1234567890");
198-
199-
RSAParameters p = rsaKey.GetRSAParameters();
200-
201-
AssertEqual(p.Modulus, "B3CB66D69596F093904E9BAFB0695FFF1EECBB7F17B8AA3BCCE2E263FEA007E6415ACE940B74E73F55271B5DEAC92F5EB969885AA573FF777A38CFCEF72B23C20CC18D11902327A4C5B5F10DBF88A58AD947C4F94075C58CFA7FC9719C927BAB51817C1B8B9BC6A24050B7B9942CE0FDBE1A37D571BF5B4C4D175A02B2CF95D7");
202-
AssertEqual(p.Exponent, "23");
203-
AssertEqual(p.D, "7103827840C546C32781DE33EB3AEBE230B20F74754F80F263874C795E38B4821A7397CAC55F6CC8B92E863B089BB7601CC5FDEFD5B6A0943E3256BC9B5CF1E6A1D0842ABE79CAA6044D1B1276D75116E57CE6C19DD690EDFB988384023734D27F4D795CE6472793A855A53C5A69C1CA3D8AA21EB113D8833F1F6B93B419F94B");
204-
AssertEqual(p.P, "E6DADD79CFEE89E89EA263F95B6D475BB472E631720F7EC4B49956A4BBC00F62C852AB1C3F10ADAB80F71EA247D01B1F06524798C8FAB07033302D60AF4F01A7");
205-
AssertEqual(p.Q, "C760C60DEE444FB408F5F948787F00165AA56FAB0D79A607D88B15EF3A63526E0479615FDE312B7490A2CC65D3CBCBBFE182A88031F68C96EFA98D1FC2117051");
206-
AssertEqual(p.DP, "3B5CD9DD7E9C6C9AE6F68EBC7698716F5A496E647C6A626D187F3389721B71ABAFDABE491787F224C9641DD1F53583511EE1F527499F8C749F72C9D7088207BD");
207-
AssertEqual(p.DQ, "60D73BA05DC9688AA54445E15F191D4CAFAF70C0CC07E2EDDE34ED659163712E1F6E27FB5D4B151B5C31D0FE424D0B315046C6DF2E35EC83D37E3D3B4FA211FB");
208-
AssertEqual(p.InverseQ, "C2A3CAFBAA7370C2692C83B953AB0705B1BB497513BD6798893D41579318D11D6ACE21F8321C229E9DF5A25A404262C9C60D4BD314435C103A9B18E4AD7F07C4");
209-
}
210-
211194
[TestMethod]
212195
public void Key_RSA()
213196
{

0 commit comments

Comments
 (0)