massgrave/TSforge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stylistic fixes

Browse Source
This commit is contained in:
Wither OrNot
2025-04-07 18:12:53 -04:00
parent 103981762f
commit 91e8508848
5 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
LibTSforge/SPP/ProductKey.cs
View File

@ -18,16 +18,16 @@ namespace LibTSforge.SPP
public ulong Security;
public bool Upgrade;
public PKeyAlgorithm Algorithm;
private readonly string EulaType;
private readonly string PartNumber;
public readonly string EulaType;
public readonly string PartNumber;
public readonly string Edition;
public readonly string Channel;
private readonly Guid ActivationId;
public readonly Guid ActivationId;
private string mpc;
private string pid2;
private byte[] KeyBytes
public byte[] KeyBytes
{
get { return BitConverter.GetBytes(klow).Concat(BitConverter.GetBytes(khigh)).ToArray(); }
}
@ -91,16 +91,6 @@ namespace LibTSforge.SPP
return new Guid(CryptoUtils.SHA256Hash(pkb.Serialize()).Take(16).ToArray());
}
private string GetDefaultMPC()
{
int build = Environment.OSVersion.Version.Build;
string defaultMPC = build >= 10240 ? "03612" :
build >= 9600 ? "06401" :
build >= 9200 ? "05426" :
"55041";
return defaultMPC;
}
public string GetMPC()
{
if (mpc != null)
@ -108,7 +98,12 @@ namespace LibTSforge.SPP
return mpc;
}
mpc = GetDefaultMPC();
int build = Environment.OSVersion.Version.Build;
mpc = build >= 10240 ? "03612" :
build >= 9600 ? "06401" :
build >= 9200 ? "05426" :
"55041";
// setup.cfg doesn't exist in Windows 8+
string setupcfg = string.Format(@"{0}\oobe\{1}", Environment.SystemDirectory, "setup.cfg");
@ -205,7 +200,7 @@ namespace LibTSforge.SPP
return writer.GetBytes();
}
private string GetExtendedPid()
public string GetExtendedPid()
{
string mpc = GetMPC();
int serialHigh = Serial / 1000000;

2
LibTSforge/SPP/SPPUtils.cs
View File

@ -148,7 +148,7 @@ namespace LibTSforge.SPP
throw new FileNotFoundException("Failed to autodetect key type, specify physical store key with /prod or /test arguments.");
}
private static string GetPSPath(PSVersion version)
public static string GetPSPath(PSVersion version)
{
switch (version)
{