Skip to content

🔒 Fix Unauthenticated Encryption Mode #3

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

Open
LDzik wants to merge 1 commit into
base: main
Choose a base branch
from
Open

🔒 Fix Unauthenticated Encryption Mode #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions LWCredentialProvider/CredentialProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,13 @@ private object[] IsUsbDeviceConnected()



string data = "6603691B6B7EE37F3CA4195BC605F3BAB777457F43F91EB65CEFDCCAB07D070E";
string data = "D1AEF672E35561979417C5FEADD24295D94B6F35478517DAB8017ABC894D53C1";
string key = "36DB0D6DAC8388994EF40DE6E5A32D9EE1DDBEE7C8D17C6D7D345CABBC5CA15C";
string iv = "DD25843EB39A529F3FC235BC7C60B997";
string nonce = "B5873E93745D34937776C2CE";

UserManager userManager = new UserManager();

string userData = userManager.DecodeData(data, key, iv);
string userData = userManager.DecodeData(data, key, nonce);

string[] parts = userData.Split(new[] { UserManager.Separator }, StringSplitOptions.None);

Expand Down Expand Up @@ -231,17 +231,17 @@ private string DriveTesting()
// string username = "admin";
// string password = "zaq1@WSX";

string data = "6603691B6B7EE37F3CA4195BC605F3BAB777457F43F91EB65CEFDCCAB07D070E";
string data = "D1AEF672E35561979417C5FEADD24295D94B6F35478517DAB8017ABC894D53C1";
string key = "36DB0D6DAC8388994EF40DE6E5A32D9EE1DDBEE7C8D17C6D7D345CABBC5CA15C";
string iv = "DD25843EB39A529F3FC235BC7C60B997";
string nonce = "B5873E93745D34937776C2CE";

UserManager userManager = new UserManager();

string userData = userManager.DecodeData(data, key, iv);
string userData = userManager.DecodeData(data, key, nonce);

// return userData;

// string userDataHex = userManager.EncodeData(username, password, key, iv);
// string userDataHex = userManager.EncodeData(username, password, key, nonce);

// Console.WriteLine($"userDataHex: {userDataHex}");

Expand Down
14 changes: 7 additions & 7 deletions LWCredentialProvider/Tile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@



// string data = "6603691B6B7EE37F3CA4195BC605F3BAB777457F43F91EB65CEFDCCAB07D070E";
// string data = "D1AEF672E35561979417C5FEADD24295D94B6F35478517DAB8017ABC894D53C1";
// string key = "36DB0D6DAC8388994EF40DE6E5A32D9EE1DDBEE7C8D17C6D7D345CABBC5CA15C";
// string iv = "DD25843EB39A529F3FC235BC7C60B997";
// string nonce = "B5873E93745D34937776C2CE";

// UserManager userManager = new UserManager();

// string userData = userManager.DecodeData(data, key, iv);
// string userData = userManager.DecodeData(data, key, nonce);

// string[] parts = userData.Split(new[] { UserManager.Separator }, StringSplitOptions.None);

Expand Down Expand Up @@ -142,17 +142,17 @@
// // string username = "admin";
// // string password = "zaq1@WSX";

// string data = "6603691B6B7EE37F3CA4195BC605F3BAB777457F43F91EB65CEFDCCAB07D070E";
// string data = "D1AEF672E35561979417C5FEADD24295D94B6F35478517DAB8017ABC894D53C1";
// string key = "36DB0D6DAC8388994EF40DE6E5A32D9EE1DDBEE7C8D17C6D7D345CABBC5CA15C";
// string iv = "DD25843EB39A529F3FC235BC7C60B997";
// string nonce = "B5873E93745D34937776C2CE";

// UserManager userManager = new UserManager();

// string userData = userManager.DecodeData(data, key, iv);
// string userData = userManager.DecodeData(data, key, nonce);

// // return userData;

// // string userDataHex = userManager.EncodeData(username, password, key, iv);
// // string userDataHex = userManager.EncodeData(username, password, key, nonce);

