simono41/steamguard-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added encrypted maFile reading, writing

Browse source 
added passkey prompt
This commit is contained in:
Carson McManus 2016-08-22 15:51:37 -04:00
parent 00474371a8
commit 374fe6c793
2 changed files with 51 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
Manifest.cs
View file

@ -83,11 +83,6 @@ public class Manifest
_manifest.Save(); _manifest.Save();
} }
if (_manifest.Encrypted)
{
throw new NotSupportedException("Encrypted maFiles are not supported at this time.");
}
_manifest.RecomputeExistingEntries(); _manifest.RecomputeExistingEntries();
return _manifest; return _manifest;
@ -233,10 +228,22 @@ public class Manifest
string fileText = ""; string fileText = "";
Stream stream = null; Stream stream = null;
FileStream fileStream = File.OpenRead(Path.Combine(Program.SteamGuardPath, entry.Filename)); FileStream fileStream = File.OpenRead(Path.Combine(Program.SteamGuardPath, entry.Filename));
RijndaelManaged aes256;
if (this.Encrypted) if (this.Encrypted)
{ {
//string decryptedText = FileEncryptor.DecryptData(passKey, entry.Salt, entry.IV, fileText); byte[] key = GetEncryptionKey(passKey, entry.Salt);
aes256 = new RijndaelManaged
{
IV = Convert.FromBase64String(entry.IV),
Key = key,
Padding = PaddingMode.PKCS7,
Mode = CipherMode.CBC
};
ICryptoTransform decryptor = aes256.CreateDecryptor(aes256.Key, aes256.IV);
stream = new CryptoStream(fileStream, decryptor, CryptoStreamMode.Read);
} }
else else
{ {
@ -314,12 +321,6 @@ public class Manifest
string iV = null; string iV = null;
string jsonAccount = JsonConvert.SerializeObject(account); string jsonAccount = JsonConvert.SerializeObject(account);
if (encrypt)
{
throw new NotSupportedException("Encrypted maFiles are not supported at this time.");
}
string filename = account.Session.SteamID.ToString() + ".maFile"; string filename = account.Session.SteamID.ToString() + ".maFile";
ManifestEntry newEntry = new ManifestEntry() ManifestEntry newEntry = new ManifestEntry()
@ -357,7 +358,35 @@ public class Manifest
try try
{ {
File.WriteAllText(Program.SteamGuardPath + filename, jsonAccount); Stream stream = null;
FileStream fileStream = File.OpenWrite(Path.Combine(Program.SteamGuardPath, newEntry.Filename));
RijndaelManaged aes256;
if (this.Encrypted)
{
byte[] key = GetEncryptionKey(passKey, newEntry.Salt);
aes256 = new RijndaelManaged
{
IV = Convert.FromBase64String(newEntry.IV),
Key = key,
Padding = PaddingMode.PKCS7,
Mode = CipherMode.CBC
};
ICryptoTransform decryptor = aes256.CreateDecryptor(aes256.Key, aes256.IV);
stream = new CryptoStream(fileStream, decryptor, CryptoStreamMode.Write);
}
else
{
stream = fileStream;
}
using (StreamWriter writer = new StreamWriter(stream))
{
writer.Write(jsonAccount);
}
stream.Close();
return true; return true;
} }
catch (Exception) catch (Exception)

10
Program.cs
View file

@ -78,7 +78,15 @@ public static class Program
if (Verbose) Console.WriteLine("Opening manifest..."); if (Verbose) Console.WriteLine("Opening manifest...");
Manifest = Manifest.GetManifest(true); Manifest = Manifest.GetManifest(true);
if (Verbose) Console.WriteLine("Reading accounts from manifest..."); if (Verbose) Console.WriteLine("Reading accounts from manifest...");
SteamGuardAccounts = Manifest.GetAllAccounts(); if (Manifest.Encrypted)
{
string passkey = Manifest.PromptForPassKey();
SteamGuardAccounts = Manifest.GetAllAccounts(passkey);
}
else
{
SteamGuardAccounts = Manifest.GetAllAccounts();
}
if (SteamGuardAccounts.Length == 0) if (SteamGuardAccounts.Length == 0)
{ {
Console.WriteLine("error: No accounts read."); Console.WriteLine("error: No accounts read.");