Skip to content

Commit 7422693

Browse files
committed
reset files requested by Jeremy
1 parent d07daca commit 7422693

File tree

2 files changed

+68
-64
lines changed

2 files changed

+68
-64
lines changed

snippets/csharp/System.Security.Cryptography/TripleDES/Create/fileexample.cs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
using System.IO;
44
using System.Security.Cryptography;
55
using System.Text;
6-
using System.Threading.Tasks;
76

87
class TripleDESSample
98
{
10-
static async Task Main()
9+
static void Main()
1110
{
1211
try
1312
{
@@ -28,10 +27,10 @@ static async Task Main()
2827
string filename = "CText.enc";
2928

3029
// Encrypt the string to a file.
31-
await EncryptTextToFile(original, filename, key, iv);
30+
EncryptTextToFile(original, filename, key, iv);
3231

3332
// Decrypt the file back to a string.
34-
string decrypted = await DecryptTextFromFile(filename, key, iv);
33+
string decrypted = DecryptTextFromFile(filename, key, iv);
3534

3635
// Display the decrypted string to the console.
3736
Console.WriteLine(decrypted);
@@ -42,25 +41,25 @@ static async Task Main()
4241
}
4342
}
4443

45-
public static async Task EncryptTextToFile(string text, string path, byte[] key, byte[] iv)
44+
public static void EncryptTextToFile(string text, string path, byte[] key, byte[] iv)
4645
{
4746
try
4847
{
4948
// Create or open the specified file.
50-
using FileStream fileStream = File.Open(path, FileMode.Create);
49+
using (FileStream fStream = File.Open(path, FileMode.Create))
5150
// Create a new TripleDES object.
52-
using TripleDES tripleDes = TripleDES.Create();
51+
using (TripleDES tripleDes = TripleDES.Create())
5352
// Create a TripleDES encryptor from the key and IV
54-
using ICryptoTransform encryptor = tripleDes.CreateEncryptor(key, iv);
53+
using (ICryptoTransform encryptor = tripleDes.CreateEncryptor(key, iv))
5554
// Create a CryptoStream using the FileStream and encryptor
56-
using var cryptoStream = new CryptoStream(fileStream, encryptor, CryptoStreamMode.Write);
57-
58-
// Convert the provided string to a byte array.
59-
byte[] toEncrypt = Encoding.UTF8.GetBytes(text);
60-
61-
// Write the byte array to the crypto stream.
62-
await cryptoStream.WriteAsync(toEncrypt);
55+
using (var cStream = new CryptoStream(fStream, encryptor, CryptoStreamMode.Write))
56+
{
57+
// Convert the provided string to a byte array.
58+
byte[] toEncrypt = Encoding.UTF8.GetBytes(text);
6359

60+
// Write the byte array to the crypto stream.
61+
cStream.Write(toEncrypt, 0, toEncrypt.Length);
62+
}
6463
}
6564
catch (CryptographicException e)
6665
{
@@ -69,25 +68,26 @@ public static async Task EncryptTextToFile(string text, string path, byte[] key,
6968
}
7069
}
7170

72-
public static async Task<string> DecryptTextFromFile(string path, byte[] key, byte[] iv)
71+
public static string DecryptTextFromFile(string path, byte[] key, byte[] iv)
7372
{
7473
try
7574
{
7675
// Open the specified file
77-
using FileStream fileStream = File.OpenRead(path);
76+
using (FileStream fStream = File.OpenRead(path))
7877
// Create a new TripleDES object.
79-
using TripleDES tripleDes = TripleDES.Create();
78+
using (TripleDES tripleDes = TripleDES.Create())
8079
// Create a TripleDES decryptor from the key and IV
81-
using ICryptoTransform decryptor = tripleDes.CreateDecryptor(key, iv);
80+
using (ICryptoTransform decryptor = tripleDes.CreateDecryptor(key, iv))
8281
// Create a CryptoStream using the FileStream and decryptor
83-
using var cryptoStream = new CryptoStream(fileStream, decryptor, CryptoStreamMode.Read);
82+
using (var cStream = new CryptoStream(fStream, decryptor, CryptoStreamMode.Read))
8483
// Create a StreamReader to turn the bytes back into text
85-
using var reader = new StreamReader(cryptoStream, Encoding.UTF8);
86-
87-
// Read back all of the text from the StreamReader, which receives
88-
// the decrypted bytes from the CryptoStream, which receives the
89-
// encrypted bytes from the FileStream.
90-
return await reader.ReadToEndAsync();
84+
using (StreamReader reader = new StreamReader(cStream, Encoding.UTF8))
85+
{
86+
// Read back all of the text from the StreamReader, which receives
87+
// the decrypted bytes from the CryptoStream, which receives the
88+
// encrypted bytes from the FileStream.
89+
return reader.ReadToEnd();
90+
}
9191
}
9292
catch (CryptographicException e)
9393
{

snippets/csharp/System.Security.Cryptography/TripleDES/Create/memoryexample.cs

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
// <SNIPPET1>
22
using System;
3-
using System.IO;
43
using System.Security.Cryptography;
54
using System.Text;
6-
using System.Threading.Tasks;
5+
using System.IO;
76

87
class TripleDESSample2
98
{
10-
static async Task Main()
9+
static void Main()
1110
{
1211
try
1312
{
@@ -26,10 +25,10 @@ static async Task Main()
2625
string original = "Here is some data to encrypt.";
2726

2827
// Encrypt the string to an in-memory buffer.
29-
byte[] encrypted = await EncryptTextToMemory(original, key, iv);
28+
byte[] encrypted = EncryptTextToMemory(original, key, iv);
3029

3130
// Decrypt the buffer back to a string.
32-
string decrypted = await DecryptTextFromMemory(encrypted, key, iv);
31+
string decrypted = DecryptTextFromMemory(encrypted, key, iv);
3332

3433
// Display the decrypted string to the console.
3534
Console.WriteLine(decrypted);
@@ -40,34 +39,35 @@ static async Task Main()
4039
}
4140
}
4241

43-
public static async Task<byte[]> EncryptTextToMemory(string text, byte[] key, byte[] iv)
42+
public static byte[] EncryptTextToMemory(string text, byte[] key, byte[] iv)
4443
{
4544
try
4645
{
4746
// Create a MemoryStream.
48-
using var memoryStream = new MemoryStream();
49-
50-
// Create a new TripleDES object.
51-
using (TripleDES tripleDes = TripleDES.Create())
52-
// Create a TripleDES encryptor from the key and IV
53-
using (ICryptoTransform encryptor = tripleDes.CreateEncryptor(key, iv))
54-
// Create a CryptoStream using the MemoryStream and encryptor
55-
using (var cryptoStream = new CryptoStream(memoryStream, encryptor, CryptoStreamMode.Write))
47+
using (MemoryStream mStream = new MemoryStream())
5648
{
57-
// Convert the provided string to a byte array.
58-
byte[] toEncrypt = Encoding.UTF8.GetBytes(text);
49+
// Create a new TripleDES object.
50+
using (TripleDES tripleDes = TripleDES.Create())
51+
// Create a TripleDES encryptor from the key and IV
52+
using (ICryptoTransform encryptor = tripleDes.CreateEncryptor(key, iv))
53+
// Create a CryptoStream using the MemoryStream and encryptor
54+
using (var cStream = new CryptoStream(mStream, encryptor, CryptoStreamMode.Write))
55+
{
56+
// Convert the provided string to a byte array.
57+
byte[] toEncrypt = Encoding.UTF8.GetBytes(text);
5958

60-
// Write the byte array to the crypto stream and flush it.
61-
await cryptoStream.WriteAsync(toEncrypt);
59+
// Write the byte array to the crypto stream and flush it.
60+
cStream.Write(toEncrypt, 0, toEncrypt.Length);
6261

63-
// Ending the using statement for the CryptoStream completes the encryption.
64-
}
62+
// Ending the using statement for the CryptoStream completes the encryption.
63+
}
6564

66-
// Get an array of bytes from the MemoryStream that holds the encrypted data.
67-
byte[] ret = memoryStream.ToArray();
65+
// Get an array of bytes from the MemoryStream that holds the encrypted data.
66+
byte[] ret = mStream.ToArray();
6867

69-
// Return the encrypted buffer.
70-
return ret;
68+
// Return the encrypted buffer.
69+
return ret;
70+
}
7171
}
7272
catch (CryptographicException e)
7373
{
@@ -76,34 +76,38 @@ public static async Task<byte[]> EncryptTextToMemory(string text, byte[] key, by
7676
}
7777
}
7878

79-
public static async Task<string> DecryptTextFromMemory(byte[] encrypted, byte[] key, byte[] iv)
79+
public static string DecryptTextFromMemory(byte[] encrypted, byte[] key, byte[] iv)
8080
{
8181
try
8282
{
8383
// Create a buffer to hold the decrypted data.
8484
// TripleDES-encrypted data will always be slightly bigger than the decrypted data.
8585
byte[] decrypted = new byte[encrypted.Length];
86-
Memory<byte> buffer = decrypted;
86+
int offset = 0;
8787

8888
// Create a new MemoryStream using the provided array of encrypted data.
89-
using var memoryStream = new MemoryStream(encrypted);
90-
91-
// Create a new TripleDES object.
92-
using (TripleDES tripleDes = TripleDES.Create())
93-
// Create a TripleDES decryptor from the key and IV
94-
using (ICryptoTransform decryptor = tripleDes.CreateDecryptor(key, iv))
95-
// Create a CryptoStream using the MemoryStream and decryptor
96-
using (var cryptoStream = new CryptoStream(memoryStream, decryptor, CryptoStreamMode.Read))
89+
using (MemoryStream mStream = new MemoryStream(encrypted))
9790
{
98-
// Keep reading from the CryptoStream until it finishes (returns 0).
99-
while (await cryptoStream.ReadAsync(buffer) is var read and > 0)
91+
// Create a new TripleDES object.
92+
using (TripleDES tripleDes = TripleDES.Create())
93+
// Create a TripleDES decryptor from the key and IV
94+
using (ICryptoTransform decryptor = tripleDes.CreateDecryptor(key, iv))
95+
// Create a CryptoStream using the MemoryStream and decryptor
96+
using (var cStream = new CryptoStream(mStream, decryptor, CryptoStreamMode.Read))
10097
{
101-
buffer = buffer.Slice(read);
98+
// Keep reading from the CryptoStream until it finishes (returns 0).
99+
int read = 1;
100+
101+
while (read > 0)
102+
{
103+
read = cStream.Read(decrypted, offset, decrypted.Length - offset);
104+
offset += read;
105+
}
102106
}
103107
}
104108

105109
// Convert the buffer into a string and return it.
106-
return Encoding.UTF8.GetString(decrypted.AsSpan(..^buffer.Length));
110+
return Encoding.UTF8.GetString(decrypted, 0, offset);
107111
}
108112
catch (CryptographicException e)
109113
{

0 commit comments

Comments
 (0)