// // Console.WriteLine($"userDataHex: {userDataHex}");

Expand Down
66 changes: 34 additions & 32 deletions LWCredentialProvider/UserManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,63 +9,66 @@ public class UserManager
{
public const string Separator = "\u2561";

public string DecodeData(string encodedDataHex, string keyHex, string ivHex)
public string DecodeData(string encodedDataHex, string keyHex, string nonceHex)
{
if (string.IsNullOrEmpty(encodedDataHex))
return "";

byte[] encodedData = HexStringToByteArray(encodedDataHex);
byte[] key = HexStringToByteArray(keyHex);
byte[] iv = HexStringToByteArray(ivHex);
byte[] nonce = HexStringToByteArray(nonceHex);

using Aes aes = Aes.Create();
aes.Key = key;
aes.IV = iv;
aes.Padding = PaddingMode.PKCS7;
// Assuming tag size of 16 bytes and it's appended to ciphertext
int tagSize = 16;
if (encodedData.Length < tagSize)
{
throw new ArgumentException("Invalid encoded data length.");
}

int ciphertextSize = encodedData.Length - tagSize;

byte[] ciphertext = new byte[ciphertextSize];
byte[] tag = new byte[tagSize];

Array.Copy(encodedData, 0, ciphertext, 0, ciphertextSize);
Array.Copy(encodedData, ciphertextSize, tag, 0, tagSize);

using var decryptor = aes.CreateDecryptor(aes.Key, aes.IV);
string decryptedText;
using (var msDecrypt = new MemoryStream(encodedData))
byte[] plaintextBytes = new byte[ciphertextSize];

using (AesGcm aesGcm = new AesGcm(key, tagSize))
{
using var csDecrypt = new CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Read);
using var srDecrypt = new StreamReader(csDecrypt, Encoding.UTF8, true);
decryptedText = srDecrypt.ReadToEnd();
aesGcm.Decrypt(nonce, ciphertext, tag, plaintextBytes);
}

return decryptedText;
return Encoding.UTF8.GetString(plaintextBytes);
}


public string EncodeData(string username, string password, string keyHex, string ivHex)
public string EncodeData(string username, string password, string keyHex, string nonceHex)
{
if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password))
return "";

string dataText = username + Separator + password;

byte[] key = HexStringToByteArray(keyHex);
byte[] iv = HexStringToByteArray(ivHex);
byte[] dataBytes = Encoding.UTF8.GetBytes(dataText);

using Aes aes = Aes.Create();
aes.Key = key;
aes.IV = iv;
aes.Padding = PaddingMode.PKCS7;
byte[] nonce = HexStringToByteArray(nonceHex);
byte[] plaintextBytes = Encoding.UTF8.GetBytes(dataText);

using var encryptor = aes.CreateEncryptor(aes.Key, aes.IV);
byte[] encryptedBytes;
int tagSize = 16;
byte[] ciphertext = new byte[plaintextBytes.Length];
byte[] tag = new byte[tagSize];

using (var msEncrypt = new MemoryStream())
using (AesGcm aesGcm = new AesGcm(key, tagSize))
{
using (var csEncrypt = new CryptoStream(msEncrypt, encryptor, CryptoStreamMode.Write))
{
csEncrypt.Write(dataBytes, 0, dataBytes.Length);
csEncrypt.FlushFinalBlock();
}
encryptedBytes = msEncrypt.ToArray();
aesGcm.Encrypt(nonce, plaintextBytes, ciphertext, tag);
}

return BitConverter.ToString(encryptedBytes).Replace("-", "");
byte[] result = new byte[ciphertext.Length + tag.Length];
Array.Copy(ciphertext, 0, result, 0, ciphertext.Length);
Array.Copy(tag, 0, result, ciphertext.Length, tag.Length);

return BitConverter.ToString(result).Replace("-", "");
}

private byte[] HexStringToByteArray(string hex)
Expand All @@ -77,4 +80,3 @@ private byte[] HexStringToByteArray(string hex)
}
}
// }